diff --git a/client/src/main/java/AbstractWorld.java b/client/src/main/java/AbstractWorld.java index 9aa77e3..3218d50 100644 --- a/client/src/main/java/AbstractWorld.java +++ b/client/src/main/java/AbstractWorld.java @@ -5,31 +5,31 @@ public abstract class AbstractWorld { @OriginalMember(owner = "client!wha", name = "m", descriptor = "I") - public int anInt7561; + public int players; @OriginalMember(owner = "client!wha", name = "i", descriptor = "I") - public int anInt7563; + public int flags; @OriginalMember(owner = "client!wha", name = "c", descriptor = "I") - public int anInt7564; + public int country; @OriginalMember(owner = "client!wha", name = "a", descriptor = "(Z)Z") - public final boolean method6706() { - return (this.anInt7563 & 0x2) != 0; + public final boolean isQuickChat() { + return (this.flags & 0x2) != 0; } @OriginalMember(owner = "client!wha", name = "c", descriptor = "(I)Z") - public final boolean method6708() { - return (this.anInt7563 & 0x4) != 0; + public final boolean isPvp() { + return (this.flags & 0x4) != 0; } @OriginalMember(owner = "client!wha", name = "b", descriptor = "(I)Z") - public final boolean method6709() { - return (this.anInt7563 & 0x1) != 0; + public final boolean isMembers() { + return (this.flags & 0x1) != 0; } @OriginalMember(owner = "client!wha", name = "b", descriptor = "(Z)Z") - public final boolean method6712() { - return (this.anInt7563 & 0x8) != 0; + public final boolean isLootShare() { + return (this.flags & 0x8) != 0; } } diff --git a/client/src/main/java/AudioChannel.java b/client/src/main/java/AudioChannel.java index 6190c8a..e5abcd3 100644 --- a/client/src/main/java/AudioChannel.java +++ b/client/src/main/java/AudioChannel.java @@ -8,16 +8,16 @@ public class AudioChannel { @OriginalMember(owner = "client!cd", name = "t", descriptor = "[I") - public int[] anIntArray315; + public int[] samples; @OriginalMember(owner = "client!cd", name = "A", descriptor = "Lclient!dea;") private PcmStream aClass2_Sub6_6; @OriginalMember(owner = "client!cd", name = "B", descriptor = "I") - public int anInt4097; + public int bufferCapacity; @OriginalMember(owner = "client!cd", name = "k", descriptor = "I") - public int anInt4098; + public int sampleRate2; @OriginalMember(owner = "client!cd", name = "v", descriptor = "I") private int anInt4103; @@ -80,36 +80,36 @@ private void method3584() { @OriginalMember(owner = "client!cd", name = "c", descriptor = "(I)V") public final synchronized void close() { - if (Static232.aAudioThread1 != null) { + if (Static232.thread != null) { @Pc(11) boolean allChannelsClosed = true; for (@Pc(13) int i = 0; i < 2; i++) { - if (Static232.aAudioThread1.aAudioChannelArray1[i] == this) { - Static232.aAudioThread1.aAudioChannelArray1[i] = null; + if (Static232.thread.channels[i] == this) { + Static232.thread.channels[i] = null; } - if (Static232.aAudioThread1.aAudioChannelArray1[i] != null) { + if (Static232.thread.channels[i] != null) { allChannelsClosed = false; } } if (allChannelsClosed) { - Static232.aAudioThread1.allChannelsClosed = true; - while (Static232.aAudioThread1.isRunning) { + Static232.thread.allChannelsClosed = true; + while (Static232.thread.isRunning) { Static638.sleep(50L); } - Static232.aAudioThread1 = null; + Static232.thread = null; } } this.method3596(); - this.anIntArray315 = null; + this.samples = null; this.isClosed = true; } @OriginalMember(owner = "client!cd", name = "d", descriptor = "()I") protected int method3587() throws Exception { - return this.anInt4097; + return this.bufferCapacity; } @OriginalMember(owner = "client!cd", name = "b", descriptor = "(I)V") - public void method3588(@OriginalArg(0) int arg0) throws Exception { + public void open(@OriginalArg(0) int arg0) throws Exception { } @OriginalMember(owner = "client!cd", name = "b", descriptor = "()V") @@ -141,7 +141,7 @@ public final synchronized void method3592() { } @OriginalMember(owner = "client!cd", name = "a", descriptor = "(Ljava/awt/Component;)V") - public void method3593(@OriginalArg(0) Component arg0) throws Exception { + public void init(@OriginalArg(0) Component arg0) throws Exception { } @OriginalMember(owner = "client!cd", name = "b", descriptor = "(B)V") @@ -156,13 +156,13 @@ public final synchronized void method3594() { } while (local11 > this.aLong128 + 5000L) { this.method3584(); - this.aLong128 += (long) (256000 / Static686.anInt8944); + this.aLong128 += (long) (256000 / Static686.sampleRate); local11 = Static588.currentTimeWithDrift(); } } catch (@Pc(54) Exception local54) { this.aLong128 = local11; } - if (this.anIntArray315 == null) { + if (this.samples == null) { return; } try { @@ -170,7 +170,7 @@ public final synchronized void method3594() { if (this.aLong129 > local11) { return; } - this.method3588(this.anInt4097); + this.open(this.bufferCapacity); this.aLong129 = 0L; this.aBoolean320 = true; } @@ -178,26 +178,26 @@ public final synchronized void method3594() { if (this.anInt4100 - local95 > this.anInt4101) { this.anInt4101 = this.anInt4100 - local95; } - @Pc(118) int local118 = this.anInt4098 + this.anInt4103; + @Pc(118) int local118 = this.sampleRate2 + this.anInt4103; if (local118 + 256 > 16384) { local118 = 16128; } - if (this.anInt4097 < local118 + 256) { - this.anInt4097 += 1024; - if (this.anInt4097 > 16384) { - this.anInt4097 = 16384; + if (this.bufferCapacity < local118 + 256) { + this.bufferCapacity += 1024; + if (this.bufferCapacity > 16384) { + this.bufferCapacity = 16384; } this.method3596(); - this.method3588(this.anInt4097); + this.open(this.bufferCapacity); local95 = 0; - if (this.anInt4097 < local118 + 256) { - local118 = this.anInt4097 - 256; - this.anInt4103 = local118 - this.anInt4098; + if (this.bufferCapacity < local118 + 256) { + local118 = this.bufferCapacity - 256; + this.anInt4103 = local118 - this.sampleRate2; } this.aBoolean320 = true; } while (local118 > local95) { - this.method3595(this.anIntArray315); + this.method3595(this.samples); local95 += 256; this.method3590(); } @@ -225,13 +225,13 @@ public final synchronized void method3594() { @OriginalMember(owner = "client!cd", name = "a", descriptor = "([II)V") private void method3595(@OriginalArg(0) int[] arg0) { @Pc(1) short local1 = 256; - if (Static316.aBoolean644) { + if (Static316.stereo) { local1 = 512; } Static734.method7688(arg0, 0, local1); this.anInt4099 -= 256; if (this.aClass2_Sub6_6 != null && this.anInt4099 <= 0) { - this.anInt4099 += Static686.anInt8944 >> 4; + this.anInt4099 += Static686.sampleRate >> 4; Static440.method5964(this.aClass2_Sub6_6); this.method3591(this.aClass2_Sub6_6.method9136(), this.aClass2_Sub6_6); @Pc(47) int local47 = 0; diff --git a/client/src/main/java/AudioThread.java b/client/src/main/java/AudioThread.java index ab4613a..1b037e5 100644 --- a/client/src/main/java/AudioThread.java +++ b/client/src/main/java/AudioThread.java @@ -6,10 +6,10 @@ public final class AudioThread implements Runnable { @OriginalMember(owner = "client!faa", name = "g", descriptor = "Lclient!vq;") - public Signlink aSignlink2; + public Signlink signLink; @OriginalMember(owner = "client!faa", name = "f", descriptor = "[Lclient!cd;") - public final AudioChannel[] aAudioChannelArray1 = new AudioChannel[2]; + public final AudioChannel[] channels = new AudioChannel[2]; @OriginalMember(owner = "client!faa", name = "h", descriptor = "Z") public volatile boolean allChannelsClosed = false; @@ -24,13 +24,13 @@ public void run() { try { while (!this.allChannelsClosed) { for (@Pc(12) int local12 = 0; local12 < 2; local12++) { - @Pc(21) AudioChannel local21 = this.aAudioChannelArray1[local12]; + @Pc(21) AudioChannel local21 = this.channels[local12]; if (local21 != null) { local21.method3594(); } } Static638.sleep(10L); - Static61.method1312(this.aSignlink2, (Object) null); + Static61.method1312(this.signLink, (Object) null); } } catch (@Pc(49) Exception local49) { Static240.method3496(local49, (String) null); diff --git a/client/src/main/java/Class15.java b/client/src/main/java/Class15.java index 5254abc..69b07b5 100644 --- a/client/src/main/java/Class15.java +++ b/client/src/main/java/Class15.java @@ -26,7 +26,7 @@ public Class15() { } @OriginalMember(owner = "client!ak", name = "a", descriptor = "(Ljava/awt/Frame;IIIII)V") - public void method248(@OriginalArg(0) Frame arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) { + public void enter(@OriginalArg(0) Frame arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) { try { arg0.setVisible(true); Method getPeer = Frame.class.getDeclaredMethod("getPeer"); @@ -52,7 +52,7 @@ public void method249(@OriginalArg(0) Frame arg0) { } @OriginalMember(owner = "client!ak", name = "a", descriptor = "(I)[I") - public int[] method250() { + public int[] listmodes() { this.aDirectDraw1.enumDisplayModes(0, (DDSurfaceDesc) null, (IUnknown) null, this); Static17.anIntArray28 = new int[Static17.anInt240]; Static17.anInt240 = 0; diff --git a/client/src/main/java/Class152.java b/client/src/main/java/Class152.java index 9e59e3c..33a6499 100644 --- a/client/src/main/java/Class152.java +++ b/client/src/main/java/Class152.java @@ -64,9 +64,9 @@ public final void method9089(@OriginalArg(1) Model arg0, @OriginalArg(2) int arg if (this.aSeqType4 == null || !this.method9111()) { return; } - arg0.method7487(this.aClass257_8.aClass2_Sub2_Sub18_1, this.anInt10478, this.aSeqType4.anIntArray157[this.anInt10489], this.aClass257_8.aClass2_Sub2_Sub18_2, this.aClass257_8.anInt6448, this.aClass257_8.anInt6450, arg1, this.aSeqType4.aBoolean140); - if (this.aBoolean790 && this.aSeqType4.anIntArray158 != null && this.aClass257_7.aBoolean481) { - arg0.method7487(this.aClass257_7.aClass2_Sub2_Sub18_1, this.anInt10478, this.aSeqType4.anIntArray157[this.anInt10489], this.aClass257_7.aClass2_Sub2_Sub18_2, this.aClass257_7.anInt6448, this.aClass257_7.anInt6450, arg1, this.aSeqType4.aBoolean140); + arg0.method7487(this.aClass257_8.aClass2_Sub2_Sub18_1, this.anInt10478, this.aSeqType4.frameDelay[this.anInt10489], this.aClass257_8.aClass2_Sub2_Sub18_2, this.aClass257_8.anInt6448, this.aClass257_8.anInt6450, arg1, this.aSeqType4.rotateNormals); + if (this.aBoolean790 && this.aSeqType4.frameset != null && this.aClass257_7.aBoolean481) { + arg0.method7487(this.aClass257_7.aClass2_Sub2_Sub18_1, this.anInt10478, this.aSeqType4.frameDelay[this.anInt10489], this.aClass257_7.aClass2_Sub2_Sub18_2, this.aClass257_7.anInt6448, this.aClass257_7.anInt6450, arg1, this.aSeqType4.rotateNormals); return; } } @@ -74,7 +74,7 @@ public final void method9089(@OriginalArg(1) Model arg0, @OriginalArg(2) int arg @OriginalMember(owner = "client!gu", name = "a", descriptor = "(BI)Z") public final boolean method9090() { @Pc(24) int local24; - return this.aSeqType4 == null | (local24 = 1 - this.anInt10469) <= 0 ? false : this.aSeqType4.aBoolean142 | this.anInt10478 + local24 > this.aSeqType4.anIntArray157[this.anInt10489]; + return this.aSeqType4 == null | (local24 = 1 - this.anInt10469) <= 0 ? false : this.aSeqType4.tween | this.anInt10478 + local24 > this.aSeqType4.frameDelay[this.anInt10489]; } @OriginalMember(owner = "client!gu", name = "b", descriptor = "(II)V") @@ -90,23 +90,23 @@ public final void method9092(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, if (arg0 == -1) { this.aSeqType4 = null; } else { - if (this.aSeqType4 == null || arg0 != this.aSeqType4.anInt1650) { - this.aSeqType4 = Static692.aSeqTypeList2.method1162(arg0); - } else if (this.aSeqType4.anInt1646 == 0) { + if (this.aSeqType4 == null || arg0 != this.aSeqType4.id) { + this.aSeqType4 = Static692.aSeqTypeList2.get(arg0); + } else if (this.aSeqType4.exactmove == 0) { return; } this.anInt10469 = arg1; this.anInt10483 = arg2; this.anInt10485 = 0; if (arg3) { - this.anInt10489 = (int) ((double) this.aSeqType4.anIntArray159.length * Math.random()); - this.anInt10478 = (int) (Math.random() * (double) this.aSeqType4.anIntArray157[this.anInt10489]); + this.anInt10489 = (int) ((double) this.aSeqType4.frames.length * Math.random()); + this.anInt10478 = (int) (Math.random() * (double) this.aSeqType4.frameDelay[this.anInt10489]); } else { this.anInt10478 = 0; this.anInt10489 = 0; } this.anInt10474 = this.anInt10489 + 1; - if (this.anInt10474 < 0 || this.anInt10474 >= this.aSeqType4.anIntArray159.length) { + if (this.anInt10474 < 0 || this.anInt10474 >= this.aSeqType4.frames.length) { this.anInt10474 = -1; } if (this.anInt10469 == 0) { @@ -120,7 +120,7 @@ public final void method9092(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalMember(owner = "client!gu", name = "b", descriptor = "(BI)V") public final void method9093(@OriginalArg(1) int arg0) { this.anInt10489 = 0; - this.anInt10474 = this.aSeqType4.anIntArray159.length <= 1 ? -1 : 1; + this.anInt10474 = this.aSeqType4.frames.length <= 1 ? -1 : 1; this.anInt10478 = 0; this.aBoolean791 = false; this.anInt10469 = arg0; @@ -162,7 +162,7 @@ public final int method9101() { @Pc(18) int local18 = 0; if (this.method9111()) { local18 = this.aClass257_8.anInt6452 | 0x0; - if (this.aBoolean790 && this.aSeqType4.anIntArray158 != null) { + if (this.aBoolean790 && this.aSeqType4.frameset != null) { local18 |= this.aClass257_7.anInt6452; } } @@ -186,7 +186,7 @@ public final void method9104(@OriginalArg(0) boolean arg0, @OriginalArg(1) int a public final void method9105(@OriginalArg(0) Model arg0) { if (this.method9111()) { arg0.method7493(this.aClass257_8.anInt6448, this.aClass257_8.aClass2_Sub2_Sub18_1); - if (this.aBoolean790 && this.aSeqType4.anIntArray158 != null && this.aClass257_7.aBoolean481) { + if (this.aBoolean790 && this.aSeqType4.frameset != null && this.aClass257_7.aBoolean481) { arg0.method7493(this.aClass257_7.anInt6448, this.aClass257_7.aClass2_Sub2_Sub18_1); } } @@ -218,9 +218,9 @@ public final boolean method9109() { @OriginalMember(owner = "client!gu", name = "a", descriptor = "(IIZLclient!ka;)V") public final void method9110(@OriginalArg(0) int arg0, @OriginalArg(3) Model arg1) { if (this.method9111()) { - arg1.method7496(this.anInt10478, this.aClass257_8.aClass2_Sub2_Sub18_1, this.aClass257_8.aClass2_Sub2_Sub18_2, this.aClass257_8.anInt6448, (int[]) null, this.aSeqType4.anIntArray157[this.anInt10489], this.aSeqType4.aBoolean140, this.aClass257_8.anInt6450, arg0); - if (this.aBoolean790 && this.aSeqType4.anIntArray158 != null && this.aClass257_7.aBoolean481) { - arg1.method7496(this.anInt10478, this.aClass257_7.aClass2_Sub2_Sub18_1, this.aClass257_7.aClass2_Sub2_Sub18_2, this.aClass257_7.anInt6448, (int[]) null, this.aSeqType4.anIntArray157[this.anInt10489], this.aSeqType4.aBoolean140, this.aClass257_7.anInt6450, arg0); + arg1.method7496(this.anInt10478, this.aClass257_8.aClass2_Sub2_Sub18_1, this.aClass257_8.aClass2_Sub2_Sub18_2, this.aClass257_8.anInt6448, (int[]) null, this.aSeqType4.frameDelay[this.anInt10489], this.aSeqType4.rotateNormals, this.aClass257_8.anInt6450, arg0); + if (this.aBoolean790 && this.aSeqType4.frameset != null && this.aClass257_7.aBoolean481) { + arg1.method7496(this.anInt10478, this.aClass257_7.aClass2_Sub2_Sub18_1, this.aClass257_7.aClass2_Sub2_Sub18_2, this.aClass257_7.anInt6448, (int[]) null, this.aSeqType4.frameDelay[this.anInt10489], this.aSeqType4.rotateNormals, this.aClass257_7.anInt6450, arg0); } } } @@ -230,9 +230,9 @@ public final boolean method9111() { if (this.aSeqType4 == null) { return false; } - @Pc(30) boolean local30 = this.aClass257_8.method5769(Static692.aSeqTypeList2, this.aSeqType4, this.anInt10474, this.anInt10489, this.aSeqType4.anIntArray159); - if (local30 && this.aBoolean790 && this.aSeqType4.anIntArray158 != null) { - this.aClass257_7.method5769(Static692.aSeqTypeList2, this.aSeqType4, this.anInt10474, this.anInt10489, this.aSeqType4.anIntArray158); + @Pc(30) boolean local30 = this.aClass257_8.method5769(Static692.aSeqTypeList2, this.aSeqType4, this.anInt10474, this.anInt10489, this.aSeqType4.frames); + if (local30 && this.aBoolean790 && this.aSeqType4.frameset != null) { + this.aClass257_7.method5769(Static692.aSeqTypeList2, this.aSeqType4, this.anInt10474, this.anInt10489, this.aSeqType4.frameset); } return local30; } @@ -252,17 +252,17 @@ public final boolean method9112(@OriginalArg(1) int arg0) { this.method9086(this.anInt10489, this.aSeqType4); } arg0 += this.anInt10478; - @Pc(68) boolean local68 = Static296.tweeningEnabled | this.aSeqType4.aBoolean142; - if (arg0 > 100 && this.aSeqType4.anInt1640 > 0) { - @Pc(89) int local89 = this.aSeqType4.anIntArray159.length - this.aSeqType4.anInt1640; - while (this.anInt10489 < local89 && arg0 > this.aSeqType4.anIntArray157[this.anInt10489]) { - arg0 -= this.aSeqType4.anIntArray157[this.anInt10489]; + @Pc(68) boolean local68 = Static296.tweeningEnabled | this.aSeqType4.tween; + if (arg0 > 100 && this.aSeqType4.replayoff > 0) { + @Pc(89) int local89 = this.aSeqType4.frames.length - this.aSeqType4.replayoff; + while (this.anInt10489 < local89 && arg0 > this.aSeqType4.frameDelay[this.anInt10489]) { + arg0 -= this.aSeqType4.frameDelay[this.anInt10489]; this.anInt10489++; } if (local89 <= this.anInt10489) { @Pc(134) int local134 = 0; - for (@Pc(136) int local136 = local89; local136 < this.aSeqType4.anIntArray159.length; local136++) { - local134 += this.aSeqType4.anIntArray157[local136]; + for (@Pc(136) int local136 = local89; local136 < this.aSeqType4.frames.length; local136++) { + local134 += this.aSeqType4.frameDelay[local136]; } if (this.anInt10483 == 0) { this.anInt10485 += arg0 / local134; @@ -271,33 +271,33 @@ public final boolean method9112(@OriginalArg(1) int arg0) { } this.anInt10474 = this.anInt10489 + 1; local68 = true; - if (this.anInt10474 >= this.aSeqType4.anIntArray159.length) { - this.anInt10474 -= this.aSeqType4.anInt1640; - if (this.anInt10474 < 0 || this.aSeqType4.anIntArray159.length <= this.anInt10474) { + if (this.anInt10474 >= this.aSeqType4.frames.length) { + this.anInt10474 -= this.aSeqType4.replayoff; + if (this.anInt10474 < 0 || this.aSeqType4.frames.length <= this.anInt10474) { this.anInt10474 = -1; } } } - while (this.aSeqType4.anIntArray157[this.anInt10489] < arg0) { - arg0 -= this.aSeqType4.anIntArray157[this.anInt10489++]; + while (this.aSeqType4.frameDelay[this.anInt10489] < arg0) { + arg0 -= this.aSeqType4.frameDelay[this.anInt10489++]; local68 = true; - if (this.aSeqType4.anIntArray159.length <= this.anInt10489) { - if (this.aSeqType4.anInt1640 != -1 && this.anInt10483 != 2) { - this.anInt10489 -= this.aSeqType4.anInt1640; + if (this.aSeqType4.frames.length <= this.anInt10489) { + if (this.aSeqType4.replayoff != -1 && this.anInt10483 != 2) { + this.anInt10489 -= this.aSeqType4.replayoff; if (this.anInt10483 == 0) { this.anInt10485++; } } - if (this.anInt10485 >= this.aSeqType4.anInt1647 || this.anInt10489 < 0 || this.anInt10489 >= this.aSeqType4.anIntArray159.length) { + if (this.anInt10485 >= this.aSeqType4.replaycount || this.anInt10489 < 0 || this.anInt10489 >= this.aSeqType4.frames.length) { this.aBoolean791 = true; break; } } this.method9086(this.anInt10489, this.aSeqType4); this.anInt10474 = this.anInt10489 + 1; - if (this.anInt10474 >= this.aSeqType4.anIntArray159.length) { - this.anInt10474 -= this.aSeqType4.anInt1640; - if (this.anInt10474 < 0 || this.anInt10474 >= this.aSeqType4.anIntArray159.length) { + if (this.anInt10474 >= this.aSeqType4.frames.length) { + this.anInt10474 -= this.aSeqType4.replayoff; + if (this.anInt10474 < 0 || this.anInt10474 >= this.aSeqType4.frames.length) { this.anInt10474 = -1; } } @@ -319,7 +319,7 @@ public final void method9113(@OriginalArg(0) boolean arg0, @OriginalArg(1) int a @OriginalMember(owner = "client!gu", name = "c", descriptor = "(B)I") public final int method9114() { - return this.aSeqType4 == null ? -1 : this.aSeqType4.anInt1650; + return this.aSeqType4 == null ? -1 : this.aSeqType4.id; } @OriginalMember(owner = "client!gu", name = "a", descriptor = "(Z)V") diff --git a/client/src/main/java/Class236.java b/client/src/main/java/Class236.java index 9d8db37..53d2924 100644 --- a/client/src/main/java/Class236.java +++ b/client/src/main/java/Class236.java @@ -38,7 +38,7 @@ public Class236(@OriginalArg(0) Packet arg0, @OriginalArg(1) int arg1) { @OriginalMember(owner = "client!lw", name = "a", descriptor = "(IBII)V") public void method5360(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { if (this.aClass8_Sub2_Sub1_Sub2_Sub2_1 == null) { - this.aClass8_Sub2_Sub1_Sub2_Sub1_1.aByte144 = this.aClass8_Sub2_Sub1_Sub2_Sub1_1.aByte143 = (byte) arg1; + this.aClass8_Sub2_Sub1_Sub2_Sub1_1.plane = this.aClass8_Sub2_Sub1_Sub2_Sub1_1.aByte143 = (byte) arg1; this.aClass8_Sub2_Sub1_Sub2_Sub1_1.method1419(arg0, arg2); } else { this.aClass8_Sub2_Sub1_Sub2_Sub2_1.method9326(true, arg2, arg0, arg1, this.aClass8_Sub2_Sub1_Sub2_Sub2_1.method9302((byte) 44)); @@ -63,7 +63,7 @@ public void method5364(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @Orig this.aBoolean455 = true; if (this.anInt5980 >= 0) { this.aClass8_Sub2_Sub1_Sub2_Sub2_1 = new Npc(25); - this.aClass8_Sub2_Sub1_Sub2_Sub2_1.anInt10751 = Static333.anInt5455; + this.aClass8_Sub2_Sub1_Sub2_Sub2_1.anInt10751 = Static333.loop; this.aClass8_Sub2_Sub1_Sub2_Sub2_1.anInt10740 = this.anInt5985; this.aClass8_Sub2_Sub1_Sub2_Sub2_1.method9328(Static690.aNpcTypeList2.method7092(this.anInt5980)); this.aClass8_Sub2_Sub1_Sub2_Sub2_1.method9310(this.aClass8_Sub2_Sub1_Sub2_Sub2_1.aNpcType1.anInt6713); @@ -72,13 +72,13 @@ public void method5364(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @Orig } else { this.aClass8_Sub2_Sub1_Sub2_Sub1_1 = new Player(25); this.aClass8_Sub2_Sub1_Sub2_Sub1_1.method1420(Static518.aPacket_18); - this.aClass8_Sub2_Sub1_Sub2_Sub1_1.anInt10751 = Static333.anInt5455; + this.aClass8_Sub2_Sub1_Sub2_Sub1_1.anInt10751 = Static333.loop; this.aClass8_Sub2_Sub1_Sub2_Sub1_1.anInt10739 = Static457.anInt6933++; this.aClass8_Sub2_Sub1_Sub2_Sub1_1.anInt10740 = this.anInt5985; } } if (this.anInt5980 < 0) { - this.aClass8_Sub2_Sub1_Sub2_Sub1_1.aByte144 = this.aClass8_Sub2_Sub1_Sub2_Sub1_1.aByte143 = (byte) arg1; + this.aClass8_Sub2_Sub1_Sub2_Sub1_1.plane = this.aClass8_Sub2_Sub1_Sub2_Sub1_1.aByte143 = (byte) arg1; this.aClass8_Sub2_Sub1_Sub2_Sub1_1.method1419(arg2, arg3); this.aClass8_Sub2_Sub1_Sub2_Sub1_1.method9298(arg0, true); } else { diff --git a/client/src/main/java/Class241.java b/client/src/main/java/Class241.java index 7013aa2..78acd7d 100644 --- a/client/src/main/java/Class241.java +++ b/client/src/main/java/Class241.java @@ -5,16 +5,16 @@ public final class Class241 { @OriginalMember(owner = "client!mga", name = "a", descriptor = "B") - public byte aByte99; + public byte rank; @OriginalMember(owner = "client!mga", name = "d", descriptor = "Ljava/lang/String;") - public String aString65; + public String worldName; @OriginalMember(owner = "client!mga", name = "b", descriptor = "I") - public int anInt6148; + public int world; @OriginalMember(owner = "client!mga", name = "e", descriptor = "Ljava/lang/String;") - public String aString66; + public String username; @OriginalMember(owner = "client!mga", name = "c", descriptor = "Ljava/lang/String;") public String aString67; diff --git a/client/src/main/java/Class257.java b/client/src/main/java/Class257.java index 9e87c6e..990ed39 100644 --- a/client/src/main/java/Class257.java +++ b/client/src/main/java/Class257.java @@ -31,17 +31,17 @@ public boolean method5769(@OriginalArg(0) SeqTypeList arg0, @OriginalArg(2) SeqT return false; } else { this.anInt6448 = arg4[arg3]; - this.aClass2_Sub2_Sub18_1 = arg0.method1166(this.anInt6448 >> 16); + this.aClass2_Sub2_Sub18_1 = arg0.getAnimFrameset(this.anInt6448 >> 16); this.anInt6448 &= 0xFFFF; if (this.aClass2_Sub2_Sub18_1 == null) { return false; } - if (arg1.aBoolean142 && arg2 != -1 && arg4.length > arg2) { + if (arg1.tween && arg2 != -1 && arg4.length > arg2) { this.anInt6450 = arg4[arg2]; - this.aClass2_Sub2_Sub18_2 = arg0.method1166(this.anInt6450 >> 16); + this.aClass2_Sub2_Sub18_2 = arg0.getAnimFrameset(this.anInt6450 >> 16); this.anInt6450 &= 0xFFFF; } - if (arg1.aBoolean140) { + if (arg1.rotateNormals) { this.anInt6452 |= 0x200; } if (this.aClass2_Sub2_Sub18_1.method7570(this.anInt6448)) { diff --git a/client/src/main/java/Class283.java b/client/src/main/java/Class283.java index 063aa47..b1375d4 100644 --- a/client/src/main/java/Class283.java +++ b/client/src/main/java/Class283.java @@ -42,7 +42,7 @@ public Class283(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg this.aString79 = arg5; this.aString80 = arg3; this.aString81 = arg2; - this.anInt7164 = Static333.anInt5455; + this.anInt7164 = Static333.loop; this.anInt7166 = arg0; this.aString77 = arg4; this.aString78 = arg7; @@ -53,7 +53,7 @@ public void method6444(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Orig this.anInt7163 = Static429.method5803(); this.aString81 = arg2; this.aString79 = arg6; - this.anInt7164 = Static333.anInt5455; + this.anInt7164 = Static333.loop; this.aString78 = arg3; this.aString80 = arg5; this.aString77 = arg7; diff --git a/client/src/main/java/Class337.java b/client/src/main/java/Class337.java index f13caaf..b1eec87 100644 --- a/client/src/main/java/Class337.java +++ b/client/src/main/java/Class337.java @@ -89,7 +89,7 @@ public void method7668(@OriginalArg(0) Class19 arg0) { @OriginalMember(owner = "client!sh", name = "a", descriptor = "(Lclient!ha;B)V") public void method7669(@OriginalArg(0) Class19 arg0) { if (this.aClass2_Sub2_Sub9_6 != null) { - Static292.method4618(this.aClass2_Sub2_Sub9_6, this.aByte133, this.aClass8_Sub2_21.anInt10690, this.aClass8_Sub2_21.anInt10694, this.aBooleanArray27); + Static292.method4618(this.aClass2_Sub2_Sub9_6, this.aByte133, this.aClass8_Sub2_21.xFine, this.aClass8_Sub2_21.zFine, this.aBooleanArray27); this.aBooleanArray27 = null; this.aClass2_Sub2_Sub9_6 = null; } @@ -172,7 +172,7 @@ private void method7676(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Ori this.aClass152_9.method9092(local10, 0, arg0, local12); this.aModel8 = null; this.aBoolean662 = false; - this.anInt8643 = Static333.anInt5455; + this.anInt8643 = Static333.loop; } } @@ -201,7 +201,7 @@ public Model method7678(@OriginalArg(0) Class19 arg0, @OriginalArg(1) boolean ar return null; } if (arg3) { - Static292.method4618(this.aClass2_Sub2_Sub9_6, this.aByte133, this.aClass8_Sub2_21.anInt10690, this.aClass8_Sub2_21.anInt10694, this.aBooleanArray27); + Static292.method4618(this.aClass2_Sub2_Sub9_6, this.aByte133, this.aClass8_Sub2_21.xFine, this.aClass8_Sub2_21.zFine, this.aBooleanArray27); this.aBoolean662 = false; } @Pc(142) Class178 local142 = Static246.aClass178Array1[this.aByte133]; @@ -216,7 +216,7 @@ public Model method7678(@OriginalArg(0) Class19 arg0, @OriginalArg(1) boolean ar if (arg3) { arg4 |= 0x40000; } - local171 = local11.getModel(this.anInt8645 == 11 ? this.anInt8663 + 4 : this.anInt8663, this.aClass8_Sub2_21.anInt10694, this.anInt8645 == 11 ? 10 : this.anInt8645, this.aClass8_Sub2_21.anInt10690, local163, this.aClass152_9, arg0, local142, this.aClass150_2, arg4, local142.method7878(this.aClass8_Sub2_21.anInt10694, this.aClass8_Sub2_21.anInt10690)); + local171 = local11.getModel(this.anInt8645 == 11 ? this.anInt8663 + 4 : this.anInt8663, this.aClass8_Sub2_21.zFine, this.anInt8645 == 11 ? 10 : this.anInt8645, this.aClass8_Sub2_21.xFine, local163, this.aClass152_9, arg0, local142, this.aClass150_2, arg4, local142.method7878(this.aClass8_Sub2_21.zFine, this.aClass8_Sub2_21.xFine)); if (local171 == null) { this.aBooleanArray27 = null; this.aClass2_Sub2_Sub9_6 = null; @@ -228,7 +228,7 @@ public Model method7678(@OriginalArg(0) Class19 arg0, @OriginalArg(1) boolean ar this.aBooleanArray27 = new boolean[4]; } this.aClass2_Sub2_Sub9_6 = local171.ba(this.aClass2_Sub2_Sub9_6); - Static630.method8357(this.aClass2_Sub2_Sub9_6, this.aByte133, this.aClass8_Sub2_21.anInt10690, this.aClass8_Sub2_21.anInt10694, this.aBooleanArray27); + Static630.method8357(this.aClass2_Sub2_Sub9_6, this.aByte133, this.aClass8_Sub2_21.xFine, this.aClass8_Sub2_21.zFine, this.aBooleanArray27); this.aBoolean662 = true; } this.anInt8660 = local171.fa(); @@ -241,7 +241,7 @@ public Model method7678(@OriginalArg(0) Class19 arg0, @OriginalArg(1) boolean ar if (this.aModel8 != null) { arg4 |= this.aModel8.ua(); } - @Pc(389) Class272 local389 = local11.method1309(this.anInt8645 == 11 ? this.anInt8663 + 4 : this.anInt8663, this.aClass8_Sub2_21.anInt10694, this.aClass8_Sub2_21.anInt10690, local142, arg3, local142.method7878(this.aClass8_Sub2_21.anInt10694, this.aClass8_Sub2_21.anInt10690), this.anInt8645 == 11 ? 10 : this.anInt8645, arg0, this.aClass150_2, arg4, local163); + @Pc(389) Class272 local389 = local11.method1309(this.anInt8645 == 11 ? this.anInt8663 + 4 : this.anInt8663, this.aClass8_Sub2_21.zFine, this.aClass8_Sub2_21.xFine, local142, arg3, local142.method7878(this.aClass8_Sub2_21.zFine, this.aClass8_Sub2_21.xFine), this.anInt8645 == 11 ? 10 : this.anInt8645, arg0, this.aClass150_2, arg4, local163); if (local389 == null) { this.anInt8652 = 0; this.aBooleanArray27 = null; @@ -254,7 +254,7 @@ public Model method7678(@OriginalArg(0) Class19 arg0, @OriginalArg(1) boolean ar if (arg3) { this.aClass2_Sub2_Sub9_6 = local389.aClass2_Sub2_Sub9_5; this.aBooleanArray27 = null; - Static630.method8357(this.aClass2_Sub2_Sub9_6, this.aByte133, this.aClass8_Sub2_21.anInt10690, this.aClass8_Sub2_21.anInt10694, (boolean[]) null); + Static630.method8357(this.aClass2_Sub2_Sub9_6, this.aByte133, this.aClass8_Sub2_21.xFine, this.aClass8_Sub2_21.zFine, (boolean[]) null); this.aBoolean662 = true; } this.anInt8660 = local171.fa(); @@ -283,7 +283,7 @@ public void finalize() { private void method7680(@OriginalArg(0) ParticleNode_Sub2 arg0, @OriginalArg(1) boolean arg1) { if (!this.aClass152_9.method9109()) { this.method7676(0, -1, false); - } else if (this.aClass152_9.method9112(Static333.anInt5455 - this.anInt8643)) { + } else if (this.aClass152_9.method9112(Static333.loop - this.anInt8643)) { if (Static400.aClass2_Sub34_28.aPreference_Sub12_1.method4364() == 2) { this.aBoolean662 = false; } @@ -294,7 +294,7 @@ private void method7680(@OriginalArg(0) ParticleNode_Sub2 arg0, @OriginalArg(1) } } if (arg1) { - this.anInt8643 = Static333.anInt5455; + this.anInt8643 = Static333.loop; } } @@ -311,7 +311,7 @@ public void method7681(@OriginalArg(0) int arg0, @OriginalArg(1) Model arg1, @Or local37 = local37.getMultiLoc(Static1.anInt10798 == 3 ? Static298.aVarDomain2 : Static34.aClass304_1); } if (local37 != null) { - this.aClass8_Sub5_7 = Static257.method3654(Static333.anInt5455, true); + this.aClass8_Sub5_7 = Static257.method3654(Static333.loop, true); } } if (this.aClass8_Sub5_7 == null) { @@ -319,9 +319,9 @@ public void method7681(@OriginalArg(0) int arg0, @OriginalArg(1) Model arg1, @Or } arg1.method7476(arg8); if (arg2) { - this.aClass8_Sub5_7.method3643(arg4, (long) Static333.anInt5455, local11, local14); + this.aClass8_Sub5_7.method3643(arg4, (long) Static333.loop, local11, local14); } else { - this.aClass8_Sub5_7.method3649((long) Static333.anInt5455); + this.aClass8_Sub5_7.method3649((long) Static333.loop); } this.aClass8_Sub5_7.method3658(this.aByte132, arg6, arg5, arg7, arg0); } diff --git a/client/src/main/java/Class362.java b/client/src/main/java/Class362.java index 189fecb..0334391 100644 --- a/client/src/main/java/Class362.java +++ b/client/src/main/java/Class362.java @@ -33,7 +33,7 @@ public Class323 method8346(@OriginalArg(1) int arg0) { @Override public void run() { try { - @Pc(16) BufferedReader local16 = new BufferedReader(new InputStreamReader((DataInputStream) this.aPrivilegedRequest7.anObject13)); + @Pc(16) BufferedReader local16 = new BufferedReader(new InputStreamReader((DataInputStream) this.aPrivilegedRequest7.result)); @Pc(19) String local19 = local16.readLine(); @Pc(22) Class396 local22 = Static640.method8436(); while (local19 != null) { @@ -61,7 +61,7 @@ public boolean method8349() { if (this.aPrivilegedRequest7 == null) { try { @Pc(23) int local23 = ModeWhere.LIVE == Static2.aModeWhere1 ? 80 : Static527.aClass229_3.worldId + 7000; - this.aPrivilegedRequest7 = Static446.aSignlink6.method8992(new URL("http://" + Static527.aClass229_3.aString60 + ":" + local23 + "/news.ws?game=" + Static392.clientModeGame.id)); + this.aPrivilegedRequest7 = Static446.aSignlink6.openUrlStream(new URL("http://" + Static527.aClass229_3.aString60 + ":" + local23 + "/news.ws?game=" + Static392.clientModeGame.id)); } catch (@Pc(54) MalformedURLException local54) { return true; } diff --git a/client/src/main/java/Class367.java b/client/src/main/java/Class367.java index cfffae0..694fa9c 100644 --- a/client/src/main/java/Class367.java +++ b/client/src/main/java/Class367.java @@ -16,51 +16,51 @@ public final class Class367 { public float aFloat200 = 0.25F; @OriginalMember(owner = "client!uc", name = "e", descriptor = "I") - public int anInt9533; + public int lightY; @OriginalMember(owner = "client!uc", name = "t", descriptor = "Lclient!pu;") public Class67 aClass67_10; @OriginalMember(owner = "client!uc", name = "i", descriptor = "I") - public int anInt9535; + public int lightX; @OriginalMember(owner = "client!uc", name = "d", descriptor = "F") - public float aFloat202; + public float light1Diffuse; @OriginalMember(owner = "client!uc", name = "s", descriptor = "Lclient!gm;") public Class148 aClass148_5; @OriginalMember(owner = "client!uc", name = "p", descriptor = "I") - public int anInt9537; + public int screenColorRgb; @OriginalMember(owner = "client!uc", name = "g", descriptor = "F") - public float aFloat205; + public float light0Diffuse; @OriginalMember(owner = "client!uc", name = "v", descriptor = "F") - public float aFloat204; + public float lightModelAmbient; @OriginalMember(owner = "client!uc", name = "a", descriptor = "I") - public int anInt9534; + public int lightZ; @OriginalMember(owner = "client!uc", name = "f", descriptor = "I") - public int anInt9538; + public int fogColorRgb; @OriginalMember(owner = "client!uc", name = "c", descriptor = "I") - public int anInt9539; + public int fogDepth; @OriginalMember(owner = "client!uc", name = "", descriptor = "()V") public Class367() { - this.anInt9533 = -60; + this.lightY = -60; this.aClass67_10 = Static226.aClass67_9; - this.anInt9535 = -50; - this.aFloat202 = 1.2F; + this.lightX = -50; + this.light1Diffuse = 1.2F; this.aClass148_5 = Static495.aClass148_4; - this.anInt9537 = Static68.anInt4096; - this.aFloat205 = 0.69921875F; - this.aFloat204 = 1.1523438F; - this.anInt9534 = -50; - this.anInt9538 = Static563.anInt8460; - this.anInt9539 = 0; + this.screenColorRgb = Static68.defaultLightColorRgb; + this.light0Diffuse = 0.69921875F; + this.lightModelAmbient = 1.1523438F; + this.lightZ = -50; + this.fogColorRgb = Static563.defaulFogColorRgb; + this.fogDepth = 0; } @OriginalMember(owner = "client!uc", name = "", descriptor = "(Lclient!ge;)V") @@ -91,24 +91,24 @@ public void method8386(@OriginalArg(0) Packet arg0) { @Pc(7) int local7 = arg0.g1(); if (Static400.aClass2_Sub34_28.aPreference_Sub24_1.method7082() == 1 && Static425.aClass19_13.method7955() > 0) { if ((local7 & 0x1) == 0) { - this.anInt9537 = Static68.anInt4096; + this.screenColorRgb = Static68.defaultLightColorRgb; } else { - this.anInt9537 = arg0.g4(); + this.screenColorRgb = arg0.g4(); } if ((local7 & 0x2) == 0) { - this.aFloat204 = 1.1523438F; + this.lightModelAmbient = 1.1523438F; } else { - this.aFloat204 = (float) arg0.g2() / 256.0F; + this.lightModelAmbient = (float) arg0.g2() / 256.0F; } if ((local7 & 0x4) == 0) { - this.aFloat205 = 0.69921875F; + this.light0Diffuse = 0.69921875F; } else { - this.aFloat205 = (float) arg0.g2() / 256.0F; + this.light0Diffuse = (float) arg0.g2() / 256.0F; } if ((local7 & 0x8) == 0) { - this.aFloat202 = 1.2F; + this.light1Diffuse = 1.2F; } else { - this.aFloat202 = (float) arg0.g2() / 256.0F; + this.light1Diffuse = (float) arg0.g2() / 256.0F; } } else { if ((local7 & 0x1) != 0) { @@ -123,29 +123,29 @@ public void method8386(@OriginalArg(0) Packet arg0) { if ((local7 & 0x8) != 0) { arg0.g2(); } - this.aFloat202 = 1.2F; - this.aFloat204 = 1.1523438F; - this.aFloat205 = 0.69921875F; - this.anInt9537 = Static68.anInt4096; + this.light1Diffuse = 1.2F; + this.lightModelAmbient = 1.1523438F; + this.light0Diffuse = 0.69921875F; + this.screenColorRgb = Static68.defaultLightColorRgb; } if ((local7 & 0x10) == 0) { - this.anInt9535 = -50; - this.anInt9534 = -50; - this.anInt9533 = -60; + this.lightX = -50; + this.lightZ = -50; + this.lightY = -60; } else { - this.anInt9535 = arg0.g2s(); - this.anInt9533 = arg0.g2s(); - this.anInt9534 = arg0.g2s(); + this.lightX = arg0.g2s(); + this.lightY = arg0.g2s(); + this.lightZ = arg0.g2s(); } if ((local7 & 0x20) == 0) { - this.anInt9538 = Static563.anInt8460; + this.fogColorRgb = Static563.defaulFogColorRgb; } else { - this.anInt9538 = arg0.g4(); + this.fogColorRgb = arg0.g4(); } if ((local7 & 0x40) == 0) { - this.anInt9539 = 0; + this.fogDepth = 0; } else { - this.anInt9539 = arg0.g2(); + this.fogDepth = arg0.g2(); } if ((local7 & 0x80) == 0) { this.aClass67_10 = Static226.aClass67_9; @@ -162,6 +162,6 @@ public void method8386(@OriginalArg(0) Packet arg0) { @OriginalMember(owner = "client!uc", name = "a", descriptor = "(BLclient!uc;)Z") public boolean method8388(@OriginalArg(1) Class367 arg0) { - return this.anInt9537 == arg0.anInt9537 && arg0.aFloat204 == this.aFloat204 && this.aFloat205 == arg0.aFloat205 && this.aFloat202 == arg0.aFloat202 && arg0.aFloat200 == this.aFloat200 && this.aFloat201 == arg0.aFloat201 && this.aFloat203 == arg0.aFloat203 && this.anInt9538 == arg0.anInt9538 && arg0.anInt9539 == this.anInt9539 && arg0.aClass67_10 == this.aClass67_10 && arg0.aClass148_5 == this.aClass148_5; + return this.screenColorRgb == arg0.screenColorRgb && arg0.lightModelAmbient == this.lightModelAmbient && this.light0Diffuse == arg0.light0Diffuse && this.light1Diffuse == arg0.light1Diffuse && arg0.aFloat200 == this.aFloat200 && this.aFloat201 == arg0.aFloat201 && this.aFloat203 == arg0.aFloat203 && this.fogColorRgb == arg0.fogColorRgb && arg0.fogDepth == this.fogDepth && arg0.aClass67_10 == this.aClass67_10 && arg0.aClass148_5 == this.aClass148_5; } } diff --git a/client/src/main/java/Class374.java b/client/src/main/java/Class374.java index 793f0ae..02b4430 100644 --- a/client/src/main/java/Class374.java +++ b/client/src/main/java/Class374.java @@ -194,16 +194,16 @@ public void method8465(@OriginalArg(0) boolean arg0) { this.method8471(); return; } - @Pc(43) Graphics local43 = Static434.aCanvas7.getGraphics(); + @Pc(43) Graphics local43 = Static434.canvas.getGraphics(); if (local43 == null) { - Static434.aCanvas7.repaint(); + Static434.canvas.repaint(); return; } try { @Pc(63) int local63 = Static449.aClass364_1.method8378(); @Pc(67) String local67 = Static449.aClass364_1.method8377(); if (Static103.anImage1 == null) { - Static103.anImage1 = Static434.aCanvas7.createImage(Static680.anInt10289, Static380.anInt5979); + Static103.anImage1 = Static434.canvas.createImage(Static680.anInt10289, Static380.anInt5979); } @Pc(79) Graphics local79 = Static103.anImage1.getGraphics(); local79.clearRect(0, 0, Static680.anInt10289, Static380.anInt5979); @@ -235,7 +235,7 @@ public void method8465(@OriginalArg(0) boolean arg0) { local79.drawImage(this.anImage11, local286, local296 + (this.anInt9648 - local236) / 2, (ImageObserver) null); local79.drawImage(this.anImage5, local286 + this.anInt9638 - local241, local296 + (this.anInt9648 + -local246) / 2, (ImageObserver) null); if (this.anImage13 == null) { - this.anImage13 = Static434.aCanvas7.createImage(this.anInt9638 - local231 - local241, this.anInt9648); + this.anImage13 = Static434.canvas.createImage(this.anInt9638 - local231 - local241, this.anInt9648); } @Pc(358) Graphics local358 = this.anImage13.getGraphics(); for (@Pc(360) int local360 = 0; local360 < this.anInt9638 - local241 - local231; local360 += local256) { @@ -247,7 +247,7 @@ public void method8465(@OriginalArg(0) boolean arg0) { @Pc(439) int local439 = local63 * (this.anInt9638 - local241 - local231) / 100; @Pc(480) int local480; if (local439 > 0) { - @Pc(458) Image local458 = Static434.aCanvas7.createImage(local439, this.anInt9648 - local251 - local261); + @Pc(458) Image local458 = Static434.canvas.createImage(local439, this.anInt9648 - local251 - local261); @Pc(462) int local462 = local458.getWidth((ImageObserver) null); @Pc(465) Graphics local465 = local458.getGraphics(); @Pc(475) int local475 = this.anInt9644 * Static556.method7302() / 10 % local271; @@ -259,7 +259,7 @@ public void method8465(@OriginalArg(0) boolean arg0) { @Pc(516) int local516 = local439; local439 = this.anInt9638 - local241 - local231 - local439; if (local439 > 0) { - @Pc(542) Image local542 = Static434.aCanvas7.createImage(local439, this.anInt9648 - local251 - local261); + @Pc(542) Image local542 = Static434.canvas.createImage(local439, this.anInt9648 - local251 - local261); @Pc(546) int local546 = local542.getWidth((ImageObserver) null); @Pc(549) Graphics local549 = local542.getGraphics(); for (local480 = 0; local480 < local546; local480 += local276) { diff --git a/client/src/main/java/Class39_Sub10.java b/client/src/main/java/Class39_Sub10.java index 48b8448..a6e6166 100644 --- a/client/src/main/java/Class39_Sub10.java +++ b/client/src/main/java/Class39_Sub10.java @@ -59,6 +59,6 @@ public Class39_Sub10(@OriginalArg(0) Packet arg0) { @OriginalMember(owner = "client!hs", name = "b", descriptor = "(I)V") @Override public void method9161() { - Static219.aClass236Array1[this.anInt4120].method5363().method9301(this.anInt4126, 0, this.anInt4122, this.anInt4125, Static333.anInt5455, this.anInt4123, this.anInt4119); + Static219.aClass236Array1[this.anInt4120].method5363().method9301(this.anInt4126, 0, this.anInt4122, this.anInt4125, Static333.loop, this.anInt4123, this.anInt4119); } } diff --git a/client/src/main/java/Class39_Sub14.java b/client/src/main/java/Class39_Sub14.java index 0ba1969..0d17382 100644 --- a/client/src/main/java/Class39_Sub14.java +++ b/client/src/main/java/Class39_Sub14.java @@ -29,6 +29,6 @@ public Class39_Sub14(@OriginalArg(0) Packet arg0) { @OriginalMember(owner = "client!lm", name = "b", descriptor = "(I)V") @Override public void method9161() { - Static161.method2586(this.anInt5879, 0, this.anInt5872, this.anInt5874, this.anInt5880); + Static161.play(this.anInt5879, 0, this.anInt5872, this.anInt5874, this.anInt5880); } } diff --git a/client/src/main/java/Class39_Sub18.java b/client/src/main/java/Class39_Sub18.java index 1946576..d1e63a2 100644 --- a/client/src/main/java/Class39_Sub18.java +++ b/client/src/main/java/Class39_Sub18.java @@ -42,12 +42,12 @@ public void method9161() { Static71.anInt1581 = this.anInt8178; Static197.anInt3260 = 0; Static374.anInt5907 = 1; - Static511.anInt7645 = 3; + Static511.cameraType = 3; Static260.anInt4244 = 0; Static591.anInt8739 = this.anInt8182; Static303.anInt4868 = this.anInt8180; Static410.anInt6322 = this.anInt8184; - Static583.method7659(); + Static583.updateLoginScreenCamera(); Static421.aBoolean480 = true; } } diff --git a/client/src/main/java/Class39_Sub23.java b/client/src/main/java/Class39_Sub23.java index eb49f87..0fa0d75 100644 --- a/client/src/main/java/Class39_Sub23.java +++ b/client/src/main/java/Class39_Sub23.java @@ -91,9 +91,9 @@ public void method9161() { @Pc(15) PathingEntity local15; if (this.anInt9980 < 0) { local15 = Static219.aClass236Array1[this.anInt9982].method5363(); - local18 = local15.aByte144; - local21 = local15.anInt10694; - local24 = local15.anInt10690; + local18 = local15.plane; + local21 = local15.zFine; + local24 = local15.xFine; } else { local21 = this.anInt9972 * 512 + 256; local24 = this.anInt9980 * 512 + 256; @@ -106,15 +106,15 @@ public void method9161() { local63 = this.anInt9985 * 512 + 256; } else { local15 = Static219.aClass236Array1[this.anInt9989].method5363(); - local63 = local15.anInt10690; - local56 = local15.anInt10694; + local63 = local15.xFine; + local56 = local15.zFine; if (local18 < 0) { - local18 = local15.aByte144; + local18 = local15.plane; } } @Pc(91) int local91 = this.anInt9979 << 2; - @Pc(128) ProjAnimEntity local128 = new ProjAnimEntity(this.anInt9976, local18, local18, local24, local21, this.anInt9974 << 2, Static333.anInt5455, Static333.anInt5455 + this.anInt9978, this.anInt9977, local91, this.anInt9982 + 1, this.anInt9989 + 1, this.anInt9988 << 2, false, 0); - local128.method813(this.anInt9988 << 2, this.anInt9978 + Static333.anInt5455, local56, local63); + @Pc(128) ProjAnimEntity local128 = new ProjAnimEntity(this.anInt9976, local18, local18, local24, local21, this.anInt9974 << 2, Static333.loop, Static333.loop + this.anInt9978, this.anInt9977, local91, this.anInt9982 + 1, this.anInt9989 + 1, this.anInt9988 << 2, false, 0); + local128.method813(this.anInt9988 << 2, this.anInt9978 + Static333.loop, local56, local63); Static505.aLinkedList77.addTail(new SecondaryLinkable_Sub15(local128)); } } diff --git a/client/src/main/java/Class39_Sub5.java b/client/src/main/java/Class39_Sub5.java index fd02517..df1ed5f 100644 --- a/client/src/main/java/Class39_Sub5.java +++ b/client/src/main/java/Class39_Sub5.java @@ -24,9 +24,9 @@ public void method9161() { Static323.anInt5120 = Static399.anInt6215; Static493.anInt7370 = Static186.anInt3059; Static582.anInt8628 = Static337.anInt5556; - Static4.anInt84 = this.anInt3000 + Static333.anInt5455; + Static4.anInt84 = this.anInt3000 + Static333.loop; Static201.anInt8407 = Static622.anInt7737; - Static115.anInt2259 = Static333.anInt5455; + Static115.anInt2259 = Static333.loop; Static622.anInt7737 = this.anInt2996 & 0xFF; Static337.anInt5556 = this.anInt2996 >>> 16 & 0xFF; Static399.anInt6215 = this.anInt2996 >>> 24; diff --git a/client/src/main/java/Class39_Sub9.java b/client/src/main/java/Class39_Sub9.java index 89bf522..5f9bd09 100644 --- a/client/src/main/java/Class39_Sub9.java +++ b/client/src/main/java/Class39_Sub9.java @@ -21,6 +21,6 @@ public Class39_Sub9(@OriginalArg(0) Packet arg0) { @OriginalMember(owner = "client!hb", name = "b", descriptor = "(I)V") @Override public void method9161() { - Static482.method6481(this.anInt3692, this.anInt3695, 0); + Static482.playJingle(this.anInt3692, this.anInt3695, 0); } } diff --git a/client/src/main/java/ClientScript.java b/client/src/main/java/ClientScript.java index e4e61da..b80bc88 100644 --- a/client/src/main/java/ClientScript.java +++ b/client/src/main/java/ClientScript.java @@ -20,7 +20,7 @@ public final class ClientScript extends SecondaryLinkable { public int anInt2949; @OriginalMember(owner = "client!fj", name = "B", descriptor = "[Lclient!av;") - public HashTable[] aHashTableArray1; + public HashTable[] switchTables; @OriginalMember(owner = "client!fj", name = "E", descriptor = "[Ljava/lang/String;") public String[] aStringArray14; diff --git a/client/src/main/java/ClientStream.java b/client/src/main/java/ClientStream.java index 49b53b5..349e60d 100644 --- a/client/src/main/java/ClientStream.java +++ b/client/src/main/java/ClientStream.java @@ -186,7 +186,7 @@ public void method5829(@OriginalArg(1) int arg0, @OriginalArg(2) byte[] arg1) th } } if (this.aPrivilegedRequest3 == null) { - this.aPrivilegedRequest3 = this.aSignlink5.method8991(this, 3); + this.aPrivilegedRequest3 = this.aSignlink5.startThread(this, 3); } this.notifyAll(); } @@ -207,7 +207,7 @@ public void shutDown() { } if (this.aPrivilegedRequest3.state == 1) { try { - ((Thread) this.aPrivilegedRequest3.anObject13).join(); + ((Thread) this.aPrivilegedRequest3.result).join(); } catch (@Pc(60) InterruptedException e) { e.printStackTrace(); } diff --git a/client/src/main/java/Component.java b/client/src/main/java/Component.java index c55ad84..db05a87 100644 --- a/client/src/main/java/Component.java +++ b/client/src/main/java/Component.java @@ -12,31 +12,31 @@ public final class Component { public static final SoftLruHashTable modelCache = new SoftLruHashTable(50); @OriginalMember(owner = "client!hda", name = "M", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray1; + public Object[] onRelease; @OriginalMember(owner = "client!hda", name = "Jc", descriptor = "[Ljava/lang/String;") - public String[] aStringArray17; + public String[] ops; @OriginalMember(owner = "client!hda", name = "Ub", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray2; + public Object[] onVarcTransmit; @OriginalMember(owner = "client!hda", name = "ed", descriptor = "[S") private short[] aShortArray55; @OriginalMember(owner = "client!hda", name = "jd", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray3; + public Object[] onTimer; @OriginalMember(owner = "client!hda", name = "ud", descriptor = "[I") public int[] anIntArray293; @OriginalMember(owner = "client!hda", name = "Zb", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray4; + public Object[] onMouseOver; @OriginalMember(owner = "client!hda", name = "c", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray5; + public Object[] onDragRelease; @OriginalMember(owner = "client!hda", name = "eb", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray6; + public Object[] onWidgetsOpenClose; @OriginalMember(owner = "client!hda", name = "rb", descriptor = "[S") private short[] aShortArray56; @@ -48,22 +48,22 @@ public final class Component { public ParticleSystem aClass8_Sub5_4; @OriginalMember(owner = "client!hda", name = "bc", descriptor = "Z") - public boolean aBoolean291; + public boolean vFlip; @OriginalMember(owner = "client!hda", name = "Eb", descriptor = "[B") public byte[] aByteArray36; @OriginalMember(owner = "client!hda", name = "mb", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray7; + public Object[] onMsg; @OriginalMember(owner = "client!hda", name = "gc", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray8; + public Object[] onInvTransmit; @OriginalMember(owner = "client!hda", name = "ic", descriptor = "Z") - public boolean aBoolean293; + public boolean hFlip; @OriginalMember(owner = "client!hda", name = "wc", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray9; + public Object[] onStockTransmit; @OriginalMember(owner = "client!hda", name = "zc", descriptor = "I") public int anInt3774; @@ -72,7 +72,7 @@ public final class Component { public Object[] anObjectArray10; @OriginalMember(owner = "client!hda", name = "m", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray11; + public Object[] onScroll; @OriginalMember(owner = "client!hda", name = "s", descriptor = "Lclient!gu;") public Class152 aClass152_6; @@ -93,28 +93,28 @@ public final class Component { public String aString40; @OriginalMember(owner = "client!hda", name = "Hc", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray14; + public Object[] onUse; @OriginalMember(owner = "client!hda", name = "W", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray15; + public Object[] onOptionClick; @OriginalMember(owner = "client!hda", name = "o", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray16; + public Object[] onUseWith; @OriginalMember(owner = "client!hda", name = "Nb", descriptor = "[I") public int[] anIntArray294; @OriginalMember(owner = "client!hda", name = "bd", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray17; + public Object[] onClickRepeat; @OriginalMember(owner = "client!hda", name = "Rb", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray18; + public Object[] onVarcstrTransmit; @OriginalMember(owner = "client!hda", name = "od", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray19; + public Object[] onResize; @OriginalMember(owner = "client!hda", name = "B", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray20; + public Object[] onDialogAbort; @OriginalMember(owner = "client!hda", name = "H", descriptor = "Ljava/lang/String;") public String aString42; @@ -123,10 +123,10 @@ public final class Component { private short[] aShortArray57; @OriginalMember(owner = "client!hda", name = "Yc", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray21; + public Object[] onStatTransmit; @OriginalMember(owner = "client!hda", name = "D", descriptor = "[I") - public int[] anIntArray295; + public int[] statTriggers; @OriginalMember(owner = "client!hda", name = "Oc", descriptor = "[Lclient!hda;") public Component[] aComponentArray1; @@ -135,31 +135,31 @@ public final class Component { public int anInt3796; @OriginalMember(owner = "client!hda", name = "fd", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray22; + public Object[] onKey; @OriginalMember(owner = "client!hda", name = "sb", descriptor = "[Ljava/lang/Object;") public Object[] anObjectArray23; @OriginalMember(owner = "client!hda", name = "v", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray24; + public Object[] onDrag; @OriginalMember(owner = "client!hda", name = "Qb", descriptor = "[Lclient!hda;") - public Component[] aComponentArray2; + public Component[] createdComponents; @OriginalMember(owner = "client!hda", name = "r", descriptor = "[I") - public int[] anIntArray296; + public int[] varcstrTriggers; @OriginalMember(owner = "client!hda", name = "db", descriptor = "[B") public byte[] aByteArray37; @OriginalMember(owner = "client!hda", name = "Xc", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray25; + public Object[] onVarpTransmit; @OriginalMember(owner = "client!hda", name = "V", descriptor = "[I") public int[] anIntArray297; @OriginalMember(owner = "client!hda", name = "Bb", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray26; + public Object[] onMouseLeave; @OriginalMember(owner = "client!hda", name = "qd", descriptor = "Lclient!av;") private HashTable aHashTable17; @@ -168,49 +168,49 @@ public final class Component { public int anInt3815; @OriginalMember(owner = "client!hda", name = "ac", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray27; + public Object[] onClanTransmit; @OriginalMember(owner = "client!hda", name = "Pb", descriptor = "[I") - public int[] anIntArray298; + public int[] varcTriggers; @OriginalMember(owner = "client!hda", name = "z", descriptor = "[I") - public int[] anIntArray299; + public int[] inventoryTriggers; @OriginalMember(owner = "client!hda", name = "yb", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray28; + public Object[] onMouseRepeat; @OriginalMember(owner = "client!hda", name = "ib", descriptor = "[S") private short[] aShortArray58; @OriginalMember(owner = "client!hda", name = "Ab", descriptor = "[I") - public int[] anIntArray300; + public int[] varpTriggers; @OriginalMember(owner = "client!hda", name = "P", descriptor = "I") - public int anInt3820; + public int type; @OriginalMember(owner = "client!hda", name = "Dc", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray29; + public Object[] onFriendTransmit; @OriginalMember(owner = "client!hda", name = "x", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray30; + public Object[] onDragStart; @OriginalMember(owner = "client!hda", name = "Fb", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray31; + public Object[] onMinimapUnlock; @OriginalMember(owner = "client!hda", name = "Q", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray32; + public Object[] onHold; @OriginalMember(owner = "client!hda", name = "cc", descriptor = "[Ljava/lang/Object;") public Object[] anObjectArray33; @OriginalMember(owner = "client!hda", name = "wd", descriptor = "[Ljava/lang/Object;") - public Object[] anObjectArray34; + public Object[] onMiscTransmit; @OriginalMember(owner = "client!hda", name = "Z", descriptor = "[I") public int[] anIntArray301; @OriginalMember(owner = "client!hda", name = "Mb", descriptor = "I") - public int anInt3831; + public int modelId; @OriginalMember(owner = "client!hda", name = "L", descriptor = "Z") public boolean aBoolean302; @@ -231,46 +231,46 @@ public final class Component { public int anInt3775 = 0; @OriginalMember(owner = "client!hda", name = "ad", descriptor = "Z") - public boolean aBoolean285 = false; + public boolean modelOrtho = false; @OriginalMember(owner = "client!hda", name = "Hb", descriptor = "I") - public int anInt3737 = 0; + public int modelYOffset = 0; @OriginalMember(owner = "client!hda", name = "e", descriptor = "I") - public int anInt3778 = 1; + public int lineWidth = 1; @OriginalMember(owner = "client!hda", name = "vd", descriptor = "I") - public int anInt3765 = 0; + public int angle2d = 0; @OriginalMember(owner = "client!hda", name = "Wb", descriptor = "I") - public int anInt3781 = -1; + public int font = -1; @OriginalMember(owner = "client!hda", name = "hc", descriptor = "Z") public boolean aBoolean289 = false; @OriginalMember(owner = "client!hda", name = "yd", descriptor = "Z") - public boolean aBoolean294 = false; + public boolean filled = false; @OriginalMember(owner = "client!hda", name = "Yb", descriptor = "I") - public int anInt3744 = 0; + public int baseWidth = 0; @OriginalMember(owner = "client!hda", name = "J", descriptor = "I") public int anInt3788 = 0; @OriginalMember(owner = "client!hda", name = "cb", descriptor = "B") - public byte aByte63 = 0; + public byte dynamicWidthValue = 0; @OriginalMember(owner = "client!hda", name = "n", descriptor = "I") - public int anInt3735 = 0; + public int x = 0; @OriginalMember(owner = "client!hda", name = "t", descriptor = "I") public int anInt3783 = -1; @OriginalMember(owner = "client!hda", name = "Lb", descriptor = "Ljava/lang/String;") - public String aString41 = ""; + public String optionBase = ""; @OriginalMember(owner = "client!hda", name = "Ed", descriptor = "B") - public byte aByte62 = 0; + public byte dynamicHeightValue = 0; @OriginalMember(owner = "client!hda", name = "Mc", descriptor = "I") public int anInt3791 = 0; @@ -279,28 +279,28 @@ public final class Component { public boolean aBoolean295 = true; @OriginalMember(owner = "client!hda", name = "nd", descriptor = "I") - public int anInt3780 = 0; + public int alpha = 0; @OriginalMember(owner = "client!hda", name = "l", descriptor = "I") - public int anInt3779 = 0; + public int color = 0; @OriginalMember(owner = "client!hda", name = "bb", descriptor = "I") - public int anInt3741 = -1; + public int createdComponentId = -1; @OriginalMember(owner = "client!hda", name = "lb", descriptor = "I") public int lb = -1; @OriginalMember(owner = "client!hda", name = "yc", descriptor = "I") - public int anInt3789 = -1; + public int modelSeqId = -1; @OriginalMember(owner = "client!hda", name = "Ib", descriptor = "I") - public int anInt3797 = 0; + public int dragDeadtime = 0; @OriginalMember(owner = "client!hda", name = "Tb", descriptor = "I") - public int anInt3798 = 0; + public int shadowColor = 0; @OriginalMember(owner = "client!hda", name = "Fc", descriptor = "I") - public int anInt3736 = 0; + public int modelXOffset = 0; @OriginalMember(owner = "client!hda", name = "gb", descriptor = "I") public int anInt3757 = 2; @@ -312,88 +312,88 @@ public final class Component { public boolean aBoolean297 = false; @OriginalMember(owner = "client!hda", name = "Sb", descriptor = "I") - public int anInt3773 = 0; + public int outlineThickness = 0; @OriginalMember(owner = "client!hda", name = "td", descriptor = "Ljava/lang/String;") - public String aString43 = ""; + public String optionCircumfix = ""; @OriginalMember(owner = "client!hda", name = "S", descriptor = "I") public int anInt3750 = 1; @OriginalMember(owner = "client!hda", name = "gd", descriptor = "I") - public int anInt3748 = 0; + public int vpadding = 0; @OriginalMember(owner = "client!hda", name = "pb", descriptor = "Z") public boolean aBoolean298 = false; @OriginalMember(owner = "client!hda", name = "vb", descriptor = "I") - public int anInt3812 = -1; + public int id = -1; @OriginalMember(owner = "client!hda", name = "Cb", descriptor = "I") - public int anInt3811 = 0; + public int modelYAngle = 0; @OriginalMember(owner = "client!hda", name = "Ac", descriptor = "I") - public int anInt3807 = 0; + public int modelXAngle = 0; @OriginalMember(owner = "client!hda", name = "b", descriptor = "I") - public int anInt3760 = -1; + public int objId = -1; @OriginalMember(owner = "client!hda", name = "oc", descriptor = "I") - public int anInt3810 = -1; + public int spriteId = -1; @OriginalMember(owner = "client!hda", name = "Lc", descriptor = "Z") public boolean aBoolean287 = false; @OriginalMember(owner = "client!hda", name = "dd", descriptor = "B") - public byte aByte61 = 0; + public byte yMode = 0; @OriginalMember(owner = "client!hda", name = "Uc", descriptor = "I") - public int anInt3809 = 0; + public int scrollX = 0; @OriginalMember(owner = "client!hda", name = "vc", descriptor = "I") - public int anInt3754 = 0; + public int dragDeadzone = 0; @OriginalMember(owner = "client!hda", name = "qb", descriptor = "I") public int anInt3803 = 0; @OriginalMember(owner = "client!hda", name = "wb", descriptor = "I") - public int anInt3793 = 100; + public int modelZoom = 100; @OriginalMember(owner = "client!hda", name = "qc", descriptor = "Z") public boolean aBoolean292 = false; @OriginalMember(owner = "client!hda", name = "ld", descriptor = "I") - public int anInt3742 = 0; + public int scrollMaxV = 0; @OriginalMember(owner = "client!hda", name = "O", descriptor = "Z") - public boolean aBoolean286 = false; + public boolean shadowed = false; @OriginalMember(owner = "client!hda", name = "Cd", descriptor = "I") - public int anInt3814 = 0; + public int valign = 0; @OriginalMember(owner = "client!hda", name = "Db", descriptor = "I") public int anInt3761 = 0; @OriginalMember(owner = "client!hda", name = "h", descriptor = "I") - public int anInt3768 = 0; + public int scrollY = 0; @OriginalMember(owner = "client!hda", name = "f", descriptor = "Ljava/lang/String;") - public String aString44 = ""; + public String text = ""; @OriginalMember(owner = "client!hda", name = "Vb", descriptor = "Z") public boolean aBoolean299 = true; @OriginalMember(owner = "client!hda", name = "ab", descriptor = "I") - public int anInt3784 = 0; + public int y = 0; @OriginalMember(owner = "client!hda", name = "g", descriptor = "I") public int anInt3795 = 1; @OriginalMember(owner = "client!hda", name = "Kc", descriptor = "I") - public int anInt3769 = 0; + public int scrollMaxH = 0; @OriginalMember(owner = "client!hda", name = "ub", descriptor = "I") - public int anInt3817 = 0; + public int objCount = 0; @OriginalMember(owner = "client!hda", name = "jc", descriptor = "I") public int anInt3800 = 0; @@ -402,31 +402,31 @@ public final class Component { public int anInt3776 = -1; @OriginalMember(owner = "client!hda", name = "A", descriptor = "I") - public int anInt3802 = 0; + public int width = 0; @OriginalMember(owner = "client!hda", name = "Cc", descriptor = "I") - public int anInt3818 = 0; + public int halign = 0; @OriginalMember(owner = "client!hda", name = "Vc", descriptor = "I") - public int anInt3746 = 0; + public int height = 0; @OriginalMember(owner = "client!hda", name = "y", descriptor = "I") public int anInt3805 = 0; @OriginalMember(owner = "client!hda", name = "jb", descriptor = "I") - public int anInt3823 = 1; + public int modelType = 1; @OriginalMember(owner = "client!hda", name = "w", descriptor = "Lclient!ofa;") - public ServerActiveProperties aClass2_Sub41_2 = ServerActiveProperties.aClass2_Sub41_1; + public ServerActiveProperties aClass2_Sub41_2 = ServerActiveProperties.DEFAULT_SERVER_ACTIVE_PROPERTIES; @OriginalMember(owner = "client!hda", name = "Ec", descriptor = "I") - public int anInt3806 = 0; + public int clientCode = 0; @OriginalMember(owner = "client!hda", name = "Rc", descriptor = "I") - public int anInt3804 = 0; + public int modelZOffset = 0; @OriginalMember(owner = "client!hda", name = "Pc", descriptor = "I") - public int anInt3762 = 0; + public int baseHeight = 0; @OriginalMember(owner = "client!hda", name = "nb", descriptor = "I") public int anInt3825 = 0; @@ -435,7 +435,7 @@ public final class Component { public int anInt3738 = -1; @OriginalMember(owner = "client!hda", name = "zb", descriptor = "I") - public int anInt3743 = -1; + public int overlayer = -1; @OriginalMember(owner = "client!hda", name = "R", descriptor = "I") public int anInt3801 = 0; @@ -453,10 +453,10 @@ public final class Component { public boolean aBoolean300 = false; @OriginalMember(owner = "client!hda", name = "fc", descriptor = "Z") - public boolean aBoolean284 = false; + public boolean hidden = false; @OriginalMember(owner = "client!hda", name = "xc", descriptor = "I") - public int anInt3826 = 0; + public int baseX = 0; @OriginalMember(owner = "client!hda", name = "kb", descriptor = "Z") public boolean aBoolean301 = false; @@ -468,16 +468,16 @@ public final class Component { public int anInt3799 = 0; @OriginalMember(owner = "client!hda", name = "Wc", descriptor = "I") - public int anInt3830 = Static351.anInt5719; + public int dragRenderBehavior = Static351.anInt5719; @OriginalMember(owner = "client!hda", name = "N", descriptor = "Z") public boolean aBoolean288 = false; @OriginalMember(owner = "client!hda", name = "cd", descriptor = "B") - public byte aByte64 = 0; + public byte xMode = 0; @OriginalMember(owner = "client!hda", name = "Gb", descriptor = "I") - public int anInt3808 = 0; + public int baseY = 0; @OriginalMember(owner = "client!hda", name = "kc", descriptor = "I") public int anInt3821 = 0; @@ -488,35 +488,35 @@ public final class Component { @OriginalMember(owner = "client!hda", name = "a", descriptor = "(ZLclient!ha;)Lclient!st;") public SoftwareIndexedSprite method3383(@OriginalArg(1) Class19 arg0) { Static544.aBoolean624 = false; - @Pc(54) long local54 = ((long) this.anInt3798 << 40) + (((this.aBoolean292 ? 1L : 0L) << 35) + (long) this.anInt3810 - (-((long) this.anInt3773 << 36) + -((this.aBoolean291 ? 1L : 0L) << 38)) + ((this.aBoolean293 ? 1L : 0L) << 39)); + @Pc(54) long local54 = ((long) this.shadowColor << 40) + (((this.aBoolean292 ? 1L : 0L) << 35) + (long) this.spriteId - (-((long) this.outlineThickness << 36) + -((this.vFlip ? 1L : 0L) << 38)) + ((this.hFlip ? 1L : 0L) << 39)); @Pc(60) SoftwareIndexedSprite local60 = (SoftwareIndexedSprite) spriteCache.get(local54); if (local60 != null) { return local60; } - @Pc(71) Class407 local71 = Static735.method9382(Static262.aJs556, this.anInt3810, 0); + @Pc(71) Class407 local71 = Static735.method9382(Static262.aJs556, this.spriteId, 0); if (local71 == null) { Static544.aBoolean624 = true; return null; } - if (this.aBoolean291) { + if (this.vFlip) { local71.method9377(); } - if (this.aBoolean293) { + if (this.hFlip) { local71.method9388(); } - if (this.anInt3773 > 0) { - local71.method9380(this.anInt3773); - } else if (this.anInt3798 != 0) { + if (this.outlineThickness > 0) { + local71.method9380(this.outlineThickness); + } else if (this.shadowColor != 0) { local71.method9380(1); } - if (this.anInt3773 >= 1) { + if (this.outlineThickness >= 1) { local71.method9385(1); } - if (this.anInt3773 >= 2) { + if (this.outlineThickness >= 2) { local71.method9385(16777215); } - if (this.anInt3798 != 0) { - local71.method9381(this.anInt3798 | 0xFF000000); + if (this.shadowColor != 0) { + local71.method9381(this.shadowColor | 0xFF000000); } local60 = arg0.method7948(local71, true); spriteCache.put(local54, local60, local60.method8199() * local60.method8182() * 4); @@ -594,125 +594,125 @@ public String method3389(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1) } @OriginalMember(owner = "client!hda", name = "a", descriptor = "(Lclient!ge;B)V") - public void method3390(@OriginalArg(0) Packet arg0) { + public void decodeIf3(@OriginalArg(0) Packet arg0) { @Pc(7) int local7 = arg0.g1(); if (local7 == 255) { local7 = -1; } - this.anInt3820 = arg0.g1(); - if ((this.anInt3820 & 0x80) != 0) { - this.anInt3820 &= 0x7F; + this.type = arg0.g1(); + if ((this.type & 0x80) != 0) { + this.type &= 0x7F; this.aString40 = arg0.gjstr(); } - this.anInt3806 = arg0.g2(); - this.anInt3826 = arg0.g2s(); - this.anInt3808 = arg0.g2s(); - this.anInt3744 = arg0.g2(); - this.anInt3762 = arg0.g2(); - this.aByte63 = arg0.g1b(); - this.aByte62 = arg0.g1b(); - this.aByte61 = arg0.g1b(); - this.aByte64 = arg0.g1b(); - this.anInt3743 = arg0.g2(); - if (this.anInt3743 == 65535) { - this.anInt3743 = -1; + this.clientCode = arg0.g2(); + this.baseX = arg0.g2s(); + this.baseY = arg0.g2s(); + this.baseWidth = arg0.g2(); + this.baseHeight = arg0.g2(); + this.dynamicWidthValue = arg0.g1b(); + this.dynamicHeightValue = arg0.g1b(); + this.yMode = arg0.g1b(); + this.xMode = arg0.g1b(); + this.overlayer = arg0.g2(); + if (this.overlayer == 65535) { + this.overlayer = -1; } else { - this.anInt3743 += this.anInt3812 & 0xFFFF0000; + this.overlayer += this.id & 0xFFFF0000; } @Pc(110) int local110 = arg0.g1(); - this.aBoolean284 = (local110 & 0x1) != 0; + this.hidden = (local110 & 0x1) != 0; if (local7 >= 0) { this.aBoolean300 = (local110 & 0x2) != 0; } - if (this.anInt3820 == 0) { - this.anInt3769 = arg0.g2(); - this.anInt3742 = arg0.g2(); + if (this.type == 0) { + this.scrollMaxH = arg0.g2(); + this.scrollMaxV = arg0.g2(); if (local7 < 0) { this.aBoolean300 = arg0.g1() == 1; } } @Pc(191) int local191; - if (this.anInt3820 == 5) { - this.anInt3810 = arg0.g4(); - this.anInt3765 = arg0.g2(); + if (this.type == 5) { + this.spriteId = arg0.g4(); + this.angle2d = arg0.g2(); local191 = arg0.g1(); this.aBoolean301 = (local191 & 0x1) != 0; this.aBoolean292 = (local191 & 0x2) != 0; - this.anInt3780 = arg0.g1(); - this.anInt3773 = arg0.g1(); - this.anInt3798 = arg0.g4(); - this.aBoolean291 = arg0.g1() == 1; - this.aBoolean293 = arg0.g1() == 1; - this.anInt3779 = arg0.g4(); + this.alpha = arg0.g1(); + this.outlineThickness = arg0.g1(); + this.shadowColor = arg0.g4(); + this.vFlip = arg0.g1() == 1; + this.hFlip = arg0.g1() == 1; + this.color = arg0.g4(); if (local7 >= 3) { this.aBoolean295 = arg0.g1() == 1; } } - if (this.anInt3820 == 6) { - this.anInt3823 = 1; - this.anInt3831 = arg0.g2(); - if (this.anInt3831 == 65535) { - this.anInt3831 = -1; + if (this.type == 6) { + this.modelType = 1; + this.modelId = arg0.g2(); + if (this.modelId == 65535) { + this.modelId = -1; } local191 = arg0.g1(); - this.aBoolean285 = (local191 & 0x4) == 4; + this.modelOrtho = (local191 & 0x4) == 4; @Pc(326) boolean local326 = (local191 & 0x1) == 1; this.aBoolean302 = (local191 & 0x2) == 2; this.aBoolean289 = (local191 & 0x8) == 8; if (local326) { this.anInt3755 = arg0.g2s(); this.anInt3799 = arg0.g2s(); - this.anInt3807 = arg0.g2(); - this.anInt3811 = arg0.g2(); - this.anInt3737 = arg0.g2(); - this.anInt3793 = arg0.g2(); + this.modelXAngle = arg0.g2(); + this.modelYAngle = arg0.g2(); + this.modelYOffset = arg0.g2(); + this.modelZoom = arg0.g2(); } else if (this.aBoolean302) { this.anInt3755 = arg0.g2s(); this.anInt3799 = arg0.g2s(); this.anInt3821 = arg0.g2s(); - this.anInt3807 = arg0.g2(); - this.anInt3811 = arg0.g2(); - this.anInt3737 = arg0.g2(); - this.anInt3793 = arg0.g2s(); + this.modelXAngle = arg0.g2(); + this.modelYAngle = arg0.g2(); + this.modelYOffset = arg0.g2(); + this.modelZoom = arg0.g2s(); } - this.anInt3789 = arg0.g2(); - if (this.anInt3789 == 65535) { - this.anInt3789 = -1; + this.modelSeqId = arg0.g2(); + if (this.modelSeqId == 65535) { + this.modelSeqId = -1; } - if (this.aByte63 != 0) { + if (this.dynamicWidthValue != 0) { this.anInt3800 = arg0.g2(); } - if (this.aByte62 != 0) { + if (this.dynamicHeightValue != 0) { this.anInt3825 = arg0.g2(); } } - if (this.anInt3820 == 4) { - this.anInt3781 = arg0.g2(); - if (this.anInt3781 == 65535) { - this.anInt3781 = -1; + if (this.type == 4) { + this.font = arg0.g2(); + if (this.font == 65535) { + this.font = -1; } if (local7 >= 2) { this.aBoolean299 = arg0.g1() == 1; } - this.aString44 = arg0.gjstr(); - this.anInt3748 = arg0.g1(); - this.anInt3818 = arg0.g1(); - this.anInt3814 = arg0.g1(); - this.aBoolean286 = arg0.g1() == 1; - this.anInt3779 = arg0.g4(); - this.anInt3780 = arg0.g1(); + this.text = arg0.gjstr(); + this.vpadding = arg0.g1(); + this.halign = arg0.g1(); + this.valign = arg0.g1(); + this.shadowed = arg0.g1() == 1; + this.color = arg0.g4(); + this.alpha = arg0.g1(); if (local7 >= 0) { this.anInt3788 = arg0.g1(); } } - if (this.anInt3820 == 3) { - this.anInt3779 = arg0.g4(); - this.aBoolean294 = arg0.g1() == 1; - this.anInt3780 = arg0.g1(); + if (this.type == 3) { + this.color = arg0.g4(); + this.filled = arg0.g1() == 1; + this.alpha = arg0.g1(); } - if (this.anInt3820 == 9) { - this.anInt3778 = arg0.g1(); - this.anInt3779 = arg0.g4(); + if (this.type == 9) { + this.lineWidth = arg0.g1(); + this.color = arg0.g4(); this.aBoolean287 = arg0.g1() == 1; } local191 = arg0.g3(); @@ -740,14 +740,14 @@ public void method3390(@OriginalArg(0) Packet arg0) { local628 = arg0.g1(); } } - this.aString41 = arg0.gjstr(); + this.optionBase = arg0.gjstr(); local653 = arg0.g1(); @Pc(722) int local722 = local653 & 0xF; @Pc(730) int local730; if (local722 > 0) { - this.aStringArray17 = new String[local722]; + this.ops = new String[local722]; for (local730 = 0; local730 < local722; local730++) { - this.aStringArray17[local730] = arg0.gjstr(); + this.ops[local730] = arg0.gjstr(); } } @Pc(750) int local750 = local653 >> 4; @@ -768,12 +768,12 @@ public void method3390(@OriginalArg(0) Packet arg0) { if (this.aString42.equals("")) { this.aString42 = null; } - this.anInt3754 = arg0.g1(); - this.anInt3797 = arg0.g1(); - this.anInt3830 = arg0.g1(); - this.aString43 = arg0.gjstr(); + this.dragDeadzone = arg0.g1(); + this.dragDeadtime = arg0.g1(); + this.dragRenderBehavior = arg0.g1(); + this.optionCircumfix = arg0.gjstr(); local730 = -1; - if (Static622.method6853(local191) != 0) { + if (Static622.getTargetMask(local191) != 0) { local730 = arg0.g2(); if (local730 == 65535) { local730 = -1; @@ -811,55 +811,55 @@ public void method3390(@OriginalArg(0) Packet arg0) { } } this.anObjectArray13 = this.method3386(arg0); - this.anObjectArray4 = this.method3386(arg0); - this.anObjectArray26 = this.method3386(arg0); - this.anObjectArray16 = this.method3386(arg0); - this.anObjectArray14 = this.method3386(arg0); - this.anObjectArray25 = this.method3386(arg0); - this.anObjectArray8 = this.method3386(arg0); - this.anObjectArray21 = this.method3386(arg0); - this.anObjectArray3 = this.method3386(arg0); - this.anObjectArray15 = this.method3386(arg0); + this.onMouseOver = this.method3386(arg0); + this.onMouseLeave = this.method3386(arg0); + this.onUseWith = this.method3386(arg0); + this.onUse = this.method3386(arg0); + this.onVarpTransmit = this.method3386(arg0); + this.onInvTransmit = this.method3386(arg0); + this.onStatTransmit = this.method3386(arg0); + this.onTimer = this.method3386(arg0); + this.onOptionClick = this.method3386(arg0); if (local7 >= 0) { this.anObjectArray10 = this.method3386(arg0); } - this.anObjectArray28 = this.method3386(arg0); - this.anObjectArray17 = this.method3386(arg0); - this.anObjectArray24 = this.method3386(arg0); - this.anObjectArray1 = this.method3386(arg0); - this.anObjectArray32 = this.method3386(arg0); - this.anObjectArray30 = this.method3386(arg0); - this.anObjectArray5 = this.method3386(arg0); - this.anObjectArray11 = this.method3386(arg0); - this.anObjectArray2 = this.method3386(arg0); - this.anObjectArray18 = this.method3386(arg0); - this.anIntArray300 = this.method3398(arg0); - this.anIntArray299 = this.method3398(arg0); - this.anIntArray295 = this.method3398(arg0); - this.anIntArray298 = this.method3398(arg0); - this.anIntArray296 = this.method3398(arg0); + this.onMouseRepeat = this.method3386(arg0); + this.onClickRepeat = this.method3386(arg0); + this.onDrag = this.method3386(arg0); + this.onRelease = this.method3386(arg0); + this.onHold = this.method3386(arg0); + this.onDragStart = this.method3386(arg0); + this.onDragRelease = this.method3386(arg0); + this.onScroll = this.method3386(arg0); + this.onVarcTransmit = this.method3386(arg0); + this.onVarcstrTransmit = this.method3386(arg0); + this.varpTriggers = this.method3398(arg0); + this.inventoryTriggers = this.method3398(arg0); + this.statTriggers = this.method3398(arg0); + this.varcTriggers = this.method3398(arg0); + this.varcstrTriggers = this.method3398(arg0); } @OriginalMember(owner = "client!hda", name = "c", descriptor = "(Ljava/lang/String;II)V") public void method3391(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1) { - if (this.aStringArray17 == null || arg1 >= this.aStringArray17.length) { + if (this.ops == null || arg1 >= this.ops.length) { @Pc(14) String[] local14 = new String[arg1 + 1]; - if (this.aStringArray17 != null) { - for (@Pc(19) int local19 = 0; local19 < this.aStringArray17.length; local19++) { - local14[local19] = this.aStringArray17[local19]; + if (this.ops != null) { + for (@Pc(19) int local19 = 0; local19 < this.ops.length; local19++) { + local14[local19] = this.ops[local19]; } } - this.aStringArray17 = local14; + this.ops = local14; } - this.aStringArray17[arg1] = arg0; + this.ops[arg1] = arg0; } @OriginalMember(owner = "client!hda", name = "a", descriptor = "(Lclient!ha;I)Lclient!he;") public Class159 method3393(@OriginalArg(0) Class19 arg0) { - @Pc(15) long local15 = (long) this.anInt3741 & 0xFFFFFFFFL | (long) this.anInt3812 << 32; + @Pc(15) long local15 = (long) this.createdComponentId & 0xFFFFFFFFL | (long) this.id << 32; @Pc(21) Class159 local21 = (Class159) Static449.aSoftLruHashTable146.get(local15); if (local21 != null) { - if (local21.anInt3836 != this.anInt3810) { + if (local21.anInt3836 != this.spriteId) { local21 = null; Static449.aSoftLruHashTable146.remove(local15); } @@ -867,7 +867,7 @@ public Class159 method3393(@OriginalArg(0) Class19 arg0) { return local21; } } - @Pc(53) Class407 local53 = Static735.method9382(Static262.aJs556, this.anInt3810, 0); + @Pc(53) Class407 local53 = Static735.method9382(Static262.aJs556, this.spriteId, 0); if (local53 == null) { return null; } @@ -897,7 +897,7 @@ public Class159 method3393(@OriginalArg(0) Class19 arg0) { if (local180 == null) { return null; } else { - local21 = new Class159(local77, local86, local92, local89, local180, this.anInt3810); + local21 = new Class159(local77, local86, local92, local89, local180, this.spriteId); Static449.aSoftLruHashTable146.put(local15, local21); return local21; } @@ -951,52 +951,52 @@ private int[] method3398(@OriginalArg(1) Packet arg0) { @OriginalMember(owner = "client!hda", name = "b", descriptor = "(I)V") public void method3399() { this.anObjectArray10 = null; - this.anObjectArray20 = null; - this.anObjectArray5 = null; - this.anObjectArray1 = null; - this.anIntArray299 = null; - this.anObjectArray14 = null; - this.anIntArray298 = null; - this.anObjectArray17 = null; - this.anIntArray300 = null; - this.anObjectArray2 = null; - this.anObjectArray30 = null; - this.anObjectArray19 = null; - this.anObjectArray11 = null; - this.anIntArray296 = null; - this.anObjectArray15 = null; - this.anObjectArray16 = null; + this.onDialogAbort = null; + this.onDragRelease = null; + this.onRelease = null; + this.inventoryTriggers = null; + this.onUse = null; + this.varcTriggers = null; + this.onClickRepeat = null; + this.varpTriggers = null; + this.onVarcTransmit = null; + this.onDragStart = null; + this.onResize = null; + this.onScroll = null; + this.varcstrTriggers = null; + this.onOptionClick = null; + this.onUseWith = null; this.anObjectArray23 = null; - this.anObjectArray27 = null; - this.anObjectArray8 = null; - this.anObjectArray31 = null; - this.anObjectArray32 = null; - this.anObjectArray26 = null; - this.anObjectArray4 = null; - this.anObjectArray25 = null; - this.anIntArray295 = null; + this.onClanTransmit = null; + this.onInvTransmit = null; + this.onMinimapUnlock = null; + this.onHold = null; + this.onMouseLeave = null; + this.onMouseOver = null; + this.onVarpTransmit = null; + this.statTriggers = null; this.anObjectArray13 = null; - this.anObjectArray9 = null; - this.anObjectArray22 = null; - this.anObjectArray6 = null; - this.anObjectArray29 = null; - this.anObjectArray24 = null; - this.anObjectArray3 = null; - this.anObjectArray7 = null; - this.anObjectArray21 = null; - this.anObjectArray34 = null; - this.anObjectArray18 = null; - this.anObjectArray28 = null; + this.onStockTransmit = null; + this.onKey = null; + this.onWidgetsOpenClose = null; + this.onFriendTransmit = null; + this.onDrag = null; + this.onTimer = null; + this.onMsg = null; + this.onStatTransmit = null; + this.onMiscTransmit = null; + this.onVarcstrTransmit = null; + this.onMouseRepeat = null; } @OriginalMember(owner = "client!hda", name = "a", descriptor = "(Lclient!ha;Lclient!gu;Lclient!qp;Lclient!kr;BLclient!bp;Lclient!ju;Lclient!uk;Lclient!ql;Lclient!es;ILclient!vk;)Lclient!ka;") public Model method3401(@OriginalArg(0) Class19 arg0, @OriginalArg(1) Class152 arg1, @OriginalArg(2) BasTypeList arg2, @OriginalArg(3) IdkTypeList arg3, @OriginalArg(5) SeqTypeList arg4, @OriginalArg(6) PlayerAppearance arg5, @OriginalArg(7) VarDomain arg6, @OriginalArg(8) NpcTypeList arg7, @OriginalArg(9) ObjTypeList arg8, @OriginalArg(10) int arg9, @OriginalArg(11) Class386 arg10) { Static544.aBoolean624 = false; - if (this.anInt3823 == 0) { + if (this.modelType == 0) { return null; - } else if (this.anInt3823 == 1 && this.anInt3831 == -1) { + } else if (this.modelType == 1 && this.modelId == -1) { return null; - } else if (this.anInt3823 == 1) { + } else if (this.modelType == 1) { if (arg1 != null) { arg9 = arg1.method9101() | 0x800; } @@ -1021,13 +1021,13 @@ public Model method3401(@OriginalArg(0) Class19 arg0, @OriginalArg(1) Class152 a } arg9 |= 0x8000; } - @Pc(271) long local271 = local53 & 0x3FFFFFFFFFL | (long) this.anInt3831 << 38 | (long) this.anInt3823 << 54 | (long) arg0.anInt8962 << 59; + @Pc(271) long local271 = local53 & 0x3FFFFFFFFFL | (long) this.modelId << 38 | (long) this.modelType << 54 | (long) arg0.anInt8962 << 59; @Pc(277) Model local277 = (Model) modelCache.get(local271); if (local277 == null || arg0.method7960(local277.ua(), arg9) != 0) { if (local277 != null) { arg9 = arg0.method8013(arg9, local277.ua()); } - @Pc(307) Class88 local307 = Static121.method2201(this.anInt3831, Static607.aJs5113); + @Pc(307) Class88 local307 = Static121.method2201(this.modelId, Static607.aJs5113); if (local307 == null) { Static544.aBoolean624 = true; return null; @@ -1057,15 +1057,15 @@ public Model method3401(@OriginalArg(0) Class19 arg0, @OriginalArg(1) Class152 a return local277; } else { @Pc(438) Model local438; - if (this.anInt3823 == 2) { - local438 = arg7.method7092(this.anInt3831).method5992(arg1, arg10, arg0, arg6); + if (this.modelType == 2) { + local438 = arg7.method7092(this.modelId).method5992(arg1, arg10, arg0, arg6); if (local438 == null) { Static544.aBoolean624 = true; return null; } else { return local438; } - } else if (this.anInt3823 == 3) { + } else if (this.modelType == 3) { if (arg5 == null) { return null; } @@ -1076,8 +1076,8 @@ public Model method3401(@OriginalArg(0) Class19 arg0, @OriginalArg(1) Class152 a } else { return local438; } - } else if (this.anInt3823 == 4) { - @Pc(489) ObjType local489 = arg8.method2486(this.anInt3831); + } else if (this.modelType == 4) { + @Pc(489) ObjType local489 = arg8.method2486(this.modelId); @Pc(498) Model local498 = local489.method8805(arg1, 2048, arg5, 10, arg0); if (local498 == null) { Static544.aBoolean624 = true; @@ -1085,21 +1085,21 @@ public Model method3401(@OriginalArg(0) Class19 arg0, @OriginalArg(1) Class152 a } else { return local498; } - } else if (this.anInt3823 == 6) { - local438 = arg7.method7092(this.anInt3831).method5993(arg6, arg0, arg2, arg1, 0, (int[]) null, arg10, (Class152) null, 2048, (Class152[]) null); + } else if (this.modelType == 6) { + local438 = arg7.method7092(this.modelId).method5993(arg6, arg0, arg2, arg1, 0, (int[]) null, arg10, (Class152) null, 2048, (Class152[]) null); if (local438 == null) { Static544.aBoolean624 = true; return null; } else { return local438; } - } else if (this.anInt3823 != 7) { + } else if (this.modelType != 7) { return null; } else if (arg5 == null) { return null; } else { - @Pc(558) int local558 = this.anInt3831 >>> 16; - @Pc(563) int local563 = this.anInt3831 & 0xFFFF; + @Pc(558) int local558 = this.modelId >>> 16; + @Pc(563) int local563 = this.modelId & 0xFFFF; @Pc(566) int local566 = this.anInt3738; @Pc(578) Model local578 = arg5.method4550(arg1, local558, local566, arg4, arg0, arg3, local563); if (local578 == null) { @@ -1124,7 +1124,7 @@ public void method3402(@OriginalArg(0) int arg0) { @OriginalMember(owner = "client!hda", name = "b", descriptor = "(ZLclient!ha;)Lclient!da;") public Class14 method3403(@OriginalArg(1) Class19 arg0) { - @Pc(18) Class14 local18 = Static324.method4628(this.aBoolean299, false, this.anInt3781, arg0); + @Pc(18) Class14 local18 = Static324.method4628(this.aBoolean299, false, this.font, arg0); Static544.aBoolean624 = local18 == null; return local18; } diff --git a/client/src/main/java/Connection.java b/client/src/main/java/Connection.java index c36d6a5..79ec54f 100644 --- a/client/src/main/java/Connection.java +++ b/client/src/main/java/Connection.java @@ -83,7 +83,7 @@ public static Connection getActiveConnection() { @OriginalMember(owner = "client!gw", name = "b", descriptor = "(I)V") public void method3271() { - if (Static333.anInt5455 % 50 == 0) { + if (Static333.loop % 50 == 0) { this.outBytes = this.anInt3649; this.inBytes = this.anInt3644; this.anInt3649 = 0; diff --git a/client/src/main/java/Country.java b/client/src/main/java/Country.java index 6c84c52..440f907 100644 --- a/client/src/main/java/Country.java +++ b/client/src/main/java/Country.java @@ -5,8 +5,8 @@ public final class Country { @OriginalMember(owner = "client!ci", name = "e", descriptor = "I") - public int anInt1610; + public int flag; @OriginalMember(owner = "client!ci", name = "j", descriptor = "Ljava/lang/String;") - public String aString13; + public String name; } diff --git a/client/src/main/java/Entity.java b/client/src/main/java/Entity.java index cb2a30c..692b214 100644 --- a/client/src/main/java/Entity.java +++ b/client/src/main/java/Entity.java @@ -28,11 +28,11 @@ public abstract class Entity extends ParticleNode_Sub2 { protected Entity(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) boolean arg9, @OriginalArg(10) byte arg10) { this.aShort132 = (short) arg7; super.anInt10691 = arg3; - super.aByte144 = (byte) arg0; + super.plane = (byte) arg0; this.aShort133 = (short) arg8; super.aByte143 = (byte) arg1; - super.anInt10694 = arg4; - super.anInt10690 = arg2; + super.zFine = arg4; + super.xFine = arg2; this.aBoolean815 = arg9; this.aByte145 = arg10; this.aShort134 = (short) arg6; @@ -48,7 +48,7 @@ public final int method9288(@OriginalArg(0) Linkable_Sub7[] arg0) { @Pc(57) int local57; label112: for (@Pc(16) int local16 = this.aShort131; local16 <= this.aShort134; local16++) { label110: for (local21 = this.aShort132; local21 <= this.aShort133; local21++) { - @Pc(32) long local32 = Static161.aLongArrayArrayArray1[super.aByte144][local16][local21]; + @Pc(32) long local32 = Static161.aLongArrayArrayArray1[super.plane][local16][local21]; @Pc(34) long local34 = 0L; while (true) { label105: while (true) { @@ -109,7 +109,7 @@ public final int method9288(@OriginalArg(0) Linkable_Sub7[] arg0) { local191 = this.aShort132; } label76: for (local57 = 0; local57 < local7; local57++) { - @Pc(267) long local267 = Static161.aLongArrayArrayArray1[super.aByte144][local183][local188]; + @Pc(267) long local267 = Static161.aLongArrayArrayArray1[super.plane][local183][local188]; @Pc(278) Class353 local278; while (local267 != 0L) { local278 = Static265.aClass353Array1[(int) ((local267 & 0xFFFFL) - 1L)]; @@ -118,7 +118,7 @@ public final int method9288(@OriginalArg(0) Linkable_Sub7[] arg0) { continue label76; } } - local267 = Static161.aLongArrayArrayArray1[super.aByte144][local180][local191]; + local267 = Static161.aLongArrayArrayArray1[super.plane][local180][local191]; while (local267 != 0L) { local278 = Static265.aClass353Array1[(int) ((local267 & 0xFFFFL) - 1L)]; local267 >>>= 0x10; diff --git a/client/src/main/java/Entity_Sub1.java b/client/src/main/java/Entity_Sub1.java index 81927b7..778fab4 100644 --- a/client/src/main/java/Entity_Sub1.java +++ b/client/src/main/java/Entity_Sub1.java @@ -82,7 +82,7 @@ public void method6857(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { this.aClass2_Sub2_Sub9_3 = null; } if (local16 != null) { - Static292.method4618(local16, super.aByte143, super.anInt10690, super.anInt10694, (boolean[]) null); + Static292.method4618(local16, super.aByte143, super.xFine, super.zFine, (boolean[]) null); } if (arg1 > -42) { this.aModel4 = null; @@ -153,7 +153,7 @@ public boolean method9279(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O return arg2 ? false : false; } else { @Pc(14) Class73 local14 = arg3.method7985(); - local14.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local14.method7125(super.xFine, super.anInt10691, super.zFine); return Static504.aBoolean579 ? local9.method7483(arg1, arg0, local14, false, 0, Static582.anInt8627) : local9.method7486(arg1, arg0, local14, false, 0); } } @@ -188,7 +188,7 @@ public Class205 method9278(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg return null; } else { if (this.aClass205_5 == null) { - this.aClass205_5 = Static317.method4583(super.anInt10691, super.anInt10690, this.method4221(arg0, 0), super.anInt10694); + this.aClass205_5 = Static317.method4583(super.anInt10691, super.xFine, this.method4221(arg0, 0), super.zFine); } return this.aClass205_5; } @@ -206,7 +206,7 @@ public void method6861(@OriginalArg(0) Class19 arg0) { this.aClass2_Sub2_Sub9_3 = null; } if (local21 != null) { - Static630.method8357(local21, super.aByte143, super.anInt10690, super.anInt10694, (boolean[]) null); + Static630.method8357(local21, super.aByte143, super.xFine, super.zFine, (boolean[]) null); } } @@ -244,7 +244,7 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { return null; } @Pc(20) Class73 local20 = arg0.method7985(); - local20.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local20.method7125(super.xFine, super.anInt10691, super.zFine); @Pc(34) ParticleNode_Sub7 local34 = Static642.method8441(this.aBoolean364, 1); if (Static504.aBoolean579) { this.aModel4.method7484(local20, local34.aClass8_Sub6Array1[0], Static582.anInt8627, 0); @@ -289,7 +289,7 @@ private Class272 method4223(@OriginalArg(0) Class19 arg0, @OriginalArg(2) boolea local33 = Static706.aClass178Array3[super.aByte143 + 1]; } } - return local11.method1309(this.aByte84 == 11 ? this.aByte83 + 4 : this.aByte83, super.anInt10694, super.anInt10690, local27, arg1, super.anInt10691, this.aByte84 == 11 ? 10 : this.aByte84, arg0, (Class150) null, arg2, local33); + return local11.method1309(this.aByte84 == 11 ? this.aByte83 + 4 : this.aByte83, super.zFine, super.xFine, local27, arg1, super.anInt10691, this.aByte84 == 11 ? 10 : this.aByte84, arg0, (Class150) null, arg2, local33); } @OriginalMember(owner = "client!jda", name = "c", descriptor = "(I)I") diff --git a/client/src/main/java/Entity_Sub2.java b/client/src/main/java/Entity_Sub2.java index 208a71f..57e3123 100644 --- a/client/src/main/java/Entity_Sub2.java +++ b/client/src/main/java/Entity_Sub2.java @@ -21,7 +21,7 @@ public final class Entity_Sub2 extends Entity implements Interface25 { @OriginalMember(owner = "client!oe", name = "", descriptor = "(Lclient!ha;Lclient!c;IIIIIZIIIIIII)V") public Entity_Sub2(@OriginalArg(0) Class19 arg0, @OriginalArg(1) LocType arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12, @OriginalArg(13) int arg13, @OriginalArg(14) int arg14) { super(arg2, arg3, arg4, arg5, arg6, arg8, arg9, arg10, arg11, arg1.raiseobject == 1, Static609.method8215(arg12, arg13)); - this.aClass337_3 = new Class337(arg0, arg1, arg12, arg13, super.aByte144, arg3, this, arg7, arg14); + this.aClass337_3 = new Class337(arg0, arg1, arg12, arg13, super.plane, arg3, this, arg7, arg14); this.aBoolean517 = arg1.active != 0 && !arg7; } @@ -42,7 +42,7 @@ public boolean method9279(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O return false; } else { @Pc(20) Class73 local20 = arg3.method7985(); - local20.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local20.method7125(super.xFine, super.anInt10691, super.zFine); return Static504.aBoolean579 ? local12.method7483(arg1, arg0, local20, false, 0, Static582.anInt8627) : local12.method7486(arg1, arg0, local20, false, 0); } } @@ -55,7 +55,7 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { return null; } @Pc(30) Class73 local30 = arg0.method7985(); - local30.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local30.method7125(super.xFine, super.anInt10691, super.zFine); @Pc(44) ParticleNode_Sub7 local44 = Static642.method8441(this.aBoolean517, 1); this.aClass337_3.method7681(super.aShort133, local14, true, -9827, arg0, super.aShort134, super.aShort131, super.aShort132, local30); if (Static504.aBoolean579) { @@ -73,9 +73,9 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { } this.aBoolean518 = local14.F() || this.aClass337_3.aClass8_Sub5_7 != null; if (this.aClass205_7 == null) { - this.aClass205_7 = Static317.method4583(super.anInt10691, super.anInt10690, local14, super.anInt10694); + this.aClass205_7 = Static317.method4583(super.anInt10691, super.xFine, local14, super.zFine); } else { - Static223.method9103(local14, super.anInt10694, super.anInt10691, super.anInt10690, this.aClass205_7); + Static223.method9103(local14, super.zFine, super.anInt10691, super.xFine, this.aClass205_7); } return local44; } @@ -119,7 +119,7 @@ public void method9289(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { @Pc(12) Model local12 = this.aClass337_3.method7678(arg0, true, true, true, 262144); if (arg1 == -5 && local12 != null) { @Pc(22) Class73 local22 = arg0.method7985(); - local22.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local22.method7125(super.xFine, super.anInt10691, super.zFine); this.aClass337_3.method7681(super.aShort133, local12, false, -9827, arg0, super.aShort134, super.aShort131, super.aShort132, local22); } } diff --git a/client/src/main/java/Entity_Sub3.java b/client/src/main/java/Entity_Sub3.java index 405cfb9..f258aa9 100644 --- a/client/src/main/java/Entity_Sub3.java +++ b/client/src/main/java/Entity_Sub3.java @@ -50,20 +50,20 @@ private void method6593(@OriginalArg(0) Class73 arg0, @OriginalArg(1) Model arg1 @Pc(9) Class328[] local9 = arg1.method7482(); @Pc(19) Class249[] local19 = arg1.method7480(); if ((this.aClass8_Sub5_5 == null || this.aClass8_Sub5_5.aBoolean324) && (local9 != null || local19 != null)) { - this.aClass8_Sub5_5 = Static257.method3654(Static333.anInt5455, true); + this.aClass8_Sub5_5 = Static257.method3654(Static333.loop, true); } if (this.aClass8_Sub5_5 != null) { - this.aClass8_Sub5_5.method3643(arg2, (long) Static333.anInt5455, local9, local19); - this.aClass8_Sub5_5.method3658(super.aByte144, super.aShort131, super.aShort134, super.aShort132, super.aShort133); + this.aClass8_Sub5_5.method3643(arg2, (long) Static333.loop, local9, local19); + this.aClass8_Sub5_5.method3658(super.plane, super.aShort131, super.aShort134, super.aShort132, super.aShort133); } } @OriginalMember(owner = "client!pja", name = "a", descriptor = "(IILclient!ha;I)Lclient!ka;") private Model method6594(@OriginalArg(1) int arg0, @OriginalArg(2) Class19 arg1, @OriginalArg(3) int arg2) { @Pc(8) SpotAnimType local8 = Static23.aSpotAnimTypeList1.method2694(arg0); - @Pc(22) Class178 local22 = Static706.aClass178Array3[super.aByte144]; + @Pc(22) Class178 local22 = Static706.aClass178Array3[super.plane]; @Pc(36) Class178 local36 = super.aByte143 < 3 ? Static706.aClass178Array3[super.aByte143 + 1] : null; - return this.aClass152_8 == null || this.aClass152_8.method9102() ? local8.method5249((byte) 2, true, super.anInt10694, (Class152) null, local36, super.anInt10690, local22, arg2, super.anInt10691, arg1) : local8.method5249((byte) 2, true, super.anInt10694, this.aClass152_8, local36, super.anInt10690, local22, arg2, super.anInt10691, arg1); + return this.aClass152_8 == null || this.aClass152_8.method9102() ? local8.method5249((byte) 2, true, super.zFine, (Class152) null, local36, super.xFine, local22, arg2, super.anInt10691, arg1) : local8.method5249((byte) 2, true, super.zFine, this.aClass152_8, local36, super.xFine, local22, arg2, super.anInt10691, arg1); } @OriginalMember(owner = "client!pja", name = "finalize", descriptor = "()V") @@ -83,7 +83,7 @@ public void method9289(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { @Pc(20) Model local20 = this.method6594(this.anInt7402, arg0, 0); if (local20 != null) { @Pc(25) Class73 local25 = arg0.method7985(); - local25.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local25.method7125(super.xFine, super.anInt10691, super.zFine); this.method6593(local25, local20, arg0); } } @@ -186,7 +186,7 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { local24.a(this.anInt7400 * 2048); } @Pc(43) Class73 local43 = arg0.method7985(); - local43.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local43.method7125(super.xFine, super.anInt10691, super.zFine); this.method6593(local43, local24, arg0); @Pc(62) ParticleNode_Sub7 local62 = Static642.method8441(false, 1); if (Static504.aBoolean579) { diff --git a/client/src/main/java/EnumType.java b/client/src/main/java/EnumType.java index ff951b1..e4deb15 100644 --- a/client/src/main/java/EnumType.java +++ b/client/src/main/java/EnumType.java @@ -7,7 +7,7 @@ public final class EnumType { @OriginalMember(owner = "client!bt", name = "k", descriptor = "Lclient!av;") - private HashTable aHashTable9; + private HashTable inverseTable; @OriginalMember(owner = "client!bt", name = "m", descriptor = "I") private int anInt1142; @@ -16,7 +16,7 @@ public final class EnumType { private int anInt1144; @OriginalMember(owner = "client!bt", name = "f", descriptor = "C") - public char aChar1; + public char valueType; @OriginalMember(owner = "client!bt", name = "g", descriptor = "Ljava/lang/Object;") private Object anObject3; @@ -28,15 +28,15 @@ public final class EnumType { private String aString5 = "null"; @OriginalMember(owner = "client!bt", name = "b", descriptor = "(Ljava/lang/String;B)Z") - public boolean method1221(@OriginalArg(0) String arg0) { + public boolean containsValue(@OriginalArg(0) String arg0) { if (this.anObject3 == null) { return false; } - if (this.aHashTable9 == null) { + if (this.inverseTable == null) { this.method1226(); } - for (@Pc(30) Linkable_Sub46 local30 = (Linkable_Sub46) this.aHashTable9.get(Static203.method3071(arg0)); local30 != null; local30 = (Linkable_Sub46) this.aHashTable9.nextWithKey()) { - if (local30.aString100.equals(arg0)) { + for (@Pc(30) Linkable_Sub46 local30 = (Linkable_Sub46) this.inverseTable.get(Static203.method3071(arg0)); local30 != null; local30 = (Linkable_Sub46) this.inverseTable.nextWithKey()) { + if (local30.value.equals(arg0)) { return true; } } @@ -59,10 +59,10 @@ public Linkable_Sub40 method1223(@OriginalArg(1) int arg0) { if (this.anObject3 == null) { return null; } else { - if (this.aHashTable9 == null) { + if (this.inverseTable == null) { this.method1236(); } - return (Linkable_Sub40) this.aHashTable9.get((long) arg0); + return (Linkable_Sub40) this.inverseTable.get((long) arg0); } } @@ -71,12 +71,12 @@ private void method1226() { @Pc(58) Linkable_Sub46 local58; if (this.anObject3 instanceof HashTable) { @Pc(203) HashTable local203 = (HashTable) this.anObject3; - this.aHashTable9 = new HashTable(local203.getBucketCount()); + this.inverseTable = new HashTable(local203.getBucketCount()); @Pc(218) HashTable local218 = new HashTable(local203.getBucketCount()); for (@Pc(223) StringNode local223 = (StringNode) local203.head(); local223 != null; local223 = (StringNode) local203.next()) { @Pc(229) long local229 = Static203.method3071(local223.value); @Pc(235) Linkable_Sub46 local235; - for (local235 = (Linkable_Sub46) local218.get(local229); local235 != null && !local235.aString100.equals(local223.value); local235 = (Linkable_Sub46) local218.nextWithKey()) { + for (local235 = (Linkable_Sub46) local218.get(local229); local235 != null && !local235.value.equals(local223.value); local235 = (Linkable_Sub46) local218.nextWithKey()) { } if (local235 == null) { local235 = new Linkable_Sub46(local223.value, 0); @@ -87,14 +87,14 @@ private void method1226() { for (@Pc(283) StringNode local283 = (StringNode) local203.head(); local283 != null; local283 = (StringNode) local203.next()) { @Pc(289) long local289 = Static203.method3071(local283.value); @Pc(296) Linkable_Sub26 local296; - for (local296 = (Linkable_Sub26) this.aHashTable9.get(local289); local296 != null && !local296.aString47.equals(local283.value); local296 = (Linkable_Sub26) this.aHashTable9.nextWithKey()) { + for (local296 = (Linkable_Sub26) this.inverseTable.get(local289); local296 != null && !local296.aString47.equals(local283.value); local296 = (Linkable_Sub26) this.inverseTable.nextWithKey()) { } - for (local58 = (Linkable_Sub46) local218.get(local289); local58 != null && !local58.aString100.equals(local283.value); local58 = (Linkable_Sub46) local218.nextWithKey()) { + for (local58 = (Linkable_Sub46) local218.get(local289); local58 != null && !local58.value.equals(local283.value); local58 = (Linkable_Sub46) local218.nextWithKey()) { } @Pc(339) int local339 = local58.anInt8241--; if (local296 == null) { local296 = new Linkable_Sub26(local283.value, local339); - this.aHashTable9.put(local289, local296); + this.inverseTable.put(local289, local296); } local296.anIntArray318[local296.anIntArray318.length - local339] = (int) local283.id; } @@ -102,13 +102,13 @@ private void method1226() { } @Pc(21) String[] local21 = (String[]) this.anObject3; @Pc(26) int local26 = IntUtils.clp2(local21.length); - this.aHashTable9 = new HashTable(local26); + this.inverseTable = new HashTable(local26); @Pc(37) HashTable local37 = new HashTable(local26); for (@Pc(39) int local39 = 0; local39 < local21.length; local39++) { if (local21[local39] != null) { @Pc(48) String local48 = local21[local39]; @Pc(52) long local52 = Static203.method3071(local48); - for (local58 = (Linkable_Sub46) local37.get(local52); local58 != null && !local58.aString100.equals(local48); local58 = (Linkable_Sub46) local37.nextWithKey()) { + for (local58 = (Linkable_Sub46) local37.get(local52); local58 != null && !local58.value.equals(local48); local58 = (Linkable_Sub46) local37.nextWithKey()) { } if (local58 == null) { local58 = new Linkable_Sub46(local48, 0); @@ -122,15 +122,15 @@ private void method1226() { @Pc(112) String local112 = local21[local103]; @Pc(116) long local116 = Static203.method3071(local112); @Pc(123) Linkable_Sub26 local123; - for (local123 = (Linkable_Sub26) this.aHashTable9.get(local116); local123 != null && !local123.aString47.equals(local112); local123 = (Linkable_Sub26) this.aHashTable9.nextWithKey()) { + for (local123 = (Linkable_Sub26) this.inverseTable.get(local116); local123 != null && !local123.aString47.equals(local112); local123 = (Linkable_Sub26) this.inverseTable.nextWithKey()) { } @Pc(143) Linkable_Sub46 local143; - for (local143 = (Linkable_Sub46) local37.get(local116); local143 != null && !local143.aString100.equals(local112); local143 = (Linkable_Sub46) local37.nextWithKey()) { + for (local143 = (Linkable_Sub46) local37.get(local116); local143 != null && !local143.value.equals(local112); local143 = (Linkable_Sub46) local37.nextWithKey()) { } @Pc(164) int local164 = local143.anInt8241--; if (local123 == null) { local123 = new Linkable_Sub26(local112, local164); - this.aHashTable9.put(local116, local123); + this.inverseTable.put(local116, local123); } local123.anIntArray318[local123.anIntArray318.length - local164] = local103; } @@ -138,7 +138,7 @@ private void method1226() { } @OriginalMember(owner = "client!bt", name = "a", descriptor = "(IB)I") - public int method1227(@OriginalArg(0) int arg0) { + public int getInt(@OriginalArg(0) int arg0) { if (this.anObject3 == null) { return this.anInt1142; } else if (this.anObject3 instanceof HashTable) { @@ -156,12 +156,12 @@ public int method1227(@OriginalArg(0) int arg0) { } @OriginalMember(owner = "client!bt", name = "a", descriptor = "(I)I") - public int method1228() { + public int size() { return this.anInt1144; } @OriginalMember(owner = "client!bt", name = "c", descriptor = "(II)Ljava/lang/String;") - public String method1229(@OriginalArg(1) int arg0) { + public String getString(@OriginalArg(1) int arg0) { if (this.anObject3 == null) { return this.aString5; } else if (this.anObject3 instanceof HashTable) { @@ -179,14 +179,14 @@ public String method1229(@OriginalArg(1) int arg0) { } @OriginalMember(owner = "client!bt", name = "b", descriptor = "(II)Z") - public boolean method1233(@OriginalArg(1) int arg0) { + public boolean containsValue(@OriginalArg(1) int arg0) { if (this.anObject3 == null) { return false; } else { - if (this.aHashTable9 == null) { + if (this.inverseTable == null) { this.method1236(); } - return this.aHashTable9.get((long) arg0) != null; + return this.inverseTable.get((long) arg0) != null; } } @@ -195,7 +195,7 @@ private void method1234(@OriginalArg(0) int arg0, @OriginalArg(2) Packet arg1) { if (arg0 == 1) { this.aChar2 = Static346.method5084(arg1.g1b()); } else if (arg0 == 2) { - this.aChar1 = Static346.method5084(arg1.g1b()); + this.valueType = Static346.method5084(arg1.g1b()); } else if (arg0 == 3) { this.aString5 = arg1.gjstr(); } else if (arg0 == 4) { @@ -247,7 +247,7 @@ private void method1236() { @Pc(101) int local101; if (this.anObject3 instanceof HashTable) { @Pc(16) HashTable local16 = (HashTable) this.anObject3; - this.aHashTable9 = new HashTable(local16.getBucketCount()); + this.inverseTable = new HashTable(local16.getBucketCount()); @Pc(31) HashTable local31 = new HashTable(local16.getBucketCount()); @Pc(45) IntNode local45; for (@Pc(36) IntNode local36 = (IntNode) local16.head(); local36 != null; local36 = (IntNode) local16.next()) { @@ -259,11 +259,11 @@ private void method1236() { local45.value++; } for (local45 = (IntNode) local16.head(); local45 != null; local45 = (IntNode) local16.next()) { - @Pc(87) Linkable_Sub40 local87 = (Linkable_Sub40) this.aHashTable9.get((long) local45.value); + @Pc(87) Linkable_Sub40 local87 = (Linkable_Sub40) this.inverseTable.get((long) local45.value); local101 = ((IntNode) local31.get((long) local45.value)).value--; if (local87 == null) { local87 = new Linkable_Sub40(local101); - this.aHashTable9.put((long) local45.value, local87); + this.inverseTable.put((long) local45.value, local87); } local87.anIntArray531[local87.anIntArray531.length - local101] = (int) local45.id; } @@ -271,7 +271,7 @@ private void method1236() { } @Pc(140) Integer[] local140 = (Integer[]) this.anObject3; @Pc(145) int local145 = IntUtils.clp2(local140.length); - this.aHashTable9 = new HashTable(local145); + this.inverseTable = new HashTable(local145); @Pc(156) HashTable local156 = new HashTable(local145); @Pc(168) int local168; for (@Pc(158) int local158 = 0; local158 < local140.length; local158++) { @@ -288,11 +288,11 @@ private void method1236() { for (local168 = 0; local168 < local140.length; local168++) { if (local140[local168] != null) { local101 = local140[local168]; - @Pc(223) Linkable_Sub40 local223 = (Linkable_Sub40) this.aHashTable9.get((long) local101); + @Pc(223) Linkable_Sub40 local223 = (Linkable_Sub40) this.inverseTable.get((long) local101); @Pc(236) int local236 = ((IntNode) local156.get((long) local101)).value--; if (local223 == null) { local223 = new Linkable_Sub40(local236); - this.aHashTable9.put((long) local101, local223); + this.inverseTable.put((long) local101, local223); } local223.anIntArray531[local223.anIntArray531.length - local236] = local168; } @@ -304,11 +304,11 @@ public Linkable_Sub26 method1237(@OriginalArg(0) String arg0) { if (this.anObject3 == null) { return null; } - if (this.aHashTable9 == null) { + if (this.inverseTable == null) { this.method1226(); } @Pc(26) Linkable_Sub26 local26; - for (local26 = (Linkable_Sub26) this.aHashTable9.get(Static203.method3071(arg0)); local26 != null && !local26.aString47.equals(arg0); local26 = (Linkable_Sub26) this.aHashTable9.nextWithKey()) { + for (local26 = (Linkable_Sub26) this.inverseTable.get(Static203.method3071(arg0)); local26 != null && !local26.aString47.equals(arg0); local26 = (Linkable_Sub26) this.inverseTable.nextWithKey()) { } return local26; } diff --git a/client/src/main/java/EnumTypeList.java b/client/src/main/java/EnumTypeList.java index f75524f..b6c70ad 100644 --- a/client/src/main/java/EnumTypeList.java +++ b/client/src/main/java/EnumTypeList.java @@ -22,7 +22,7 @@ public EnumTypeList(@OriginalArg(0) ModeGame arg0, @OriginalArg(1) int arg1, @Or } @OriginalMember(owner = "client!vka", name = "a", descriptor = "(II)Lclient!bt;") - public EnumType method8925(@OriginalArg(0) int arg0) { + public EnumType get(@OriginalArg(0) int arg0) { @Pc(6) SoftLruHashTable local6 = this.aSoftLruHashTable223; @Pc(16) EnumType local16; synchronized (this.aSoftLruHashTable223) { diff --git a/client/src/main/java/GameShell.java b/client/src/main/java/GameShell.java index d52c2d9..5da9a31 100644 --- a/client/src/main/java/GameShell.java +++ b/client/src/main/java/GameShell.java @@ -81,10 +81,10 @@ private void shutDown(@OriginalArg(1) boolean clean) { } Static307.shutDown(); Static501.unloadLibraries(); - if (Static434.aCanvas7 != null) { + if (Static434.canvas != null) { try { - Static434.aCanvas7.removeFocusListener(this); - Static434.aCanvas7.getParent().remove(Static434.aCanvas7); + Static434.canvas.removeFocusListener(this); + Static434.canvas.getParent().remove(Static434.canvas); } catch (@Pc(68) Exception e) { e.printStackTrace(); } @@ -138,7 +138,7 @@ protected final void method1635(@OriginalArg(3) int arg0, @OriginalArg(6) String @Pc(54) Insets local54 = Static353.aFrame10.getInsets(); Static353.aFrame10.setSize(Static52.anInt1059 + local54.left + local54.right, local54.bottom + local54.top + Static54.anInt1084); Static284.aSignlink4 = Static446.aSignlink6 = new Signlink(arg0, arg1, 37, true); - @Pc(88) PrivilegedRequest local88 = Static446.aSignlink6.method8991(this, 1); + @Pc(88) PrivilegedRequest local88 = Static446.aSignlink6.startThread(this, 1); while (local88.state == 0) { Static638.sleep(10L); } @@ -207,13 +207,13 @@ private void method1639() { if (Static169.anInt2850++ > 50) { Static664.aBoolean759 = true; Static169.anInt2850 -= 50; - Static434.aCanvas7.setSize(Static680.anInt10289, Static380.anInt5979); - Static434.aCanvas7.setVisible(true); + Static434.canvas.setSize(Static680.anInt10289, Static380.anInt5979); + Static434.canvas.setVisible(true); if (Static353.aFrame10 != null && Static316.aFrame8 == null) { @Pc(86) Insets local86 = Static353.aFrame10.getInsets(); - Static434.aCanvas7.setLocation(local86.left + Static134.anInt10329, Static241.anInt3962 + local86.top); + Static434.canvas.setLocation(local86.left + Static134.anInt10329, Static241.anInt3962 + local86.top); } else { - Static434.aCanvas7.setLocation(Static134.anInt10329, Static241.anInt3962); + Static434.canvas.setLocation(Static134.anInt10329, Static241.anInt3962); } } this.method1650(); @@ -238,7 +238,7 @@ protected final void method1640(@OriginalArg(2) int arg0, @OriginalArg(3) int ar Static241.anInt3962 = 0; Static149.aGameShell = this; Static284.aSignlink4 = Static446.aSignlink6 = new Signlink(arg1, arg2, 37, Static166.anApplet1 != null); - @Pc(80) PrivilegedRequest local80 = Static446.aSignlink6.method8991(this, 1); + @Pc(80) PrivilegedRequest local80 = Static446.aSignlink6.startThread(this, 1); while (local80.state == 0) { Static638.sleep(10L); } @@ -310,7 +310,7 @@ public final void run() { this.method1646(); } this.method1639(); - Static61.method1312(Static446.aSignlink6, Static434.aCanvas7); + Static61.method1312(Static446.aSignlink6, Static434.canvas); } } catch (@Pc(254) ThreadDeath local254) { throw local254; @@ -372,10 +372,10 @@ public final void stop() { @OriginalMember(owner = "client!kh", name = "i", descriptor = "(I)V") public synchronized void method1641() { - if (Static434.aCanvas7 != null) { - Static434.aCanvas7.removeFocusListener(this); - Static434.aCanvas7.getParent().setBackground(Color.black); - Static434.aCanvas7.getParent().remove(Static434.aCanvas7); + if (Static434.canvas != null) { + Static434.canvas.removeFocusListener(this); + Static434.canvas.getParent().setBackground(Color.black); + Static434.canvas.getParent().remove(Static434.canvas); } @Pc(30) Container local30; if (Static316.aFrame8 != null) { @@ -388,18 +388,18 @@ public synchronized void method1641() { local30 = Static166.anApplet1; } local30.setLayout((LayoutManager) null); - Static434.aCanvas7 = new GameCanvas(this); - local30.add(Static434.aCanvas7); - Static434.aCanvas7.setSize(Static680.anInt10289, Static380.anInt5979); - Static434.aCanvas7.setVisible(true); + Static434.canvas = new GameCanvas(this); + local30.add(Static434.canvas); + Static434.canvas.setSize(Static680.anInt10289, Static380.anInt5979); + Static434.canvas.setVisible(true); if (local30 == Static353.aFrame10) { @Pc(74) Insets local74 = Static353.aFrame10.getInsets(); - Static434.aCanvas7.setLocation(Static134.anInt10329 + local74.left, local74.top + Static241.anInt3962); + Static434.canvas.setLocation(Static134.anInt10329 + local74.left, local74.top + Static241.anInt3962); } else { - Static434.aCanvas7.setLocation(Static134.anInt10329, Static241.anInt3962); + Static434.canvas.setLocation(Static134.anInt10329, Static241.anInt3962); } - Static434.aCanvas7.addFocusListener(this); - Static434.aCanvas7.requestFocus(); + Static434.canvas.addFocusListener(this); + Static434.canvas.requestFocus(); Static91.aBoolean750 = true; Static206.aBoolean268 = true; Static664.aBoolean759 = true; diff --git a/client/src/main/java/InvTypeList.java b/client/src/main/java/InvTypeList.java index 2fa02f0..1462699 100644 --- a/client/src/main/java/InvTypeList.java +++ b/client/src/main/java/InvTypeList.java @@ -19,7 +19,7 @@ public InvTypeList(@OriginalArg(0) ModeGame arg0, @OriginalArg(1) int arg1, @Ori } @OriginalMember(owner = "client!sfa", name = "a", descriptor = "(II)Lclient!dba;") - public InvType method7657(@OriginalArg(0) int arg0) { + public InvType get(@OriginalArg(0) int arg0) { @Pc(6) SoftLruHashTable local6 = this.aSoftLruHashTable188; @Pc(16) InvType local16; synchronized (this.aSoftLruHashTable188) { diff --git a/client/src/main/java/JavaAudioChannel.java b/client/src/main/java/JavaAudioChannel.java index 867714b..1070128 100644 --- a/client/src/main/java/JavaAudioChannel.java +++ b/client/src/main/java/JavaAudioChannel.java @@ -36,7 +36,7 @@ protected void method3583() throws LineUnavailableException { } this.aSourceDataLine1.close(); this.aSourceDataLine1 = null; - @Pc(38) Info local38 = new Info(Static64.aClass3 == null ? (Static64.aClass3 = getClass("javax.sound.sampled.SourceDataLine")) : Static64.aClass3, this.anAudioFormat1, this.anInt1519 << (Static316.aBoolean644 ? 2 : 1)); + @Pc(38) Info local38 = new Info(Static64.aClass3 == null ? (Static64.aClass3 = getClass("javax.sound.sampled.SourceDataLine")) : Static64.aClass3, this.anAudioFormat1, this.anInt1519 << (Static316.stereo ? 2 : 1)); this.aSourceDataLine1 = (SourceDataLine) AudioSystem.getLine(local38); this.aSourceDataLine1.open(); this.aSourceDataLine1.start(); @@ -46,11 +46,11 @@ protected void method3583() throws LineUnavailableException { @Override protected void method3590() { @Pc(1) short local1 = 256; - if (Static316.aBoolean644) { + if (Static316.stereo) { local1 = 512; } for (@Pc(9) int local9 = 0; local9 < local1; local9++) { - @Pc(17) int local17 = this.anIntArray315[local9]; + @Pc(17) int local17 = this.samples[local9]; if ((local17 + 8388608 & 0xFF000000) != 0) { local17 = local17 >> 31 ^ 0x7FFFFF; } @@ -62,9 +62,9 @@ protected void method3590() { @OriginalMember(owner = "client!cb", name = "b", descriptor = "(I)V") @Override - public void method3588(@OriginalArg(0) int arg0) throws LineUnavailableException { + public void open(@OriginalArg(0) int arg0) throws LineUnavailableException { try { - @Pc(23) Info local23 = new Info(Static64.aClass3 == null ? (Static64.aClass3 = getClass("javax.sound.sampled.SourceDataLine")) : Static64.aClass3, this.anAudioFormat1, arg0 << (Static316.aBoolean644 ? 2 : 1)); + @Pc(23) Info local23 = new Info(Static64.aClass3 == null ? (Static64.aClass3 = getClass("javax.sound.sampled.SourceDataLine")) : Static64.aClass3, this.anAudioFormat1, arg0 << (Static316.stereo ? 2 : 1)); this.aSourceDataLine1 = (SourceDataLine) AudioSystem.getLine(local23); this.aSourceDataLine1.open(); this.aSourceDataLine1.start(); @@ -74,7 +74,7 @@ public void method3588(@OriginalArg(0) int arg0) throws LineUnavailableException this.aSourceDataLine1 = null; throw local39; } else { - this.method3588(IntUtils.clp2(arg0)); + this.open(IntUtils.clp2(arg0)); } } } @@ -101,12 +101,12 @@ protected void method3596() { @OriginalMember(owner = "client!cb", name = "d", descriptor = "()I") @Override protected int method3587() { - return this.anInt1519 - (this.aSourceDataLine1.available() >> (Static316.aBoolean644 ? 2 : 1)); + return this.anInt1519 - (this.aSourceDataLine1.available() >> (Static316.stereo ? 2 : 1)); } @OriginalMember(owner = "client!cb", name = "a", descriptor = "(Ljava/awt/Component;)V") @Override - public void method3593(@OriginalArg(0) Component arg0) { + public void init(@OriginalArg(0) Component arg0) { @Pc(1) javax.sound.sampled.Mixer.Info[] local1 = AudioSystem.getMixerInfo(); if (local1 != null) { for (@Pc(8) int local8 = 0; local8 < local1.length; local8++) { @@ -119,7 +119,7 @@ public void method3593(@OriginalArg(0) Component arg0) { } } } - this.anAudioFormat1 = new AudioFormat((float) Static686.anInt8944, 16, Static316.aBoolean644 ? 2 : 1, true, false); - this.aByteArray17 = new byte[0x100 << (Static316.aBoolean644 ? 2 : 1)]; + this.anAudioFormat1 = new AudioFormat((float) Static686.sampleRate, 16, Static316.stereo ? 2 : 1, true, false); + this.aByteArray17 = new byte[0x100 << (Static316.stereo ? 2 : 1)]; } } diff --git a/client/src/main/java/Js5CacheQueue.java b/client/src/main/java/Js5CacheQueue.java index f7a9e7e..eac1b68 100644 --- a/client/src/main/java/Js5CacheQueue.java +++ b/client/src/main/java/Js5CacheQueue.java @@ -31,14 +31,14 @@ public final class Js5CacheQueue implements Runnable { @OriginalMember(owner = "client!iba", name = "", descriptor = "(Lclient!vq;)V") public Js5CacheQueue(@OriginalArg(0) Signlink arg0) { - @Pc(20) PrivilegedRequest local20 = arg0.method8991(this, 5); + @Pc(20) PrivilegedRequest local20 = arg0.startThread(this, 5); while (local20.state == 0) { Static638.sleep(10L); } if (local20.state == 2) { throw new RuntimeException(); } - this.aThread2 = (Thread) local20.anObject13; + this.aThread2 = (Thread) local20.result; } @OriginalMember(owner = "client!iba", name = "a", descriptor = "(Lclient!af;IZ)Lclient!vp;") diff --git a/client/src/main/java/Js5QuickChatCommandDecoder.java b/client/src/main/java/Js5QuickChatCommandDecoder.java index 46b3b1a..01ab8cc 100644 --- a/client/src/main/java/Js5QuickChatCommandDecoder.java +++ b/client/src/main/java/Js5QuickChatCommandDecoder.java @@ -10,13 +10,13 @@ public final class Js5QuickChatCommandDecoder implements QuickChatCommandDecoder @Override public String method5631(@OriginalArg(1) long arg0, @OriginalArg(2) Class184 arg1, @OriginalArg(3) int[] arg2) { if (Static403.aClass184_12 == arg1) { - @Pc(13) EnumType local13 = Static619.aEnumTypeList2.method8925(arg2[0]); - return local13.method1229((int) arg0); + @Pc(13) EnumType local13 = Static619.aEnumTypeList2.get(arg2[0]); + return local13.getString((int) arg0); } else if (Static560.aClass184_15 == arg1 || arg1 == Static507.aClass184_14) { @Pc(41) ObjType local41 = ObjTypeList.objTypes.method2486((int) arg0); return local41.aString118; } else if (Static51.aClass184_1 == arg1 || Static642.aClass184_17 == arg1 || Static208.aClass184_6 == arg1) { - return Static619.aEnumTypeList2.method8925(arg2[0]).method1229((int) arg0); + return Static619.aEnumTypeList2.get(arg2[0]).getString((int) arg0); } else { return null; } diff --git a/client/src/main/java/Linkable_Sub28_Sub1.java b/client/src/main/java/Linkable_Sub28_Sub1.java index bbff811..bc45204 100644 --- a/client/src/main/java/Linkable_Sub28_Sub1.java +++ b/client/src/main/java/Linkable_Sub28_Sub1.java @@ -76,7 +76,7 @@ protected void method8558(@OriginalArg(1) OggPacket arg0) { } this.aDSPState1 = new DSPState(this.aVorbisInfo1); this.aVorbisBlock1 = new VorbisBlock(this.aDSPState1); - this.aResampler1 = new Resampler(this.aVorbisInfo1.rate, Static686.anInt8944); + this.aResampler1 = new Resampler(this.aVorbisInfo1.rate, Static686.sampleRate); this.aClass2_Sub6_Sub5_1 = new Linkable_Sub6_Sub5(this.aVorbisInfo1.channels); } return; @@ -108,7 +108,7 @@ public double method3963() { local13 = this.aDouble14; } } - return (double) -(256.0F / (float) Static686.anInt8944) + local13; + return (double) -(256.0F / (float) Static686.sampleRate) + local13; } @OriginalMember(owner = "client!ik", name = "h", descriptor = "(I)I") diff --git a/client/src/main/java/Linkable_Sub46.java b/client/src/main/java/Linkable_Sub46.java index 33d900f..abbbf10 100644 --- a/client/src/main/java/Linkable_Sub46.java +++ b/client/src/main/java/Linkable_Sub46.java @@ -9,7 +9,7 @@ public final class Linkable_Sub46 extends Linkable { public int anInt8241; @OriginalMember(owner = "client!rd", name = "o", descriptor = "Ljava/lang/String;") - public String aString100; + public String value; @OriginalMember(owner = "client!rd", name = "", descriptor = "()V") private Linkable_Sub46() { @@ -18,6 +18,6 @@ private Linkable_Sub46() { @OriginalMember(owner = "client!rd", name = "", descriptor = "(Ljava/lang/String;I)V") public Linkable_Sub46(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1) { this.anInt8241 = arg1; - this.aString100 = arg0; + this.value = arg0; } } diff --git a/client/src/main/java/Linkable_Sub6_Sub5.java b/client/src/main/java/Linkable_Sub6_Sub5.java index f00341d..4ef058c 100644 --- a/client/src/main/java/Linkable_Sub6_Sub5.java +++ b/client/src/main/java/Linkable_Sub6_Sub5.java @@ -47,7 +47,7 @@ public synchronized double method9137(@OriginalArg(0) boolean arg0) { if (arg0) { this.method9130(87); } - return local16.aDouble10 - (double) ((float) local16.aShortArrayArray3[0].length / (float) Static686.anInt8944); + return local16.aDouble10 - (double) ((float) local16.aShortArrayArray3[0].length / (float) Static686.sampleRate); } } @@ -164,7 +164,7 @@ public synchronized void method9131(@OriginalArg(0) int[] arg0, @OriginalArg(1) } if (this.method9145() != null) { @Pc(32) int local32 = arg2 + arg1; - if (Static316.aBoolean644) { + if (Static316.stereo) { local32 <<= 0x1; } @Pc(42) byte local42 = 0; @@ -178,7 +178,7 @@ public synchronized void method9131(@OriginalArg(0) int[] arg0, @OriginalArg(1) } @Pc(62) short[][] local62 = local56.aShortArrayArray3; while (local32 > arg1 && this.anInt10536 < local62[0].length) { - if (Static316.aBoolean644) { + if (Static316.stereo) { arg0[arg1++] = local62[0][this.anInt10536] * this.anInt10534; arg0[arg1++] = this.anInt10537 * local62[local42][this.anInt10536]; } else { diff --git a/client/src/main/java/MidiNotePcmStream.java b/client/src/main/java/MidiNotePcmStream.java index 0acb3fa..6800df5 100644 --- a/client/src/main/java/MidiNotePcmStream.java +++ b/client/src/main/java/MidiNotePcmStream.java @@ -43,7 +43,7 @@ public void method9130(@OriginalArg(0) int arg0) { @OriginalMember(owner = "client!uka", name = "a", descriptor = "(Lclient!dha;II)V") private void method8530(@OriginalArg(0) Linkable_Sub16 arg0, @OriginalArg(2) int arg1) { if ((this.aClass2_Sub6_Sub1_4.anIntArray56[arg0.anInt2187] & 0x4) != 0 && arg0.anInt2202 < 0) { - @Pc(28) int local28 = this.aClass2_Sub6_Sub1_4.anIntArray57[arg0.anInt2187] / Static686.anInt8944; + @Pc(28) int local28 = this.aClass2_Sub6_Sub1_4.anIntArray57[arg0.anInt2187] / Static686.sampleRate; @Pc(37) int local37 = (local28 + 1048575 - arg0.anInt2183) / local28; arg0.anInt2183 = arg0.anInt2183 + local28 * arg1 & 0xFFFFF; if (local37 <= arg1) { @@ -97,7 +97,7 @@ public PcmStream method9133() { @OriginalMember(owner = "client!uka", name = "a", descriptor = "([ILclient!dha;IIII)V") private void method8535(@OriginalArg(0) int[] arg0, @OriginalArg(1) Linkable_Sub16 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { if ((this.aClass2_Sub6_Sub1_4.anIntArray56[arg1.anInt2187] & 0x4) != 0 && arg1.anInt2202 < 0) { - @Pc(34) int local34 = this.aClass2_Sub6_Sub1_4.anIntArray57[arg1.anInt2187] / Static686.anInt8944; + @Pc(34) int local34 = this.aClass2_Sub6_Sub1_4.anIntArray57[arg1.anInt2187] / Static686.sampleRate; while (true) { @Pc(44) int local44 = (local34 + 1048575 - arg1.anInt2183) / local34; if (local44 > arg3) { @@ -108,7 +108,7 @@ private void method8535(@OriginalArg(0) int[] arg0, @OriginalArg(1) Linkable_Sub arg1.anInt2183 += local34 * local44 - 1048576; arg3 -= local44; arg4 += local44; - @Pc(75) int local75 = Static686.anInt8944 / 100; + @Pc(75) int local75 = Static686.sampleRate / 100; @Pc(79) int local79 = 262144 / local34; if (local79 < local75) { local75 = local79; diff --git a/client/src/main/java/MidiPcmStream.java b/client/src/main/java/MidiPcmStream.java index 3c91129..3864cfb 100644 --- a/client/src/main/java/MidiPcmStream.java +++ b/client/src/main/java/MidiPcmStream.java @@ -164,7 +164,7 @@ private synchronized void method911(@OriginalArg(1) boolean arg0) { @Override public synchronized void method9131(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { if (this.aClass40_1.method1055()) { - @Pc(14) int local14 = this.aClass40_1.anInt988 * this.anInt815 / Static686.anInt8944; + @Pc(14) int local14 = this.aClass40_1.anInt988 * this.anInt815 / Static686.sampleRate; do { @Pc(24) long local24 = this.aLong29 + (long) arg2 * (long) local14; if (this.aLong28 - local24 >= 0L) { @@ -229,7 +229,7 @@ private int method914(@OriginalArg(1) Linkable_Sub16 arg0) { @Pc(104) double local104 = Math.sin((double) (arg0.anInt2188 & 0x1FF) * 0.01227184630308513D); local14 += (int) (local104 * (double) local65); } - local65 = (int) ((double) (arg0.aClass2_Sub49_Sub1_1.anInt8818 * 256) * Math.pow(2.0D, (double) local14 * 3.255208333333333E-4D) / (double) Static686.anInt8944 + 0.5D); + local65 = (int) ((double) (arg0.aClass2_Sub49_Sub1_1.anInt8818 * 256) * Math.pow(2.0D, (double) local14 * 3.255208333333333E-4D) / (double) Static686.sampleRate + 0.5D); return local65 >= 1 ? local65 : 1; } @@ -566,7 +566,7 @@ private void method930(@OriginalArg(1) int arg0) { for (@Pc(14) Linkable_Sub16 local14 = (Linkable_Sub16) this.aClass2_Sub6_Sub4_1.aLinkedList72.head(); local14 != null; local14 = (Linkable_Sub16) this.aClass2_Sub6_Sub4_1.aLinkedList72.next()) { if (arg0 < 0 || local14.anInt2187 == arg0) { if (local14.aClass2_Sub6_Sub2_1 != null) { - local14.aClass2_Sub6_Sub2_1.method3320(Static686.anInt8944 / 100); + local14.aClass2_Sub6_Sub2_1.method3320(Static686.sampleRate / 100); if (local14.aClass2_Sub6_Sub2_1.method3336()) { this.aClass2_Sub6_Sub4_1.aClass2_Sub6_Sub3_2.method5882(local14.aClass2_Sub6_Sub2_1); } @@ -813,7 +813,7 @@ public synchronized boolean method944(@OriginalArg(0) SoundBank arg0, @OriginalA @Override public synchronized void method9130(@OriginalArg(0) int arg0) { if (this.aClass40_1.method1055()) { - @Pc(18) int local18 = this.aClass40_1.anInt988 * this.anInt815 / Static686.anInt8944; + @Pc(18) int local18 = this.aClass40_1.anInt988 * this.anInt815 / Static686.sampleRate; do { @Pc(27) long local27 = (long) arg0 * (long) local18 + this.aLong29; if (this.aLong28 - local27 >= 0L) { @@ -832,7 +832,7 @@ public synchronized void method9130(@OriginalArg(0) int arg0) { @OriginalMember(owner = "client!bd", name = "a", descriptor = "(Lclient!dha;I[III)Z") public boolean method945(@OriginalArg(0) Linkable_Sub16 arg0, @OriginalArg(2) int[] arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - arg0.anInt2184 = Static686.anInt8944 / 100; + arg0.anInt2184 = Static686.sampleRate / 100; if (arg0.anInt2202 >= 0 && (arg0.aClass2_Sub6_Sub2_1 == null || arg0.aClass2_Sub6_Sub2_1.method3311())) { arg0.method2083(); arg0.unlink(); diff --git a/client/src/main/java/Npc.java b/client/src/main/java/Npc.java index beb4257..93ad320 100644 --- a/client/src/main/java/Npc.java +++ b/client/src/main/java/Npc.java @@ -68,7 +68,7 @@ public boolean method9279(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O @Pc(20) Class73 local20 = arg3.method7985(); @Pc(25) int local25 = super.aClass126_7.method2673(16383); local20.method7131(local25); - local20.method7134(super.anInt10690, super.anInt10691, super.anInt10694); + local20.method7134(super.xFine, super.anInt10691, super.zFine); @Pc(38) boolean local38 = arg2; for (@Pc(40) int local40 = 0; local40 < super.aModelArray3.length; local40++) { if (super.aModelArray3[local40] != null) { @@ -123,14 +123,14 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { @Pc(22) Class73 local22 = arg0.method7985(); @Pc(27) int local27 = super.aClass126_7.method2673(16383); local22.method7131(local27); - @Pc(45) Class291 local45 = Static334.aClass291ArrayArrayArray1[super.aByte144][super.anInt10690 >> Static52.anInt1066][super.anInt10694 >> Static52.anInt1066]; + @Pc(45) Class291 local45 = Static334.aClass291ArrayArrayArray1[super.plane][super.xFine >> Static52.anInt1066][super.zFine >> Static52.anInt1066]; if (local45 == null || local45.aClass8_Sub2_Sub2_1 == null) { super.anInt10732 = (int) ((float) super.anInt10732 - (float) super.anInt10732 / 10.0F); } else { @Pc(75) int local75 = super.anInt10732 - local45.aClass8_Sub2_Sub2_1.aShort46; super.anInt10732 = (int) ((float) super.anInt10732 - (float) local75 / 10.0F); } - local22.method7134(super.anInt10690, -super.anInt10732 + super.anInt10691 - 20, super.anInt10694); + local22.method7134(super.xFine, -super.anInt10732 + super.anInt10691 - 20, super.zFine); @Pc(104) BasType local104 = this.method9317(); @Pc(118) NpcType local118 = this.aNpcType1.anIntArray532 == null ? this.aNpcType1 : this.aNpcType1.method5985(65535, Static34.aClass304_1); super.aBoolean819 = false; @@ -152,7 +152,7 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { } } local22.method7131(local27); - local22.method7134(super.anInt10690, -super.anInt10732 + super.anInt10691 - 5, super.anInt10694); + local22.method7134(super.xFine, -super.anInt10732 + super.anInt10691 - 5, super.zFine); if (local123 == null) { local123 = Static642.method8441(this.method9330(), super.aModelArray3.length); } @@ -200,7 +200,7 @@ private boolean method9324(@OriginalArg(0) int arg0, @OriginalArg(2) Class19 arg if (local50 != 0 || local53 != 0 || local9.anInt7224 != 0 || local9.anInt7252 != 0) { arg0 |= 0x7; } - @Pc(100) boolean local100 = super.aByte149 != 0 && super.anInt10760 <= Static333.anInt5455 && Static333.anInt5455 < super.anInt10752; + @Pc(100) boolean local100 = super.aByte149 != 0 && super.anInt10760 <= Static333.loop && Static333.loop < super.anInt10752; if (local100) { arg0 |= 0x80000; } @@ -317,14 +317,14 @@ public void method9325(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { local10--; local20++; } - if (super.aClass152_11.method9109() && super.aClass152_11.method9107().anInt1654 == 1) { + if (super.aClass152_11.method9109() && super.aClass152_11.method9107().movetype == 1) { super.anIntArray869 = null; super.aClass152_11.method9113(true, -1); } for (@Pc(110) int local110 = 0; local110 < super.aClass199Array3.length; local110++) { if (super.aClass199Array3[local110].anInt4930 != -1) { @Pc(131) SpotAnimType local131 = Static23.aSpotAnimTypeList1.method2694(super.aClass199Array3[local110].anInt4930); - if (local131.aBoolean448 && local131.anInt5842 != -1 && Static25.aSeqTypeList1.method1162(local131.anInt5842).anInt1654 == 1) { + if (local131.aBoolean448 && local131.anInt5842 != -1 && Static25.aSeqTypeList1.get(local131.anInt5842).movetype == 1) { super.aClass199Array3[local110].aClass152_7.method9113(true, -1); super.aClass199Array3[local110].anInt4930 = -1; } @@ -345,18 +345,18 @@ public void method9325(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @OriginalMember(owner = "client!wj", name = "a", descriptor = "(IZIIII)V") public void method9326(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { - super.aByte144 = super.aByte143 = (byte) arg3; + super.plane = super.aByte143 = (byte) arg3; if (Static441.method5968(arg1, arg2)) { super.aByte143++; } - if (super.aClass152_11.method9109() && super.aClass152_11.method9107().anInt1654 == 1) { + if (super.aClass152_11.method9109() && super.aClass152_11.method9107().movetype == 1) { super.anIntArray869 = null; super.aClass152_11.method9113(true, -1); } for (@Pc(61) int local61 = 0; local61 < super.aClass199Array3.length; local61++) { if (super.aClass199Array3[local61].anInt4930 != -1) { @Pc(81) SpotAnimType local81 = Static23.aSpotAnimTypeList1.method2694(super.aClass199Array3[local61].anInt4930); - if (local81.aBoolean448 && local81.anInt5842 != -1 && Static25.aSeqTypeList1.method1162(local81.anInt5842).anInt1654 == 1) { + if (local81.aBoolean448 && local81.anInt5842 != -1 && Static25.aSeqTypeList1.get(local81.anInt5842).movetype == 1) { super.aClass199Array3[local61].aClass152_7.method9113(true, -1); super.aClass199Array3[local61].anInt4930 = -1; } @@ -385,8 +385,8 @@ public void method9326(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @ super.anIntArray879[0] = arg2; super.anInt10762 = 0; super.anIntArray878[0] = arg1; - super.anInt10690 = (arg4 << 8) + (super.anIntArray879[0] << 9); - super.anInt10694 = (super.anIntArray878[0] << 9) + (arg4 << 8); + super.xFine = (arg4 << 8) + (super.anIntArray879[0] << 9); + super.zFine = (super.anIntArray878[0] << 9) + (arg4 << 8); if (super.aClass8_Sub5_8 != null) { super.aClass8_Sub5_8.method3656(); } @@ -406,7 +406,7 @@ public void method9289(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { } @Pc(26) Class73 local26 = arg0.method7985(); local26.method7131(super.aClass126_7.method2673(16383)); - local26.method7134(super.anInt10690, super.anInt10691 - 20, super.anInt10694); + local26.method7134(super.xFine, super.anInt10691 - 20, super.zFine); this.method9319(arg0, super.aBoolean820, super.aModelArray3, local26); for (@Pc(53) int local53 = 0; local53 < super.aModelArray3.length; local53++) { super.aModelArray3[local53] = null; diff --git a/client/src/main/java/ObjType.java b/client/src/main/java/ObjType.java index 23cdf4d..d1b2a94 100644 --- a/client/src/main/java/ObjType.java +++ b/client/src/main/java/ObjType.java @@ -88,7 +88,7 @@ public final class ObjType { public int anInt10092 = -1; @OriginalMember(owner = "client!vfa", name = "F", descriptor = "I") - public int anInt10098 = 2000; + public int zoom2d = 2000; @OriginalMember(owner = "client!vfa", name = "A", descriptor = "I") public int anInt10103 = -1; @@ -124,7 +124,7 @@ public final class ObjType { public int anInt10129 = -1; @OriginalMember(owner = "client!vfa", name = "s", descriptor = "I") - public int anInt10096 = 0; + public int yAngle2D = 0; @OriginalMember(owner = "client!vfa", name = "mb", descriptor = "I") private int anInt10118 = 0; @@ -178,7 +178,7 @@ public final class ObjType { public int anInt10144 = -1; @OriginalMember(owner = "client!vfa", name = "qb", descriptor = "I") - public int anInt10107 = 0; + public int xAngle2D = 0; @OriginalMember(owner = "client!vfa", name = "Bb", descriptor = "I") public int anInt10143 = -1; @@ -242,11 +242,11 @@ public void method8792(@OriginalArg(1) ObjType arg0, @OriginalArg(2) ObjType arg this.anInt10119 = arg0.anInt10119; this.aByteArray107 = arg0.aByteArray107; this.anInt10116 = arg0.anInt10116; - this.anInt10107 = arg1.anInt10107; + this.xAngle2D = arg1.xAngle2D; this.anInt10104 = arg0.anInt10104; this.anInt10120 = arg1.anInt10120; this.aStringArray45 = new String[5]; - this.anInt10096 = arg1.anInt10096; + this.yAngle2D = arg1.yAngle2D; this.anInt10099 = arg1.anInt10099; this.aShortArray134 = arg0.aShortArray134; this.anInt10113 = arg0.anInt10113; @@ -257,7 +257,7 @@ public void method8792(@OriginalArg(1) ObjType arg0, @OriginalArg(2) ObjType arg this.anInt10126 = arg1.anInt10126; this.anInt10136 = arg0.anInt10136; this.anInt10092 = arg0.anInt10092; - this.anInt10098 = arg1.anInt10098; + this.zoom2d = arg1.zoom2d; this.aString118 = arg0.aString118; this.anInt10135 = arg0.anInt10135; this.anInt10084 = arg0.anInt10084; @@ -277,14 +277,14 @@ public void method8793(@OriginalArg(0) ObjType arg0, @OriginalArg(2) ObjType arg this.anInt10142 = arg1.anInt10142; this.aString118 = arg1.aString118; this.aShortArray137 = arg0.aShortArray137; - this.anInt10096 = arg0.anInt10096; + this.yAngle2D = arg0.yAngle2D; this.anInt10094 = arg0.anInt10094; this.aShortArray134 = arg0.aShortArray134; this.anInt10120 = arg0.anInt10120; - this.anInt10098 = arg0.anInt10098; + this.zoom2d = arg0.zoom2d; this.aByteArray107 = arg0.aByteArray107; this.anInt10115 = 1; - this.anInt10107 = arg0.anInt10107; + this.xAngle2D = arg0.xAngle2D; this.anInt10126 = arg0.anInt10126; this.aBoolean770 = arg1.aBoolean770; this.aShortArray136 = arg0.aShortArray136; @@ -334,11 +334,11 @@ private void method8797(@OriginalArg(0) Packet arg0, @OriginalArg(2) int arg1) { } else if (arg1 == 2) { this.aString118 = arg0.gjstr(); } else if (arg1 == 4) { - this.anInt10098 = arg0.g2(); + this.zoom2d = arg0.g2(); } else if (arg1 == 5) { - this.anInt10107 = arg0.g2(); + this.xAngle2D = arg0.g2(); } else if (arg1 == 6) { - this.anInt10096 = arg0.g2(); + this.yAngle2D = arg0.g2(); } else if (arg1 == 7) { this.anInt10126 = arg0.g2(); if (this.anInt10126 > 32767) { @@ -557,11 +557,11 @@ public int[] method8798(@OriginalArg(0) int arg0, @OriginalArg(1) Class19 arg1, } @Pc(363) int local363; if (arg4) { - local363 = (int) ((double) this.anInt10098 * 1.5D) << 2; + local363 = (int) ((double) this.zoom2d * 1.5D) << 2; } else if (arg8 == 2) { - local363 = (int) ((double) this.anInt10098 * 1.04D) << 2; + local363 = (int) ((double) this.zoom2d * 1.04D) << 2; } else { - local363 = this.anInt10098 << 2; + local363 = this.zoom2d << 2; } arg6.DA(16, 16, 512, 512); @Pc(395) Class73 local395 = arg6.method7953(); @@ -571,9 +571,9 @@ public int[] method8798(@OriginalArg(0) int arg0, @OriginalArg(1) Class19 arg1, arg6.ZA(16777215, 1.0F, 1.0F, -50.0F, -10.0F, -50.0F); @Pc(414) Class73 local414 = arg6.method7985(); local414.method7132(-this.anInt10094 << 3); - local414.method7127(this.anInt10096 << 3); - local414.method7134(this.anInt10126 << 2, (Model.anIntArray741[this.anInt10107 << 3] * local363 >> 14) + (this.anInt10099 << 2) - (local244.fa() / 2), (Model.anIntArray740[this.anInt10107 << 3] * local363 >> 14) - -(this.anInt10099 << 2)); - local414.method7130(this.anInt10107 << 3); + local414.method7127(this.yAngle2D << 3); + local414.method7134(this.anInt10126 << 2, (Model.anIntArray741[this.xAngle2D << 3] * local363 >> 14) + (this.anInt10099 << 2) - (local244.fa() / 2), (Model.anIntArray740[this.xAngle2D << 3] * local363 >> 14) - -(this.anInt10099 << 2)); + local414.method7130(this.xAngle2D << 3); @Pc(480) int local480 = arg6.i(); @Pc(483) int local483 = arg6.XA(); arg6.f(50, Integer.MAX_VALUE); @@ -973,13 +973,13 @@ public void method8809(@OriginalArg(0) ObjType arg0, @OriginalArg(2) ObjType arg this.anInt10133 = arg1.anInt10133; this.anInt10116 = arg1.anInt10116; this.aString118 = arg1.aString118; - this.anInt10098 = arg0.anInt10098; + this.zoom2d = arg0.zoom2d; this.aShortArray135 = arg1.aShortArray135; this.anInt10119 = arg1.anInt10119; this.aHashTable44 = arg1.aHashTable44; this.anInt10104 = arg1.anInt10104; - this.anInt10107 = arg0.anInt10107; - this.anInt10096 = arg0.anInt10096; + this.xAngle2D = arg0.xAngle2D; + this.yAngle2D = arg0.yAngle2D; this.anInt10113 = arg1.anInt10113; this.anInt10111 = arg1.anInt10111; this.anInt10135 = arg1.anInt10135; diff --git a/client/src/main/java/ParticleNode_Sub2.java b/client/src/main/java/ParticleNode_Sub2.java index ff7d1d2..0a09def 100644 --- a/client/src/main/java/ParticleNode_Sub2.java +++ b/client/src/main/java/ParticleNode_Sub2.java @@ -10,10 +10,10 @@ public abstract class ParticleNode_Sub2 extends ParticleNode { public byte aByte143; @OriginalMember(owner = "client!eo", name = "j", descriptor = "B") - public byte aByte144; + public byte plane; @OriginalMember(owner = "client!eo", name = "f", descriptor = "I") - public int anInt10690; + public int xFine; @OriginalMember(owner = "client!eo", name = "q", descriptor = "Z") public boolean aBoolean812; @@ -25,7 +25,7 @@ public abstract class ParticleNode_Sub2 extends ParticleNode { public int anInt10692; @OriginalMember(owner = "client!eo", name = "v", descriptor = "I") - public int anInt10694; + public int zFine; @OriginalMember(owner = "client!eo", name = "t", descriptor = "Lclient!eo;") public ParticleNode_Sub2 aClass8_Sub2_25; @@ -51,7 +51,7 @@ protected ParticleNode_Sub2() { @OriginalMember(owner = "client!eo", name = "a", descriptor = "(I[Lclient!lca;II)I") protected final int method9277(@OriginalArg(1) Linkable_Sub7[] arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - @Pc(21) long local21 = Static161.aLongArrayArrayArray1[this.aByte144][arg2][arg1]; + @Pc(21) long local21 = Static161.aLongArrayArrayArray1[this.plane][arg2][arg1]; @Pc(23) long local23 = 0L; @Pc(25) int local25 = 0; @Pc(35) int local35; diff --git a/client/src/main/java/ParticleNode_Sub2_Sub2.java b/client/src/main/java/ParticleNode_Sub2_Sub2.java index 67b1e78..6460e58 100644 --- a/client/src/main/java/ParticleNode_Sub2_Sub2.java +++ b/client/src/main/java/ParticleNode_Sub2_Sub2.java @@ -10,12 +10,12 @@ public abstract class ParticleNode_Sub2_Sub2 extends ParticleNode_Sub2 { @OriginalMember(owner = "client!eia", name = "", descriptor = "(IIIIII)V") protected ParticleNode_Sub2_Sub2(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { - super.aByte144 = (byte) arg3; + super.plane = (byte) arg3; super.anInt10691 = arg1; - super.anInt10694 = arg2; + super.zFine = arg2; this.aShort46 = (short) arg5; super.aByte143 = (byte) arg4; - super.anInt10690 = arg0; + super.xFine = arg0; } @OriginalMember(owner = "client!eia", name = "a", descriptor = "(BLclient!ha;)Z") @@ -24,18 +24,18 @@ public final boolean method9284(@OriginalArg(0) byte arg0, @OriginalArg(1) Class if (arg0 != 59) { this.aShort46 = -95; } - return Static588.method7714(super.anInt10694 >> Static52.anInt1066, super.aByte143, super.anInt10690 >> Static52.anInt1066); + return Static588.method7714(super.zFine >> Static52.anInt1066, super.aByte143, super.xFine >> Static52.anInt1066); } @OriginalMember(owner = "client!eia", name = "g", descriptor = "(I)Z") @Override public final boolean method9275() { - return Static258.aBooleanArrayArray3[Static35.anInt813 + (super.anInt10690 >> Static52.anInt1066) - Static403.anInt6246][Static35.anInt813 + (super.anInt10694 >> Static52.anInt1066) - Static550.anInt8271]; + return Static258.aBooleanArrayArray3[Static35.anInt813 + (super.xFine >> Static52.anInt1066) - Static403.anInt6246][Static35.anInt813 + (super.zFine >> Static52.anInt1066) - Static550.anInt8271]; } @OriginalMember(owner = "client!eia", name = "a", descriptor = "([Lclient!lca;I)I") @Override public final int method9288(@OriginalArg(0) Linkable_Sub7[] arg0) { - return this.method9277(arg0, super.anInt10694 >> Static52.anInt1066, super.anInt10690 >> Static52.anInt1066); + return this.method9277(arg0, super.zFine >> Static52.anInt1066, super.xFine >> Static52.anInt1066); } } diff --git a/client/src/main/java/ParticleNode_Sub2_Sub2_Sub1.java b/client/src/main/java/ParticleNode_Sub2_Sub2_Sub1.java index 576686c..739a7fe 100644 --- a/client/src/main/java/ParticleNode_Sub2_Sub2_Sub1.java +++ b/client/src/main/java/ParticleNode_Sub2_Sub2_Sub1.java @@ -37,10 +37,10 @@ public final class ParticleNode_Sub2_Sub2_Sub1 extends ParticleNode_Sub2_Sub2 im public ParticleNode_Sub2_Sub2_Sub1(@OriginalArg(0) Class19 arg0, @OriginalArg(1) LocType arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) boolean arg9) { super(arg4, arg5, arg6, arg2, arg3, arg1.decorheight); this.aShort20 = (short) arg1.id; - super.anInt10694 = arg6; + super.zFine = arg6; this.aByte38 = (byte) arg8; this.aBoolean182 = arg1.active != 0 && !arg7; - super.anInt10690 = arg4; + super.xFine = arg4; this.aBoolean183 = arg7; this.aBoolean180 = arg9; this.aBoolean181 = arg0.method8006() && arg1.hardshadow && !this.aBoolean183 && Static400.aClass2_Sub34_28.aPreference_Sub12_1.method4364() != 0; @@ -76,7 +76,7 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { return null; } @Pc(20) Class73 local20 = arg0.method7985(); - local20.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local20.method7125(super.xFine, super.anInt10691, super.zFine); @Pc(34) ParticleNode_Sub7 local34 = Static642.method8441(this.aBoolean182, 1); if (Static504.aBoolean579) { this.aModel1.method7484(local20, local34.aClass8_Sub6Array1[0], Static582.anInt8627, 0); @@ -123,7 +123,7 @@ public boolean method9279(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O return false; } else { @Pc(21) Class73 local21 = arg3.method7985(); - local21.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local21.method7125(super.xFine, super.anInt10691, super.zFine); return Static504.aBoolean579 ? local16.method7483(arg1, arg0, local21, false, 0, Static582.anInt8627) : local16.method7486(arg1, arg0, local21, false, 0); } } @@ -140,7 +140,7 @@ public void method6861(@OriginalArg(0) Class19 arg0) { this.aClass2_Sub2_Sub9_1 = null; } if (local33 != null) { - Static630.method8357(local33, super.aByte143, super.anInt10690, super.anInt10694, (boolean[]) null); + Static630.method8357(local33, super.aByte143, super.xFine, super.zFine, (boolean[]) null); } } @@ -163,7 +163,7 @@ private Class272 method1831(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, local35 = Static706.aClass178Array3[super.aByte143 + 1]; } } - return local13.method1309(this.aByte38, super.anInt10694, super.anInt10690, local29, arg3, super.anInt10691, 22, arg2, (Class150) null, arg0, local35); + return local13.method1309(this.aByte38, super.zFine, super.xFine, local29, arg3, super.anInt10691, 22, arg2, (Class150) null, arg0, local35); } @OriginalMember(owner = "client!cu", name = "h", descriptor = "(I)Z") @@ -188,7 +188,7 @@ public boolean method9290(@OriginalArg(0) int arg0) { @Override public Class205 method9278(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { if (this.aClass205_1 == null) { - this.aClass205_1 = Static317.method4583(super.anInt10691, super.anInt10690, this.method1834(arg0, 0), super.anInt10694); + this.aClass205_1 = Static317.method4583(super.anInt10691, super.xFine, this.method1834(arg0, 0), super.zFine); } if (arg1 >= -93) { this.aClass205_1 = null; @@ -220,7 +220,7 @@ public void method6857(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { this.aClass2_Sub2_Sub9_1 = null; } if (local25 != null) { - Static292.method4618(local25, super.aByte143, super.anInt10690, super.anInt10694, (boolean[]) null); + Static292.method4618(local25, super.aByte143, super.xFine, super.zFine, (boolean[]) null); } } diff --git a/client/src/main/java/ParticleNode_Sub2_Sub2_Sub2.java b/client/src/main/java/ParticleNode_Sub2_Sub2_Sub2.java index 333ba86..f2bd94e 100644 --- a/client/src/main/java/ParticleNode_Sub2_Sub2_Sub2.java +++ b/client/src/main/java/ParticleNode_Sub2_Sub2_Sub2.java @@ -33,7 +33,7 @@ public boolean method9279(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O return false; } else { @Pc(20) Class73 local20 = arg3.method7985(); - local20.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local20.method7125(super.xFine, super.anInt10691, super.zFine); return Static504.aBoolean579 ? local12.method7483(arg1, arg0, local20, false, 0, Static582.anInt8627) : local12.method7486(arg1, arg0, local20, false, 0); } } @@ -57,10 +57,10 @@ public void method9289(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { if (local21 == null) { return; } - @Pc(28) int local28 = super.anInt10690 >> 9; - @Pc(33) int local33 = super.anInt10694 >> 9; + @Pc(28) int local28 = super.xFine >> 9; + @Pc(33) int local33 = super.zFine >> 9; @Pc(36) Class73 local36 = arg0.method7985(); - local36.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local36.method7125(super.xFine, super.anInt10691, super.zFine); this.aClass337_2.method7681(local33, local21, false, -9827, arg0, local28, local28, local33, local36); } @@ -152,10 +152,10 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { return null; } @Pc(30) Class73 local30 = arg0.method7985(); - local30.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local30.method7125(super.xFine, super.anInt10691, super.zFine); @Pc(44) ParticleNode_Sub7 local44 = Static642.method8441(this.aBoolean318, 1); - @Pc(49) int local49 = super.anInt10690 >> 9; - @Pc(54) int local54 = super.anInt10694 >> 9; + @Pc(49) int local49 = super.xFine >> 9; + @Pc(54) int local54 = super.zFine >> 9; this.aClass337_2.method7681(local54, local22, true, -9827, arg0, local49, local49, local54, local30); if (Static504.aBoolean579) { local22.method7484(local30, local44.aClass8_Sub6Array1[0], Static582.anInt8627, 0); @@ -172,9 +172,9 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { } this.aBoolean317 = local22.F() || this.aClass337_2.aClass8_Sub5_7 != null; if (this.aClass205_3 == null) { - this.aClass205_3 = Static317.method4583(super.anInt10691, super.anInt10690, local22, super.anInt10694); + this.aClass205_3 = Static317.method4583(super.anInt10691, super.xFine, local22, super.zFine); } else { - Static223.method9103(local22, super.anInt10694, super.anInt10691, super.anInt10690, this.aClass205_3); + Static223.method9103(local22, super.zFine, super.anInt10691, super.xFine, this.aClass205_3); } return local44; } diff --git a/client/src/main/java/ParticleNode_Sub2_Sub3.java b/client/src/main/java/ParticleNode_Sub2_Sub3.java index 6dac44b..bd48820 100644 --- a/client/src/main/java/ParticleNode_Sub2_Sub3.java +++ b/client/src/main/java/ParticleNode_Sub2_Sub3.java @@ -13,9 +13,9 @@ public abstract class ParticleNode_Sub2_Sub3 extends ParticleNode_Sub2 { protected ParticleNode_Sub2_Sub3(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { this.aShort58 = (short) arg5; super.anInt10691 = arg1; - super.aByte144 = (byte) arg3; - super.anInt10694 = arg2; - super.anInt10690 = arg0; + super.plane = (byte) arg3; + super.zFine = arg2; + super.xFine = arg0; super.aByte143 = (byte) arg4; } @@ -25,14 +25,14 @@ public final boolean method9284(@OriginalArg(0) byte arg0, @OriginalArg(1) Class if (arg0 != 59) { this.aShort58 = -17; } - return Static73.method9308(super.anInt10690 >> Static52.anInt1066, super.anInt10694 >> Static52.anInt1066, this, super.aByte143); + return Static73.method9308(super.xFine >> Static52.anInt1066, super.zFine >> Static52.anInt1066, this, super.aByte143); } @OriginalMember(owner = "client!kp", name = "a", descriptor = "([Lclient!lca;I)I") @Override public final int method9288(@OriginalArg(0) Linkable_Sub7[] arg0) { - @Pc(10) int local10 = super.anInt10690 >> Static52.anInt1066; - @Pc(21) int local21 = super.anInt10694 >> Static52.anInt1066; + @Pc(10) int local10 = super.xFine >> Static52.anInt1066; + @Pc(21) int local21 = super.zFine >> Static52.anInt1066; @Pc(23) int local23 = 0; if (Static403.anInt6246 == local10) { local23++; @@ -71,6 +71,6 @@ public final int method9288(@OriginalArg(0) Linkable_Sub7[] arg0) { @OriginalMember(owner = "client!kp", name = "g", descriptor = "(I)Z") @Override public final boolean method9275() { - return Static258.aBooleanArrayArray3[(super.anInt10690 >> Static52.anInt1066) + Static35.anInt813 - Static403.anInt6246][Static35.anInt813 + (super.anInt10694 >> Static52.anInt1066) - Static550.anInt8271]; + return Static258.aBooleanArrayArray3[(super.xFine >> Static52.anInt1066) + Static35.anInt813 - Static403.anInt6246][Static35.anInt813 + (super.zFine >> Static52.anInt1066) - Static550.anInt8271]; } } diff --git a/client/src/main/java/ParticleNode_Sub2_Sub3_Sub1.java b/client/src/main/java/ParticleNode_Sub2_Sub3_Sub1.java index 426cfc0..a90d903 100644 --- a/client/src/main/java/ParticleNode_Sub2_Sub3_Sub1.java +++ b/client/src/main/java/ParticleNode_Sub2_Sub3_Sub1.java @@ -21,7 +21,7 @@ public final class ParticleNode_Sub2_Sub3_Sub1 extends ParticleNode_Sub2_Sub3 im @OriginalMember(owner = "client!db", name = "", descriptor = "(Lclient!ha;Lclient!c;IIIIIZIII)V") public ParticleNode_Sub2_Sub3_Sub1(@OriginalArg(0) Class19 arg0, @OriginalArg(1) LocType arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10) { super(arg4, arg5, arg6, arg2, arg3, Static372.method5290(arg9, arg8)); - this.aClass337_1 = new Class337(arg0, arg1, arg8, arg9, super.aByte144, arg3, this, arg7, arg10); + this.aClass337_1 = new Class337(arg0, arg1, arg8, arg9, super.plane, arg3, this, arg7, arg10); this.aBoolean192 = arg1.active != 0 && !arg7; } @@ -77,10 +77,10 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { return null; } @Pc(22) Class73 local22 = arg0.method7985(); - local22.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local22.method7125(super.xFine, super.anInt10691, super.zFine); @Pc(36) ParticleNode_Sub7 local36 = Static642.method8441(this.aBoolean192, 1); - @Pc(49) int local49 = super.anInt10690 >> 9; - @Pc(54) int local54 = super.anInt10694 >> 9; + @Pc(49) int local49 = super.xFine >> 9; + @Pc(54) int local54 = super.zFine >> 9; this.aClass337_1.method7681(local54, local14, true, -9827, arg0, local49, local49, local54, local22); if (Static504.aBoolean579) { local14.method7484(local22, local36.aClass8_Sub6Array1[0], Static582.anInt8627, 0); @@ -97,9 +97,9 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { } this.aBoolean193 = local14.F() || this.aClass337_1.aClass8_Sub5_7 != null; if (this.aClass205_2 == null) { - this.aClass205_2 = Static317.method4583(super.anInt10691, super.anInt10690, local14, super.anInt10694); + this.aClass205_2 = Static317.method4583(super.anInt10691, super.xFine, local14, super.zFine); } else { - Static223.method9103(local14, super.anInt10694, super.anInt10691, super.anInt10690, this.aClass205_2); + Static223.method9103(local14, super.zFine, super.anInt10691, super.xFine, this.aClass205_2); } return local36; } @@ -129,7 +129,7 @@ public boolean method9279(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O return false; } else { @Pc(20) Class73 local20 = arg3.method7985(); - local20.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local20.method7125(super.xFine, super.anInt10691, super.zFine); return Static504.aBoolean579 ? local12.method7483(arg1, arg0, local20, false, 0, Static582.anInt8627) : local12.method7486(arg1, arg0, local20, false, 0); } } @@ -153,10 +153,10 @@ public void method9289(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { if (local17 == null) { return; } - @Pc(24) int local24 = super.anInt10690 >> 9; - @Pc(29) int local29 = super.anInt10694 >> 9; + @Pc(24) int local24 = super.xFine >> 9; + @Pc(29) int local29 = super.zFine >> 9; @Pc(32) Class73 local32 = arg0.method7985(); - local32.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local32.method7125(super.xFine, super.anInt10691, super.zFine); this.aClass337_1.method7681(local29, local17, false, -9827, arg0, local24, local24, local29, local32); } diff --git a/client/src/main/java/ParticleNode_Sub2_Sub3_Sub2.java b/client/src/main/java/ParticleNode_Sub2_Sub3_Sub2.java index ecc5205..b4672d4 100644 --- a/client/src/main/java/ParticleNode_Sub2_Sub3_Sub2.java +++ b/client/src/main/java/ParticleNode_Sub2_Sub3_Sub2.java @@ -39,8 +39,8 @@ public final class ParticleNode_Sub2_Sub3_Sub2 extends ParticleNode_Sub2_Sub3 im @OriginalMember(owner = "client!jn", name = "", descriptor = "(Lclient!ha;Lclient!c;IIIIIZIIZ)V") public ParticleNode_Sub2_Sub3_Sub2(@OriginalArg(0) Class19 arg0, @OriginalArg(1) LocType arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10) { super(arg4, arg5, arg6, arg2, arg3, Static490.method6553(arg9, arg8)); - super.anInt10690 = arg4; - super.anInt10694 = arg6; + super.xFine = arg4; + super.zFine = arg6; this.aBoolean379 = arg1.active != 0 && !arg7; this.aShort60 = (short) arg1.id; this.aByte88 = (byte) arg8; @@ -94,7 +94,7 @@ public void method6861(@OriginalArg(0) Class19 arg0) { this.aClass2_Sub2_Sub9_4 = null; } if (local21 != null) { - Static630.method8357(local21, super.aByte143, super.anInt10690, super.anInt10694, (boolean[]) null); + Static630.method8357(local21, super.aByte143, super.xFine, super.zFine, (boolean[]) null); } } @@ -149,7 +149,7 @@ public int method9286(@OriginalArg(0) int arg0) { @Override public Class205 method9278(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { if (this.aClass205_6 == null) { - this.aClass205_6 = Static317.method4583(super.anInt10691, super.anInt10690, this.method4474(arg0, 0), super.anInt10694); + this.aClass205_6 = Static317.method4583(super.anInt10691, super.xFine, this.method4474(arg0, 0), super.zFine); } if (arg1 >= -93) { this.aClass205_6 = null; @@ -202,7 +202,7 @@ public void method6857(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { this.aClass2_Sub2_Sub9_4 = null; } if (local24 != null) { - Static292.method4618(local24, super.aByte143, super.anInt10690, super.anInt10694, (boolean[]) null); + Static292.method4618(local24, super.aByte143, super.xFine, super.zFine, (boolean[]) null); } } @@ -232,7 +232,7 @@ private Class272 method4475(@OriginalArg(0) Class19 arg0, @OriginalArg(2) int ar local38 = null; } } - return local11.method1309(this.aByte87, super.anInt10694, super.anInt10690, local27, arg2, super.anInt10691, this.aByte88, arg0, (Class150) null, arg1, local38); + return local11.method1309(this.aByte87, super.zFine, super.xFine, local27, arg2, super.anInt10691, this.aByte88, arg0, (Class150) null, arg1, local38); } @OriginalMember(owner = "client!jn", name = "d", descriptor = "(Lclient!ha;I)V") @@ -254,7 +254,7 @@ public boolean method9279(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O return false; } else { @Pc(14) Class73 local14 = arg3.method7985(); - local14.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local14.method7125(super.xFine, super.anInt10691, super.zFine); return Static504.aBoolean579 ? local9.method7483(arg1, arg0, local14, false, 0, Static582.anInt8627) : local9.method7486(arg1, arg0, local14, false, 0); } } @@ -275,7 +275,7 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { return null; } @Pc(20) Class73 local20 = arg0.method7985(); - local20.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local20.method7125(super.xFine, super.anInt10691, super.zFine); @Pc(34) ParticleNode_Sub7 local34 = Static642.method8441(this.aBoolean379, 1); if (Static504.aBoolean579) { this.aModel5.method7484(local20, local34.aClass8_Sub6Array1[0], Static582.anInt8627, 0); diff --git a/client/src/main/java/ParticleNode_Sub2_Sub4.java b/client/src/main/java/ParticleNode_Sub2_Sub4.java index bd0ba70..f7e994a 100644 --- a/client/src/main/java/ParticleNode_Sub2_Sub4.java +++ b/client/src/main/java/ParticleNode_Sub2_Sub4.java @@ -13,11 +13,11 @@ public abstract class ParticleNode_Sub2_Sub4 extends ParticleNode_Sub2 implement @OriginalMember(owner = "client!tla", name = "", descriptor = "(IIIIIII)V") protected ParticleNode_Sub2_Sub4(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { - super.aByte144 = (byte) arg3; + super.plane = (byte) arg3; this.aShort101 = (short) arg5; - super.anInt10694 = arg2; + super.zFine = arg2; this.aShort102 = (short) arg6; - super.anInt10690 = arg0; + super.xFine = arg0; super.aByte143 = (byte) arg4; super.anInt10691 = arg1; } @@ -28,7 +28,7 @@ public final boolean method9284(@OriginalArg(0) byte arg0, @OriginalArg(1) Class if (arg0 != 59) { this.aShort101 = -126; } - return Static282.method3976(this.method9286(2), super.aByte143, super.anInt10690 >> Static52.anInt1066, super.anInt10694 >> Static52.anInt1066); + return Static282.method3976(this.method9286(2), super.aByte143, super.xFine >> Static52.anInt1066, super.zFine >> Static52.anInt1066); } @OriginalMember(owner = "client!tla", name = "j", descriptor = "(I)V") @@ -60,12 +60,12 @@ public final boolean method9290(@OriginalArg(0) int arg0) { @OriginalMember(owner = "client!tla", name = "a", descriptor = "([Lclient!lca;I)I") @Override public final int method9288(@OriginalArg(0) Linkable_Sub7[] arg0) { - return this.method9277(arg0, super.anInt10694 >> Static52.anInt1066, super.anInt10690 >> Static52.anInt1066); + return this.method9277(arg0, super.zFine >> Static52.anInt1066, super.xFine >> Static52.anInt1066); } @OriginalMember(owner = "client!tla", name = "g", descriptor = "(I)Z") @Override public final boolean method9275() { - return Static258.aBooleanArrayArray3[(super.anInt10690 >> Static52.anInt1066) + Static35.anInt813 - Static403.anInt6246][(super.anInt10694 >> Static52.anInt1066) + Static35.anInt813 - Static550.anInt8271]; + return Static258.aBooleanArrayArray3[(super.xFine >> Static52.anInt1066) + Static35.anInt813 - Static403.anInt6246][(super.zFine >> Static52.anInt1066) + Static35.anInt813 - Static550.anInt8271]; } } diff --git a/client/src/main/java/ParticleNode_Sub2_Sub4_Sub1.java b/client/src/main/java/ParticleNode_Sub2_Sub4_Sub1.java index b3c8b1f..c5fc131 100644 --- a/client/src/main/java/ParticleNode_Sub2_Sub4_Sub1.java +++ b/client/src/main/java/ParticleNode_Sub2_Sub4_Sub1.java @@ -39,10 +39,10 @@ public final class ParticleNode_Sub2_Sub4_Sub1 extends ParticleNode_Sub2_Sub4 im @OriginalMember(owner = "client!im", name = "", descriptor = "(Lclient!ha;Lclient!c;IIIIIZIIII)V") public ParticleNode_Sub2_Sub4_Sub1(@OriginalArg(0) Class19 arg0, @OriginalArg(1) LocType arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11) { super(arg4, arg5, arg6, arg2, arg3, arg8, arg9); - super.anInt10694 = arg6; + super.zFine = arg6; this.aShort52 = (short) arg1.id; this.aByte78 = (byte) arg11; - super.anInt10690 = arg4; + super.xFine = arg4; this.aByte77 = (byte) arg10; this.aBoolean350 = arg1.active != 0 && !arg7; this.aBoolean348 = arg7; @@ -107,7 +107,7 @@ public boolean method9279(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O return false; } else { @Pc(23) Class73 local23 = arg3.method7985(); - local23.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local23.method7125(super.xFine, super.anInt10691, super.zFine); return Static504.aBoolean579 ? local18.method7483(arg1, arg0, local23, false, 0, Static582.anInt8627) : local18.method7486(arg1, arg0, local23, false, 0); } } @@ -119,7 +119,7 @@ public Class205 method9278(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg this.method6855(-71); } if (this.aClass205_4 == null) { - this.aClass205_4 = Static317.method4583(super.anInt10691, super.anInt10690, this.method4041(0, arg0), super.anInt10694); + this.aClass205_4 = Static317.method4583(super.anInt10691, super.xFine, this.method4041(0, arg0), super.zFine); } return this.aClass205_4; } @@ -136,7 +136,7 @@ public void method6861(@OriginalArg(0) Class19 arg0) { this.aClass2_Sub2_Sub9_2 = null; } if (local37 != null) { - Static630.method8357(local37, super.aByte143, super.anInt10690, super.anInt10694, (boolean[]) null); + Static630.method8357(local37, super.aByte143, super.xFine, super.zFine, (boolean[]) null); } } @@ -170,7 +170,7 @@ public void method6857(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { this.aClass2_Sub2_Sub9_2 = null; } if (arg1 < -42 && local28 != null) { - Static292.method4618(local28, super.aByte143, super.anInt10690, super.anInt10694, (boolean[]) null); + Static292.method4618(local28, super.aByte143, super.xFine, super.zFine, (boolean[]) null); } } @@ -206,7 +206,7 @@ private Class272 method4045(@OriginalArg(1) Class19 arg0, @OriginalArg(2) int ar local24 = null; } } - return local17.method1309(this.aByte78, super.anInt10694, super.anInt10690, local29, arg2, super.anInt10691, this.aByte77, arg0, (Class150) null, arg1, local24); + return local17.method1309(this.aByte78, super.zFine, super.xFine, local29, arg2, super.anInt10691, this.aByte77, arg0, (Class150) null, arg1, local24); } @OriginalMember(owner = "client!im", name = "b", descriptor = "(I)I") @@ -222,7 +222,7 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { return null; } @Pc(12) Class73 local12 = arg0.method7985(); - local12.method7125(super.anInt10690 + super.aShort101, super.anInt10691, super.aShort102 + super.anInt10694); + local12.method7125(super.xFine + super.aShort101, super.anInt10691, super.aShort102 + super.zFine); @Pc(41) ParticleNode_Sub7 local41 = Static642.method8441(this.aBoolean350, 1); if (Static504.aBoolean579) { this.aModel3.method7484(local12, local41.aClass8_Sub6Array1[0], Static582.anInt8627, 0); diff --git a/client/src/main/java/ParticleNode_Sub2_Sub4_Sub2.java b/client/src/main/java/ParticleNode_Sub2_Sub4_Sub2.java index 902176b..38c9f89 100644 --- a/client/src/main/java/ParticleNode_Sub2_Sub4_Sub2.java +++ b/client/src/main/java/ParticleNode_Sub2_Sub4_Sub2.java @@ -21,7 +21,7 @@ public final class ParticleNode_Sub2_Sub4_Sub2 extends ParticleNode_Sub2_Sub4 im @OriginalMember(owner = "client!qg", name = "", descriptor = "(Lclient!ha;Lclient!c;IIIIIZIIIII)V") public ParticleNode_Sub2_Sub4_Sub2(@OriginalArg(0) Class19 arg0, @OriginalArg(1) LocType arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12) { super(arg4, arg5, arg6, arg2, arg3, arg8, arg9); - this.aClass337_4 = new Class337(arg0, arg1, arg10, arg11, super.aByte144, arg3, this, arg7, arg12); + this.aClass337_4 = new Class337(arg0, arg1, arg10, arg11, super.plane, arg3, this, arg7, arg12); this.aBoolean587 = arg1.active != 0 && !arg7; } @@ -45,10 +45,10 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { return null; } @Pc(22) Class73 local22 = arg0.method7985(); - local22.method7125(super.anInt10690 + super.aShort101, super.anInt10691, super.anInt10694 + super.aShort102); + local22.method7125(super.xFine + super.aShort101, super.anInt10691, super.zFine + super.aShort102); @Pc(42) ParticleNode_Sub7 local42 = Static642.method8441(this.aBoolean587, 1); - @Pc(55) int local55 = super.anInt10690 >> 9; - @Pc(60) int local60 = super.anInt10694 >> 9; + @Pc(55) int local55 = super.xFine >> 9; + @Pc(60) int local60 = super.zFine >> 9; this.aClass337_4.method7681(local60, local14, true, -9827, arg0, local55, local55, local60, local22); if (Static504.aBoolean579) { local14.method7484(local22, local42.aClass8_Sub6Array1[0], Static582.anInt8627, 0); @@ -65,9 +65,9 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { } this.aBoolean588 = local14.F() || this.aClass337_4.aClass8_Sub5_7 != null; if (this.aClass205_8 == null) { - this.aClass205_8 = Static317.method4583(super.anInt10691, super.anInt10690, local14, super.anInt10694); + this.aClass205_8 = Static317.method4583(super.anInt10691, super.xFine, local14, super.zFine); } else { - Static223.method9103(local14, super.anInt10694, super.anInt10691, super.anInt10690, this.aClass205_8); + Static223.method9103(local14, super.zFine, super.anInt10691, super.xFine, this.aClass205_8); } return local42; } @@ -100,7 +100,7 @@ public boolean method9279(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O return false; } else { @Pc(25) Class73 local25 = arg3.method7985(); - local25.method7125(super.aShort101 + super.anInt10690, super.anInt10691, super.anInt10694 + super.aShort102); + local25.method7125(super.aShort101 + super.xFine, super.anInt10691, super.zFine + super.aShort102); return Static504.aBoolean579 ? local17.method7483(arg1, arg0, local25, false, 0, Static582.anInt8627) : local17.method7486(arg1, arg0, local25, false, 0); } } @@ -159,10 +159,10 @@ public void method9289(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { if (local21 == null) { return; } - @Pc(28) int local28 = super.anInt10690 >> 9; - @Pc(33) int local33 = super.anInt10694 >> 9; + @Pc(28) int local28 = super.xFine >> 9; + @Pc(33) int local33 = super.zFine >> 9; @Pc(36) Class73 local36 = arg0.method7985(); - local36.method7125(super.anInt10690, super.anInt10691, super.anInt10694); + local36.method7125(super.xFine, super.anInt10691, super.zFine); this.aClass337_4.method7681(local33, local21, false, arg1 - 9822, arg0, local28, local28, local33, local36); } diff --git a/client/src/main/java/ParticleNode_Sub2_Sub5.java b/client/src/main/java/ParticleNode_Sub2_Sub5.java index d280d88..6b88017 100644 --- a/client/src/main/java/ParticleNode_Sub2_Sub5.java +++ b/client/src/main/java/ParticleNode_Sub2_Sub5.java @@ -8,19 +8,19 @@ public abstract class ParticleNode_Sub2_Sub5 extends ParticleNode_Sub2 { @OriginalMember(owner = "client!nda", name = "", descriptor = "(IIIII)V") public ParticleNode_Sub2_Sub5(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - super.anInt10690 = arg0; + super.xFine = arg0; super.aByte143 = (byte) arg4; super.anInt10691 = arg1; - super.anInt10694 = arg2; - super.aByte144 = (byte) arg3; + super.zFine = arg2; + super.plane = (byte) arg3; } @OriginalMember(owner = "client!nda", name = "a", descriptor = "(BLclient!ha;)Z") @Override public final boolean method9284(@OriginalArg(0) byte arg0, @OriginalArg(1) Class19 arg1) { - @Pc(15) Class286 local15 = Static467.method6351(super.aByte144, super.anInt10690 >> Static52.anInt1066, super.anInt10694 >> Static52.anInt1066); + @Pc(15) Class286 local15 = Static467.method6351(super.plane, super.xFine >> Static52.anInt1066, super.zFine >> Static52.anInt1066); if (arg0 == 59) { - return local15 != null && local15.aClass8_Sub2_Sub1_1.aBoolean815 ? Static282.method3976(local15.aClass8_Sub2_Sub1_1.method9286(2) + this.method9286(2), super.aByte144, super.anInt10690 >> Static52.anInt1066, super.anInt10694 >> Static52.anInt1066) : Static588.method7714(super.anInt10694 >> Static52.anInt1066, super.aByte144, super.anInt10690 >> Static52.anInt1066); + return local15 != null && local15.aClass8_Sub2_Sub1_1.aBoolean815 ? Static282.method3976(local15.aClass8_Sub2_Sub1_1.method9286(2) + this.method9286(2), super.plane, super.xFine >> Static52.anInt1066, super.zFine >> Static52.anInt1066) : Static588.method7714(super.zFine >> Static52.anInt1066, super.plane, super.xFine >> Static52.anInt1066); } else { return true; } @@ -29,7 +29,7 @@ public final boolean method9284(@OriginalArg(0) byte arg0, @OriginalArg(1) Class @OriginalMember(owner = "client!nda", name = "g", descriptor = "(I)Z") @Override public final boolean method9275() { - return Static258.aBooleanArrayArray3[(super.anInt10690 >> Static52.anInt1066) + Static35.anInt813 - Static403.anInt6246][Static35.anInt813 + (super.anInt10694 >> Static52.anInt1066) - Static550.anInt8271]; + return Static258.aBooleanArrayArray3[(super.xFine >> Static52.anInt1066) + Static35.anInt813 - Static403.anInt6246][Static35.anInt813 + (super.zFine >> Static52.anInt1066) - Static550.anInt8271]; } @OriginalMember(owner = "client!nda", name = "a", descriptor = "(IZLclient!ha;IBILclient!eo;)V") @@ -43,7 +43,7 @@ public final void method9285(@OriginalArg(0) int arg0, @OriginalArg(1) boolean a @OriginalMember(owner = "client!nda", name = "a", descriptor = "([Lclient!lca;I)I") @Override public final int method9288(@OriginalArg(0) Linkable_Sub7[] arg0) { - return this.method9277(arg0, super.anInt10694 >> Static52.anInt1066, super.anInt10690 >> Static52.anInt1066); + return this.method9277(arg0, super.zFine >> Static52.anInt1066, super.xFine >> Static52.anInt1066); } @OriginalMember(owner = "client!nda", name = "j", descriptor = "(I)V") diff --git a/client/src/main/java/ParticleNode_Sub2_Sub5_Sub1.java b/client/src/main/java/ParticleNode_Sub2_Sub5_Sub1.java index 1f92a43..be7c442 100644 --- a/client/src/main/java/ParticleNode_Sub2_Sub5_Sub1.java +++ b/client/src/main/java/ParticleNode_Sub2_Sub5_Sub1.java @@ -103,7 +103,7 @@ public boolean method9279(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O this.method9278((Class19) null, 104); } @Pc(16) Class73 local16 = arg3.method7985(); - local16.method7125(super.anInt10690, super.anInt10691 - 10, super.anInt10694); + local16.method7125(super.xFine, super.anInt10691 - 10, super.zFine); @Pc(32) ObjType local32 = ObjTypeList.objTypes.method2486(this.anInt8867); @Pc(42) Model local42 = local32.method8805((Class152) null, 131072, (PlayerAppearance) null, this.anInt8873, arg3); if (local42 != null && (Static504.aBoolean579 ? local42.method7483(arg1, arg0, local16, true, local32.anInt10138, Static582.anInt8627) : local42.method7486(arg1, arg0, local16, true, local32.anInt10138))) { @@ -136,8 +136,8 @@ public boolean method9283() { @OriginalMember(owner = "client!sv", name = "a", descriptor = "(ILclient!ha;)Lclient!pea;") @Override public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { - @Pc(17) Class286 local17 = Static467.method6351(super.aByte144, super.anInt10690 >> Static52.anInt1066, super.anInt10694 >> Static52.anInt1066); - @Pc(29) ParticleNode_Sub2_Sub2 local29 = Static687.method8959(super.aByte144, super.anInt10690 >> Static52.anInt1066, super.anInt10694 >> Static52.anInt1066); + @Pc(17) Class286 local17 = Static467.method6351(super.plane, super.xFine >> Static52.anInt1066, super.zFine >> Static52.anInt1066); + @Pc(29) ParticleNode_Sub2_Sub2 local29 = Static687.method8959(super.plane, super.xFine >> Static52.anInt1066, super.zFine >> Static52.anInt1066); @Pc(31) int local31 = 0; if (local17 != null && local17.aClass8_Sub2_Sub1_1.aBoolean815) { local31 = local17.aClass8_Sub2_Sub1_1.method9286(2); @@ -157,16 +157,16 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { @Pc(115) int local115 = this.anInt8879 << 1; @Pc(122) int local122 = -local115 / 2; @Pc(127) int local127 = -local115 / 2; - @Pc(139) int local139 = local110.method7878(super.anInt10694 + local127, local122 + super.anInt10690); + @Pc(139) int local139 = local110.method7878(super.zFine + local127, local122 + super.xFine); @Pc(143) int local143 = local115 / 2; @Pc(148) int local148 = -local115 / 2; - @Pc(161) int local161 = local110.method7878(super.anInt10694 + local148, local143 + super.anInt10690); + @Pc(161) int local161 = local110.method7878(super.zFine + local148, local143 + super.xFine); @Pc(166) int local166 = -local115 / 2; @Pc(170) int local170 = local115 / 2; - @Pc(182) int local182 = local110.method7878(local170 + super.anInt10694, super.anInt10690 + local166); + @Pc(182) int local182 = local110.method7878(local170 + super.zFine, super.xFine + local166); @Pc(186) int local186 = local115 / 2; @Pc(190) int local190 = local115 / 2; - @Pc(203) int local203 = local110.method7878(super.anInt10694 + local190, local186 + super.anInt10690); + @Pc(203) int local203 = local110.method7878(super.zFine + local190, local186 + super.xFine); @Pc(215) int local215 = local161 > local139 ? local139 : local161; @Pc(223) int local223 = local203 > local182 ? local182 : local203; @Pc(235) int local235 = local161 < local203 ? local161 : local203; @@ -192,7 +192,7 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { local94.method7134(0, local297, 0); } } - local94.method7134(super.anInt10690, super.anInt10691 - 10, super.anInt10694); + local94.method7134(super.xFine, super.anInt10691 - 10, super.zFine); @Pc(345) ParticleNode_Sub7 local345 = Static642.method8441(true, 3); this.anInt8879 = 0; this.aBoolean672 = false; diff --git a/client/src/main/java/PathingEntity.java b/client/src/main/java/PathingEntity.java index f6f0943..cca59fb 100644 --- a/client/src/main/java/PathingEntity.java +++ b/client/src/main/java/PathingEntity.java @@ -368,10 +368,10 @@ protected final void method9297(@OriginalArg(0) int arg0, @OriginalArg(1) int ar @Override public final void method9294() { @Pc(12) int local12 = (this.anInt10733 - 1 << 8) + 240; - super.aShort132 = (short) (super.anInt10694 - local12 >> 9); - super.aShort131 = (short) (super.anInt10690 - local12 >> 9); - super.aShort133 = (short) (super.anInt10694 + local12 >> 9); - super.aShort134 = (short) (super.anInt10690 + local12 >> 9); + super.aShort132 = (short) (super.zFine - local12 >> 9); + super.aShort131 = (short) (super.xFine - local12 >> 9); + super.aShort133 = (short) (super.zFine + local12 >> 9); + super.aShort134 = (short) (super.xFine + local12 >> 9); } @OriginalMember(owner = "client!cg", name = "a", descriptor = "(IIZ)V") @@ -394,7 +394,7 @@ public int method9299() { } else { local31 = -this.anInt10748; } - @Pc(55) Class291 local55 = Static334.aClass291ArrayArrayArray1[super.aByte144][super.anInt10690 >> Static52.anInt1066][super.anInt10694 >> Static52.anInt1066]; + @Pc(55) Class291 local55 = Static334.aClass291ArrayArrayArray1[super.plane][super.xFine >> Static52.anInt1066][super.zFine >> Static52.anInt1066]; return local55 == null || local55.aClass8_Sub2_Sub2_1 == null ? local31 : local31 + local55.aClass8_Sub2_Sub2_1.aShort46; } @@ -643,8 +643,8 @@ public final void method9309(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, if (local19 == arg5) { local38 = Static23.aSpotAnimTypeList1.method2694(arg5); if (local38.aBoolean448 && local38.anInt5842 != -1) { - @Pc(54) SeqType local54 = Static25.aSeqTypeList1.method1162(local38.anInt5842); - @Pc(57) int local57 = local54.anInt1646; + @Pc(54) SeqType local54 = Static25.aSeqTypeList1.get(local38.anInt5842); + @Pc(57) int local57 = local54.exactmove; if (local57 == 0) { return; } @@ -657,9 +657,9 @@ public final void method9309(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, local38 = Static23.aSpotAnimTypeList1.method2694(arg5); @Pc(86) SpotAnimType local86 = Static23.aSpotAnimTypeList1.method2694(local19); if (local38.anInt5842 != -1 && local86.anInt5842 != -1) { - @Pc(103) SeqType local103 = Static25.aSeqTypeList1.method1162(local38.anInt5842); - @Pc(109) SeqType local109 = Static25.aSeqTypeList1.method1162(local86.anInt5842); - if (local103.anInt1649 < local109.anInt1649) { + @Pc(103) SeqType local103 = Static25.aSeqTypeList1.get(local38.anInt5842); + @Pc(109) SeqType local109 = Static25.aSeqTypeList1.get(local86.anInt5842); + if (local103.priority < local109.priority) { return; } } @@ -708,22 +708,22 @@ protected final void method9314(@OriginalArg(0) int arg0, @OriginalArg(1) int ar @Pc(38) int local38 = -arg4 / 2; @Pc(48) int local48 = local24 * local38 + local33 * local28 >> 14; @Pc(59) int local59 = local38 * local28 - local33 * local24 >> 14; - @Pc(74) int local74 = Static323.method4626(local59 + super.anInt10694, super.aByte144, local11, local20, local48 + super.anInt10690); + @Pc(74) int local74 = Static323.method4626(local59 + super.zFine, super.plane, local11, local20, local48 + super.xFine); @Pc(78) int local78 = arg3 / 2; @Pc(83) int local83 = -arg4 / 2; @Pc(93) int local93 = local28 * local78 + local83 * local24 >> 14; @Pc(104) int local104 = local28 * local83 - local24 * local78 >> 14; - @Pc(119) int local119 = Static323.method4626(local104 + super.anInt10694, super.aByte144, local11, local20, local93 + super.anInt10690); + @Pc(119) int local119 = Static323.method4626(local104 + super.zFine, super.plane, local11, local20, local93 + super.xFine); @Pc(124) int local124 = -arg3 / 2; @Pc(128) int local128 = arg4 / 2; @Pc(138) int local138 = local24 * local128 + local124 * local28 >> 14; @Pc(149) int local149 = local128 * local28 - local124 * local24 >> 14; - @Pc(165) int local165 = Static323.method4626(local149 + super.anInt10694, super.aByte144, local11, local20, super.anInt10690 + local138); + @Pc(165) int local165 = Static323.method4626(local149 + super.zFine, super.plane, local11, local20, super.xFine + local138); @Pc(169) int local169 = arg3 / 2; @Pc(173) int local173 = arg4 / 2; @Pc(183) int local183 = local24 * local173 + local28 * local169 >> 14; @Pc(194) int local194 = local173 * local28 - local169 * local24 >> 14; - @Pc(210) int local210 = Static323.method4626(local194 + super.anInt10694, super.aByte144, local11, local20, super.anInt10690 + local183); + @Pc(210) int local210 = Static323.method4626(local194 + super.zFine, super.plane, local11, local20, super.xFine + local183); @Pc(218) int local218 = local74 < local119 ? local74 : local119; @Pc(226) int local226 = local210 > local165 ? local165 : local210; @Pc(234) int local234 = local119 >= local210 ? local210 : local119; @@ -841,7 +841,7 @@ protected final void method9319(@OriginalArg(0) Class19 arg0, @OriginalArg(2) bo } } if ((this.aClass8_Sub5_8 == null || this.aClass8_Sub5_8.aBoolean324) && (local17 > 0 || local21 > 0)) { - this.aClass8_Sub5_8 = Static257.method3654(Static333.anInt5455, true); + this.aClass8_Sub5_8 = Static257.method3654(Static333.loop, true); } if (this.aClass8_Sub5_8 != null) { @Pc(138) Class328[] local138; @@ -871,14 +871,14 @@ protected final void method9319(@OriginalArg(0) Class19 arg0, @OriginalArg(2) bo } } } - this.aClass8_Sub5_8.method3643(arg0, (long) Static333.anInt5455, local138, local191); + this.aClass8_Sub5_8.method3643(arg0, (long) Static333.loop, local138, local191); this.aBoolean820 = true; } } else if (this.aClass8_Sub5_8 != null) { - this.aClass8_Sub5_8.method3649((long) Static333.anInt5455); + this.aClass8_Sub5_8.method3649((long) Static333.loop); } if (this.aClass8_Sub5_8 != null) { - this.aClass8_Sub5_8.method3658(super.aByte144, super.aShort131, super.aShort134, super.aShort132, super.aShort133); + this.aClass8_Sub5_8.method3658(super.plane, super.aShort131, super.aShort134, super.aShort132, super.aShort133); } } diff --git a/client/src/main/java/PcmSound.java b/client/src/main/java/PcmSound.java index 1d61f53..a7a8559 100644 --- a/client/src/main/java/PcmSound.java +++ b/client/src/main/java/PcmSound.java @@ -40,12 +40,12 @@ public PcmSound(@OriginalArg(0) int arg0, @OriginalArg(1) byte[] arg1, @Original @OriginalMember(owner = "client!sq", name = "a", descriptor = "(Lclient!lg;)Lclient!sq;") public PcmSound method7821(@OriginalArg(0) Resampler arg0) { this.aByteArray98 = arg0.method5235(this.aByteArray98); - this.anInt8818 = arg0.method5234(this.anInt8818); + this.anInt8818 = arg0.scaleRate(this.anInt8818); if (this.anInt8819 == this.anInt8820) { - this.anInt8819 = this.anInt8820 = arg0.method5231(this.anInt8819); + this.anInt8819 = this.anInt8820 = arg0.scalePosition(this.anInt8819); } else { - this.anInt8819 = arg0.method5231(this.anInt8819); - this.anInt8820 = arg0.method5231(this.anInt8820); + this.anInt8819 = arg0.scalePosition(this.anInt8819); + this.anInt8820 = arg0.scalePosition(this.anInt8820); if (this.anInt8819 == this.anInt8820) { this.anInt8819--; } diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java index 043ffe6..496d661 100644 --- a/client/src/main/java/Player.java +++ b/client/src/main/java/Player.java @@ -13,7 +13,7 @@ public final class Player extends PathingEntity { public PlayerAppearance aPlayerAppearance1; @OriginalMember(owner = "client!ca", name = "xd", descriptor = "Ljava/lang/String;") - public String name2; + public String username; @OriginalMember(owner = "client!ca", name = "bd", descriptor = "I") public int anInt1441; @@ -110,7 +110,7 @@ public void method9289(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1) { } @Pc(24) Class73 local24 = arg0.method7985(); local24.method7131(super.aClass126_7.method2673(arg1 ^ 0xFFFFC004)); - local24.method7134(super.anInt10690, arg1 + super.anInt10691, super.anInt10694); + local24.method7134(super.xFine, arg1 + super.anInt10691, super.zFine); this.method9319(arg0, super.aBoolean820, super.aModelArray3, local24); for (@Pc(53) int local53 = 0; local53 < super.aModelArray3.length; local53++) { super.aModelArray3[local53] = null; @@ -158,7 +158,7 @@ public boolean method9279(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O @Pc(22) Class73 local22 = arg3.method7985(); @Pc(27) int local27 = super.aClass126_7.method2673(16383); local22.method7131(local27); - local22.method7134(super.anInt10690, super.anInt10691, super.anInt10694); + local22.method7134(super.xFine, super.anInt10691, super.zFine); @Pc(40) boolean local40 = arg2; for (@Pc(42) int local42 = 0; local42 < super.aModelArray3.length; local42++) { if (super.aModelArray3[local42] != null && (Static504.aBoolean579 ? super.aModelArray3[local42].method7483(arg1, arg0, local22, true, 0, Static582.anInt8627) : super.aModelArray3[local42].method7486(arg1, arg0, local22, true, 0))) { @@ -266,9 +266,9 @@ public void method1419(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { super.anInt10762 = 0; super.anIntArray878[0] = arg1; @Pc(26) int local26 = this.method9302((byte) 84); - super.anInt10690 = local26 * 256 + super.anIntArray879[0] * 512; - super.anInt10694 = super.anIntArray878[0] * 512 + local26 * 256; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 == this) { + super.xFine = local26 * 256 + super.anIntArray879[0] * 512; + super.zFine = super.anIntArray878[0] * 512 + local26 * 256; + if (Static556.self == this) { Static218.method3187(); } if (super.aClass8_Sub5_8 != null) { @@ -294,14 +294,14 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { @Pc(22) Class73 local22 = arg0.method7985(); @Pc(27) int local27 = super.aClass126_7.method2673(16383); local22.method7131(local27); - @Pc(53) Class291 local53 = Static334.aClass291ArrayArrayArray1[super.aByte144][super.anInt10690 >> Static52.anInt1066][super.anInt10694 >> Static52.anInt1066]; + @Pc(53) Class291 local53 = Static334.aClass291ArrayArrayArray1[super.plane][super.xFine >> Static52.anInt1066][super.zFine >> Static52.anInt1066]; if (local53 == null || local53.aClass8_Sub2_Sub2_1 == null) { super.anInt10732 = (int) ((float) super.anInt10732 - (float) super.anInt10732 / 10.0F); } else { @Pc(68) int local68 = super.anInt10732 - local53.aClass8_Sub2_Sub2_1.aShort46; super.anInt10732 = (int) ((float) super.anInt10732 - (float) local68 / 10.0F); } - local22.method7134(super.anInt10690, -super.anInt10732 + super.anInt10691 - 20, super.anInt10694); + local22.method7134(super.xFine, -super.anInt10732 + super.anInt10691 - 20, super.zFine); super.aBoolean819 = false; @Pc(114) ParticleNode_Sub7 local114 = null; if (Static400.aClass2_Sub34_28.aPreference_Sub7_1.method2905() == 1) { @@ -324,7 +324,7 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { } } @Pc(269) int local269; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 == this) { + if (Static556.self == this) { for (local269 = Static527.aClass254Array1.length - 1; local269 >= 0; local269--) { @Pc(275) Class254 local275 = Static527.aClass254Array1[local269]; if (local275 != null && local275.anInt6371 != -1) { @@ -333,8 +333,8 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { @Pc(298) Linkable_Sub45 local298 = (Linkable_Sub45) Static18.aHashTable2.get((long) local275.anInt6366); if (local298 != null) { @Pc(303) Npc local303 = local298.aClass8_Sub2_Sub1_Sub2_Sub2_2; - local310 = local303.anInt10690 - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690; - @Pc(316) int local316 = local303.anInt10694 - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694; + local310 = local303.xFine - Static556.self.xFine; + @Pc(316) int local316 = local303.zFine - Static556.self.zFine; if (Static504.aBoolean579) { this.method1416(super.aModelArray3[0], 92160000, arg0, local275.anInt6371, local310, local22, Static582.anInt8627, local316); } else { @@ -344,8 +344,8 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { } @Pc(371) int local371; if (local275.anInt6363 == 2) { - @Pc(364) int local364 = local275.anInt6369 - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690; - local371 = local275.anInt6362 - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694; + @Pc(364) int local364 = local275.anInt6369 - Static556.self.xFine; + local371 = local275.anInt6362 - Static556.self.zFine; local310 = local275.anInt6364 << 9; local310 *= local310; if (Static504.aBoolean579) { @@ -357,8 +357,8 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { if (local275.anInt6363 == 10 && local275.anInt6366 >= 0 && local275.anInt6366 < Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3.length) { @Pc(438) Player local438 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local275.anInt6366]; if (local438 != null) { - local371 = local438.anInt10690 - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690; - local310 = local438.anInt10694 - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694; + local371 = local438.xFine - Static556.self.xFine; + local310 = local438.zFine - Static556.self.zFine; if (Static504.aBoolean579) { this.method1416(super.aModelArray3[0], 92160000, arg0, local275.anInt6371, local371, local22, Static582.anInt8627, local310); } else { @@ -369,10 +369,10 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { } } local22.method7131(local27); - local22.method7134(super.anInt10690, super.anInt10691, super.anInt10694); + local22.method7134(super.xFine, super.anInt10691, super.zFine); } local22.method7131(local27); - local22.method7134(super.anInt10690, -super.anInt10732 + super.anInt10691 - 5, super.anInt10694); + local22.method7134(super.xFine, -super.anInt10732 + super.anInt10691 - 5, super.zFine); if (local114 == null) { local114 = Static642.method8441(true, super.aModelArray3.length); } @@ -380,13 +380,13 @@ public ParticleNode_Sub7 method9276(@OriginalArg(1) Class19 arg0) { if (Static504.aBoolean579) { for (local269 = 0; local269 < super.aModelArray3.length; local269++) { if (super.aModelArray3[local269] != null) { - super.aModelArray3[local269].method7484(local22, local114.aClass8_Sub6Array1[local269], Static582.anInt8627, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 == this ? 1 : 0); + super.aModelArray3[local269].method7484(local22, local114.aClass8_Sub6Array1[local269], Static582.anInt8627, Static556.self == this ? 1 : 0); } } } else { for (local269 = 0; local269 < super.aModelArray3.length; local269++) { if (super.aModelArray3[local269] != null) { - super.aModelArray3[local269].method7473(local22, local114.aClass8_Sub6Array1[local269], Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 == this ? 1 : 0); + super.aModelArray3[local269].method7473(local22, local114.aClass8_Sub6Array1[local269], Static556.self == this ? 1 : 0); } } } @@ -419,13 +419,13 @@ public void method1420(@OriginalArg(0) Packet arg0) { @Pc(44) int local44 = super.method9302((byte) 85); this.method9310((local12 >> 3 & 0x7) + 1); this.aByte31 = (byte) (local12 >> 6 & 0x3); - super.anInt10690 += this.method9302((byte) 44) - local44 << 8; - super.anInt10694 += this.method9302((byte) 111) - local44 << 8; + super.xFine += this.method9302((byte) 44) - local44 << 8; + super.zFine += this.method9302((byte) 111) - local44 << 8; this.aByte33 = arg0.g1b(); this.anInt1430 = arg0.g1b(); this.anInt1431 = arg0.g1b(); this.aBoolean124 = arg0.g1b() == 1; - if (ModeWhere.LIVE == Static2.aModeWhere1 && Static608.anInt9290 >= 2) { + if (ModeWhere.LIVE == Static2.aModeWhere1 && Static608.staffModLevel >= 2) { this.aBoolean124 = false; } this.anInt1433 = 0; @@ -486,10 +486,10 @@ public void method1420(@OriginalArg(0) Packet arg0) { } this.anInt1443 = arg0.g2(); this.name1 = arg0.gjstr(); - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 == this) { + if (Static556.self == this) { Static515.aString96 = this.name1; } - this.name2 = this.name1; + this.username = this.name1; this.combatLevel2 = arg0.g1(); if (local40) { this.anInt1436 = arg0.g2(); @@ -533,8 +533,8 @@ public void method1420(@OriginalArg(0) Packet arg0) { @Pc(603) int[] local603 = this.aPlayerAppearance1.anIntArray380; this.aPlayerAppearance1.method4545(local332, local139, local144, local134, this.method9320(0), this.aByte32 == 1); if (local134 != local240) { - super.anInt10690 = (super.anIntArray879[0] << 9) + (this.method9302((byte) 83) << 8); - super.anInt10694 = (super.anIntArray878[0] << 9) + (this.method9302((byte) 45) << 8); + super.xFine = (super.anIntArray879[0] << 9) + (this.method9302((byte) 83) << 8); + super.zFine = (super.anIntArray878[0] << 9) + (this.method9302((byte) 45) << 8); } if (Static312.anInt5000 == super.anInt10740 && local603 != null) { for (local490 = 0; local490 < local332.length; local490++) { @@ -570,7 +570,7 @@ private boolean method1421(@OriginalArg(0) int arg0, @OriginalArg(2) Class19 arg arg0 |= 0x7; } @Pc(95) int local95 = super.aClass126_7.method2673(16383); - @Pc(119) boolean local119 = super.aByte149 != 0 && Static333.anInt5455 >= super.anInt10760 && Static333.anInt5455 < super.anInt10752; + @Pc(119) boolean local119 = super.aByte149 != 0 && Static333.loop >= super.anInt10760 && Static333.loop < super.anInt10752; if (local119) { arg0 |= 0x80000; } @@ -630,7 +630,7 @@ public boolean method9311() { @OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)Ljava/lang/String;") public String method1422() { - return this.name2; + return this.username; } @OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZZ)Ljava/lang/String;") @@ -649,9 +649,9 @@ public String method1424(@OriginalArg(0) boolean arg0) { local40 = Static406.anIntArray484; } if (local40 != null && local40[this.aByte31] != -1) { - @Pc(62) EnumType local62 = Static619.aEnumTypeList2.method8925(local40[this.aByte31]); - if (local62.aChar1 == 's') { - local5 = local5 + local62.method1229(this.aByte33 & 0xFF); + @Pc(62) EnumType local62 = Static619.aEnumTypeList2.get(local40[this.aByte31]); + if (local62.valueType == 's') { + local5 = local5 + local62.getString(this.aByte33 & 0xFF); } else { Static240.method3496(new Throwable(), "gdn1"); local40[this.aByte31] = -1; @@ -674,7 +674,7 @@ public Class80 method9318(@OriginalArg(0) int arg0) { if (super.aClass80_3.aString20 == null) { return null; } - if (Static133.anInt2458 == 0 || Static133.anInt2458 == 3 || Static133.anInt2458 == 1 && Static362.method5241(arg0 + 3109, this.name2)) { + if (Static133.anInt2458 == 0 || Static133.anInt2458 == 3 || Static133.anInt2458 == 1 && Static362.method5241(arg0 + 3109, this.username)) { return super.aClass80_3; } } @@ -683,14 +683,14 @@ public Class80 method9318(@OriginalArg(0) int arg0) { @OriginalMember(owner = "client!ca", name = "b", descriptor = "(IIIB)V") public void method1425(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) byte arg2) { - if (super.aClass152_11.method9109() && super.aClass152_11.method9107().anInt1654 == 1) { + if (super.aClass152_11.method9109() && super.aClass152_11.method9107().movetype == 1) { super.anIntArray869 = null; super.aClass152_11.method9113(true, -1); } for (@Pc(33) int local33 = 0; local33 < super.aClass199Array3.length; local33++) { if (super.aClass199Array3[local33].anInt4930 != -1) { @Pc(56) SpotAnimType local56 = Static23.aSpotAnimTypeList1.method2694(super.aClass199Array3[local33].anInt4930); - if (local56.aBoolean448 && local56.anInt5842 != -1 && Static25.aSeqTypeList1.method1162(local56.anInt5842).anInt1654 == 1) { + if (local56.aBoolean448 && local56.anInt5842 != -1 && Static25.aSeqTypeList1.get(local56.anInt5842).movetype == 1) { super.aClass199Array3[local33].aClass152_7.method9113(true, -1); super.aClass199Array3[local33].anInt4930 = -1; } diff --git a/client/src/main/java/PlayerAppearance.java b/client/src/main/java/PlayerAppearance.java index 19290ae..7b488ce 100644 --- a/client/src/main/java/PlayerAppearance.java +++ b/client/src/main/java/PlayerAppearance.java @@ -16,7 +16,7 @@ public final class PlayerAppearance { private Class52[] aClass52Array1; @OriginalMember(owner = "client!ju", name = "m", descriptor = "Z") - public boolean aBoolean385; + public boolean gender; @OriginalMember(owner = "client!ju", name = "o", descriptor = "[I") private int[] anIntArray381; @@ -48,7 +48,7 @@ private void method4543() { if (this.aClass52Array1[local156] != null) { @Pc(179) int[] local179; @Pc(173) int[] local173; - if (this.aBoolean385) { + if (this.gender) { local173 = this.aClass52Array1[local156].anIntArray100; local179 = this.aClass52Array1[local156].anIntArray99; } else { @@ -86,14 +86,14 @@ private void method4543() { for (local156 = 0; local156 < 10; local156++) { this.aLong160 = this.aLong160 >>> 8 ^ local5[(int) (((long) this.anIntArray380[local156] ^ this.aLong160) & 0xFFL)]; } - this.aLong160 = local5[(int) (((long) (this.aBoolean385 ? 1 : 0) ^ this.aLong160) & 0xFFL)] ^ this.aLong160 >>> 8; + this.aLong160 = local5[(int) (((long) (this.gender ? 1 : 0) ^ this.aLong160) & 0xFFL)] ^ this.aLong160 >>> 8; } @OriginalMember(owner = "client!ju", name = "a", descriptor = "([I[I[Lclient!bs;IIZB)V") public void method4545(@OriginalArg(0) int[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) Class52[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5) { this.aClass52Array1 = arg2; this.anIntArray380 = arg0; - this.aBoolean385 = arg5; + this.gender = arg5; if (this.anInt5007 != arg4) { this.anInt5007 = arg4; } @@ -116,20 +116,20 @@ public Model method4546(@OriginalArg(0) ObjTypeList arg0, @OriginalArg(1) Class1 @Pc(116) int local116; if (arg1 != null) { @Pc(50) SeqType local50 = arg1.method9107(); - if (local50 != null && (local50.anInt1652 >= 0 || local50.anInt1651 >= 0)) { + if (local50 != null && (local50.mainhand >= 0 || local50.offhand >= 0)) { local34 = new int[this.anIntArray381.length]; for (local72 = 0; local72 < local34.length; local72++) { local34[local72] = this.anIntArray381[local72]; } - if (local50.anInt1652 >= 0 && arg6.anInt10301 != -1) { - if (local50.anInt1652 == 65535) { + if (local50.mainhand >= 0 && arg6.anInt10301 != -1) { + if (local50.mainhand == 65535) { local34[arg6.anInt10301] = 0; for (local116 = 0; local116 < arg6.anIntArray818.length; local116++) { local34[arg6.anIntArray818[local116]] = 0; } local31 ^= 0xFFFFFFFF00000000L; } else { - local34[arg6.anInt10301] = local50.anInt1652 | 0x40000000; + local34[arg6.anInt10301] = local50.mainhand | 0x40000000; for (local116 = 0; local116 < arg6.anIntArray818.length; local116++) { local34[arg6.anIntArray818[local116]] = 0; } @@ -137,16 +137,16 @@ public Model method4546(@OriginalArg(0) ObjTypeList arg0, @OriginalArg(1) Class1 } local36 = true; } - if (local50.anInt1651 >= 0 && arg6.anInt10300 != -1) { + if (local50.offhand >= 0 && arg6.anInt10300 != -1) { local44 = true; - if (local50.anInt1651 == 65535) { + if (local50.offhand == 65535) { local34[arg6.anInt10300] = 0; for (local116 = 0; local116 < arg6.anIntArray820.length; local116++) { local34[arg6.anIntArray820[local116]] = 0; } local31 ^= 0xFFFFFFFFL; } else { - local34[arg6.anInt10300] = local50.anInt1651 | 0x40000000; + local34[arg6.anInt10300] = local50.offhand | 0x40000000; for (local116 = 0; local116 < arg6.anIntArray820.length; local116++) { local34[arg6.anIntArray820[local116]] = 0; } @@ -223,7 +223,7 @@ public Model method4546(@OriginalArg(0) ObjTypeList arg0, @OriginalArg(1) Class1 if (!local614 && this.aClass52Array1 != null && this.aClass52Array1[local586] != null) { local593 = this.aClass52Array1[local586]; } - local633 = arg0.method2486(local591 & 0x3FFFFFFF).method8799(local593, this.aBoolean385); + local633 = arg0.method2486(local591 & 0x3FFFFFFF).method8799(local593, this.gender); if (local633 != null) { local584[local586] = local633; } @@ -311,7 +311,7 @@ public Model method4546(@OriginalArg(0) ObjTypeList arg0, @OriginalArg(1) Class1 if (!local399 && this.aClass52Array1 != null && this.aClass52Array1[local390] != null) { local397 = this.aClass52Array1[local390]; } - if (!arg0.method2486(local395 & 0x3FFFFFFF).method8802(this.aBoolean385, local397)) { + if (!arg0.method2486(local395 & 0x3FFFFFFF).method8802(this.gender, local397)) { local388 = true; } } else if ((Integer.MIN_VALUE & local395) != 0 && !arg7.method5042(local395 & 0x3FFFFFFF).method6616()) { @@ -373,13 +373,13 @@ public Model method4546(@OriginalArg(0) ObjTypeList arg0, @OriginalArg(1) Class1 } @OriginalMember(owner = "client!ju", name = "a", descriptor = "(IZ)V") - public void method4547(@OriginalArg(1) boolean arg0) { - this.aBoolean385 = arg0; + public void setGender(@OriginalArg(1) boolean arg0) { + this.gender = arg0; this.method4543(); } @OriginalMember(owner = "client!ju", name = "a", descriptor = "(IBLclient!kr;I)V") - public void method4548(@OriginalArg(0) int arg0, @OriginalArg(2) IdkTypeList arg1, @OriginalArg(3) int arg2) { + public void setIdentikit(@OriginalArg(0) int arg0, @OriginalArg(2) IdkTypeList arg1, @OriginalArg(3) int arg2) { @Pc(7) int local7 = Static264.anIntArray891[arg2]; if (arg1.method5042(arg0) != null) { this.anIntArray381[local7] = Integer.MIN_VALUE | arg0; @@ -388,7 +388,7 @@ public void method4548(@OriginalArg(0) int arg0, @OriginalArg(2) IdkTypeList arg } @OriginalMember(owner = "client!ju", name = "a", descriptor = "(IIB)V") - public void method4549(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + public void setColor(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { this.anIntArray380[arg0] = arg1; this.method4543(); } @@ -482,7 +482,7 @@ public Model method4552(@OriginalArg(0) IdkTypeList arg0, @OriginalArg(2) SeqTyp if (this.aClass52Array1 != null && this.aClass52Array1[local83] != null) { local94 = this.aClass52Array1[local83]; } - if (!arg4.method2486(local92 & 0x3FFFFFFF).method8808(local94, this.aBoolean385)) { + if (!arg4.method2486(local92 & 0x3FFFFFFF).method8808(local94, this.gender)) { local81 = true; } } else if ((Integer.MIN_VALUE & local92) != 0 && !arg0.method5042(local92 & 0x3FFFFFFF).method6615()) { @@ -502,7 +502,7 @@ public Model method4552(@OriginalArg(0) IdkTypeList arg0, @OriginalArg(2) SeqTyp if (this.aClass52Array1 != null && this.aClass52Array1[local176] != null) { local187 = this.aClass52Array1[local176]; } - local220 = arg4.method2486(local185 & 0x3FFFFFFF).method8801(this.aBoolean385, local187); + local220 = arg4.method2486(local185 & 0x3FFFFFFF).method8801(this.gender, local187); if (local220 != null) { local172[local174++] = local220; } diff --git a/client/src/main/java/Preferences.java b/client/src/main/java/Preferences.java index 705fe66..bb6d4e7 100644 --- a/client/src/main/java/Preferences.java +++ b/client/src/main/java/Preferences.java @@ -374,7 +374,7 @@ static Class getClass(String name) { } @OriginalMember(owner = "client!kv", name = "d", descriptor = "(I)Lclient!ge;") - public Packet method5110() { + public Packet encode() { @Pc(9) Packet local9 = new Packet(Static368.method5269()); local9.p1(25); local9.p1(this.aPreference_Sub13_2.method4373()); diff --git a/client/src/main/java/PrivilegedRequest.java b/client/src/main/java/PrivilegedRequest.java index 11aba44..abef88c 100644 --- a/client/src/main/java/PrivilegedRequest.java +++ b/client/src/main/java/PrivilegedRequest.java @@ -5,22 +5,22 @@ public final class PrivilegedRequest { @OriginalMember(owner = "client!oba", name = "a", descriptor = "I") - public int anInt6787; + public int intArg1; @OriginalMember(owner = "client!oba", name = "b", descriptor = "I") - public int anInt6788; + public int intArg2; @OriginalMember(owner = "client!oba", name = "e", descriptor = "Ljava/lang/Object;") - public Object anObject12; + public Object objectArg; @OriginalMember(owner = "client!oba", name = "c", descriptor = "Lclient!oba;") - public PrivilegedRequest aPrivilegedRequest5; + public PrivilegedRequest next; @OriginalMember(owner = "client!oba", name = "f", descriptor = "Ljava/lang/Object;") - public volatile Object anObject13; + public volatile Object result; @OriginalMember(owner = "client!oba", name = "d", descriptor = "I") - public int anInt6790; + public int type; @OriginalMember(owner = "client!oba", name = "g", descriptor = "I") public volatile int state = 0; diff --git a/client/src/main/java/ProjAnimEntity.java b/client/src/main/java/ProjAnimEntity.java index cdcc2f3..4eccd21 100644 --- a/client/src/main/java/ProjAnimEntity.java +++ b/client/src/main/java/ProjAnimEntity.java @@ -120,13 +120,13 @@ public int method9286(@OriginalArg(0) int arg0) { public void method813(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { @Pc(9) double local9; if (!this.aBoolean59) { - local9 = (double) (arg3 - super.anInt10690); - @Pc(16) double local16 = (double) (arg2 - super.anInt10694); + local9 = (double) (arg3 - super.xFine); + @Pc(16) double local16 = (double) (arg2 - super.zFine); @Pc(25) double local25 = Math.sqrt(local16 * local16 + local9 * local9); - this.aDouble4 = (double) this.anInt709 * local16 / local25 + (double) super.anInt10694; - this.aDouble8 = (double) super.anInt10690 + local9 * (double) this.anInt709 / local25; + this.aDouble4 = (double) this.anInt709 * local16 / local25 + (double) super.zFine; + this.aDouble8 = (double) super.xFine + local9 * (double) this.anInt709 / local25; if (this.aBoolean57) { - this.aDouble5 = (double) (Static102.method2025(super.aByte144, -29754, (int) this.aDouble4, (int) this.aDouble8) - this.anInt721); + this.aDouble5 = (double) (Static102.method2025(super.plane, -29754, (int) this.aDouble4, (int) this.aDouble8) - this.anInt721); } else { this.aDouble5 = (double) super.anInt10691; } @@ -210,7 +210,7 @@ public void method816() { if (this.anInt706 < 0) { local35 = -this.anInt706 - 1; if (Static312.anInt5000 == local35) { - local21 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2; + local21 = Static556.self; } else { local21 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local35]; } @@ -225,9 +225,9 @@ public void method816() { if (local21 == null) { return; } - super.anInt10694 = local21.anInt10694; - super.anInt10690 = local21.anInt10690; - super.anInt10691 = Static102.method2025(super.aByte144, -29754, local21.anInt10694, local21.anInt10690) - this.anInt721; + super.zFine = local21.zFine; + super.xFine = local21.xFine; + super.anInt10691 = Static102.method2025(super.plane, -29754, local21.zFine, local21.xFine) - this.anInt721; if (this.anInt695 < 0) { return; } @@ -253,8 +253,8 @@ public void method816() { @Pc(221) int local221 = Model.anIntArray740[local213]; @Pc(232) int local232 = local217 * local109 + local221 * local107 >> 14; local109 = local109 * local221 - local217 * local107 >> 14; - super.anInt10694 += local109; - super.anInt10690 += local232; + super.zFine += local109; + super.xFine += local232; } return; } @@ -277,11 +277,11 @@ private void method817(@OriginalArg(1) Class19 arg0, @OriginalArg(2) Class73 arg @Pc(9) Class328[] local9 = arg2.method7482(); @Pc(12) Class249[] local12 = arg2.method7480(); if ((this.aClass8_Sub5_1 == null || this.aClass8_Sub5_1.aBoolean324) && (local9 != null || local12 != null)) { - this.aClass8_Sub5_1 = Static257.method3654(Static333.anInt5455, true); + this.aClass8_Sub5_1 = Static257.method3654(Static333.loop, true); } if (this.aClass8_Sub5_1 != null) { - this.aClass8_Sub5_1.method3643(arg0, (long) Static333.anInt5455, local9, local12); - this.aClass8_Sub5_1.method3658(super.aByte144, super.aShort131, super.aShort134, super.aShort132, super.aShort133); + this.aClass8_Sub5_1.method3643(arg0, (long) Static333.loop, local9, local12); + this.aClass8_Sub5_1.method3658(super.plane, super.aShort131, super.aShort134, super.aShort132, super.aShort133); } } @@ -365,7 +365,7 @@ public void method819(@OriginalArg(1) int arg0) { this.aBoolean59 = true; this.aDouble4 += (double) arg0 * this.aDouble2; if (this.aBoolean57) { - this.aDouble5 = (double) (Static102.method2025(super.aByte144, -29754, (int) this.aDouble4, (int) this.aDouble8) - this.anInt721); + this.aDouble5 = (double) (Static102.method2025(super.plane, -29754, (int) this.aDouble4, (int) this.aDouble8) - this.anInt721); } else if (this.anInt705 == -1) { this.aDouble5 += this.aDouble1 * (double) arg0; } else { diff --git a/client/src/main/java/Protocol.java b/client/src/main/java/Protocol.java index 776c022..424833f 100644 --- a/client/src/main/java/Protocol.java +++ b/client/src/main/java/Protocol.java @@ -76,12 +76,12 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep if (ServerProt.IF_CLOSE_SUB == arg0.packetType) { local277 = local11.g4_alt1(); Static574.method7573(); - @Pc(287) SubInterface local287 = (SubInterface) Static548.aHashTable40.get((long) local277); + @Pc(287) SubInterface local287 = (SubInterface) Static548.openInterfaces.get((long) local277); if (local287 != null) { Static449.method6115(false, true, local287); } if (Static390.aComponent9 != null) { - Static178.method2729(Static390.aComponent9); + Static178.redraw(Static390.aComponent9); Static390.aComponent9 = null; } arg0.packetType = null; @@ -369,7 +369,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local1427 = local11.gjstr(); local1429 = local11.g1() == 1; } - for (local1449 = 0; local1449 < Static327.anInt5392; local1449++) { + for (local1449 = 0; local1449 < Static327.size; local1449++) { if (local446) { if (local629.equals(Static330.aStringArray25[local1449])) { Static330.aStringArray25[local1449] = local627; @@ -378,7 +378,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep break; } } else if (local627.equals(Static330.aStringArray25[local1449])) { - if (Static371.anIntArray455[local1449] != local1409) { + if (Static371.worlds[local1449] != local1409) { local1491 = true; for (@Pc(1496) SecondaryParticleNode_Sub1 local1496 = (SecondaryParticleNode_Sub1) Static168.aParticleLinkedList5.method2790(); local1496 != null; local1496 = (SecondaryParticleNode_Sub1) Static168.aParticleLinkedList5.method2785()) { if (local1496.aString72.equals(local627)) { @@ -394,61 +394,61 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep if (local1491) { Static168.aParticleLinkedList5.method2787(new SecondaryParticleNode_Sub1(local627, local1409)); } - Static371.anIntArray455[local1449] = local1409; + Static371.worlds[local1449] = local1409; } Static572.aStringArray42[local1449] = local629; - Static419.aStringArray33[local1449] = local1427; - Static715.anIntArray881[local1449] = local1413; + Static419.worldNames[local1449] = local1427; + Static715.ranks[local1449] = local1413; Static623.aBooleanArray30[local1449] = local1429; local627 = null; Static429.aBooleanArray21[local1449] = local1425; break; } } - if (local627 != null && Static327.anInt5392 < 200) { - Static330.aStringArray25[Static327.anInt5392] = local627; - Static572.aStringArray42[Static327.anInt5392] = local629; - Static371.anIntArray455[Static327.anInt5392] = local1409; - Static419.aStringArray33[Static327.anInt5392] = local1427; - Static715.anIntArray881[Static327.anInt5392] = local1413; - Static623.aBooleanArray30[Static327.anInt5392] = local1429; - Static429.aBooleanArray21[Static327.anInt5392] = local1425; - Static327.anInt5392++; + if (local627 != null && Static327.size < 200) { + Static330.aStringArray25[Static327.size] = local627; + Static572.aStringArray42[Static327.size] = local629; + Static371.worlds[Static327.size] = local1409; + Static419.worldNames[Static327.size] = local1427; + Static715.ranks[Static327.size] = local1413; + Static623.aBooleanArray30[Static327.size] = local1429; + Static429.aBooleanArray21[Static327.size] = local1425; + Static327.size++; } } Static344.anInt5621 = Static642.anInt9599; - Static251.anInt4036 = 2; - local100 = Static327.anInt5392; + Static251.state = 2; + local100 = Static327.size; while (local100 > 0) { local446 = true; local100--; for (local526 = 0; local526 < local100; local526++) { @Pc(1665) boolean local1665 = false; - if (Static344.aClass229_1.worldId != Static371.anIntArray455[local526] && Static344.aClass229_1.worldId == Static371.anIntArray455[local526 + 1]) { + if (Static344.aClass229_1.worldId != Static371.worlds[local526] && Static344.aClass229_1.worldId == Static371.worlds[local526 + 1]) { local1665 = true; } - if (!local1665 && Static371.anIntArray455[local526] == 0 && Static371.anIntArray455[local526 + 1] != 0) { + if (!local1665 && Static371.worlds[local526] == 0 && Static371.worlds[local526 + 1] != 0) { local1665 = true; } if (!local1665 && !Static429.aBooleanArray21[local526] && Static429.aBooleanArray21[local526 + 1]) { local1665 = true; } if (local1665) { - local1413 = Static371.anIntArray455[local526]; - Static371.anIntArray455[local526] = Static371.anIntArray455[local526 + 1]; - Static371.anIntArray455[local526 + 1] = local1413; - local1750 = Static419.aStringArray33[local526]; - Static419.aStringArray33[local526] = Static419.aStringArray33[local526 + 1]; - Static419.aStringArray33[local526 + 1] = local1750; + local1413 = Static371.worlds[local526]; + Static371.worlds[local526] = Static371.worlds[local526 + 1]; + Static371.worlds[local526 + 1] = local1413; + local1750 = Static419.worldNames[local526]; + Static419.worldNames[local526] = Static419.worldNames[local526 + 1]; + Static419.worldNames[local526 + 1] = local1750; local1427 = Static330.aStringArray25[local526]; Static330.aStringArray25[local526] = Static330.aStringArray25[local526 + 1]; Static330.aStringArray25[local526 + 1] = local1427; @Pc(1786) String local1786 = Static572.aStringArray42[local526]; Static572.aStringArray42[local526] = Static572.aStringArray42[local526 + 1]; Static572.aStringArray42[local526 + 1] = local1786; - local1449 = Static715.anIntArray881[local526]; - Static715.anIntArray881[local526] = Static715.anIntArray881[local526 + 1]; - Static715.anIntArray881[local526 + 1] = local1449; + local1449 = Static715.ranks[local526]; + Static715.ranks[local526] = Static715.ranks[local526 + 1]; + Static715.ranks[local526 + 1] = local1449; local1491 = Static623.aBooleanArray30[local526]; Static623.aBooleanArray30[local526] = Static623.aBooleanArray30[local526 + 1]; Static623.aBooleanArray30[local526 + 1] = local1491; @@ -536,7 +536,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep return true; } else if (ServerProt.OPCODE_129 == arg0.packetType) { local277 = local11.g4(); - Static439.aPrivilegedRequest4 = Static446.aSignlink6.method8982(local277); + Static439.aPrivilegedRequest4 = Static446.aSignlink6.getReverseDns(local277); arg0.packetType = null; return true; } else if (ServerProt.VARC_LARGE == arg0.packetType) { @@ -613,7 +613,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep arg0.packetType = null; return true; } else if (arg0.packetType == ServerProt.UPDATE_RUN_WEIGHT) { - Static494.anInt7404 = local11.g2s(); + Static494.weight = local11.g2s(); arg0.packetType = null; Static321.anInt5111 = Static642.anInt9599; return true; @@ -624,10 +624,10 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep if (local100 == 2) { Static322.method9441(); } - Static377.anInt5930 = local277; + Static377.topLevelInterface = local277; Static122.method2208(local277); Static640.method8435(false); - Static472.method6414(Static377.anInt5930); + Static472.method6414(Static377.topLevelInterface); for (local526 = 0; local526 < 100; local526++) { Static364.aBooleanArray18[local526] = true; } @@ -652,9 +652,9 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep return true; } else if (arg0.packetType == ServerProt.UPDATE_REBOOT_TIMER) { if (Static620.isInLobby(Static283.gameState)) { - Static249.anInt4008 = (int) ((float) local11.g2() * 2.5F); + Static249.rebootTimer = (int) ((float) local11.g2() * 2.5F); } else { - Static249.anInt4008 = local11.g2() * 30; + Static249.rebootTimer = local11.g2() * 30; } arg0.packetType = null; Static321.anInt5111 = Static642.anInt9599; @@ -701,13 +701,13 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep } else { local100 = local277 >> 14 & 0x3FFF; local526 = local277 & 0x3FFF; - local100 -= Static691.anInt10367; + local100 -= Static691.originX; if (local100 < 0) { local100 = 0; } else if (Static720.anInt10859 <= local100) { local100 = Static720.anInt10859; } - local526 -= Static116.anInt2270; + local526 -= Static116.originZ; Static692.anInt10376 = (local100 << 9) + 256; if (local526 < 0) { local526 = 0; @@ -814,13 +814,13 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local277 = local11.g1_alt3(); local100 = local11.g1_alt1(); local526 = local11.g4_alt1(); - Static237.anIntArray518[local100] = local526; - Static581.anIntArray688[local100] = local277; - Static498.anIntArray604[local100] = 1; + Static237.experience[local100] = local526; + Static581.boostedLevels[local100] = local277; + Static498.baseLevels[local100] = 1; local1409 = Static245.anIntArray773[local100] - 1; for (local1413 = 0; local1413 < local1409; local1413++) { if (Static293.anIntArray34[local1413] <= local526) { - Static498.anIntArray604[local100] = local1413 + 2; + Static498.baseLevels[local100] = local1413 + 2; } } Static395.anIntArray833[Static366.anInt5858++ & 0x1F] = local100; @@ -863,7 +863,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep } } if (local992 <= 1) { - if (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.aBoolean724) { + if (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.mapQuickChat) { local1491 = true; } else if (Static71.method1524(local627)) { local1491 = true; @@ -926,8 +926,8 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep } local3721.anInt6363 = 2; local3721.anInt6368 = local11.g1(); - local3721.anInt6369 += local11.g2() - Static691.anInt10367 << 9; - local3721.anInt6362 += local11.g2() - Static116.anInt2270 << 9; + local3721.anInt6369 += local11.g2() - Static691.originX << 9; + local3721.anInt6362 += local11.g2() - Static116.originZ << 9; local3721.anInt6365 = local11.g1() << 2; local3721.anInt6364 = local11.g2(); } @@ -962,7 +962,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep Static574.method7573(); Static301.method4394(local526, local100, local277); @Pc(4005) ObjType local4005 = ObjTypeList.objTypes.method2486(local277); - Static231.method3378(local4005.anInt10107, local4005.anInt10098, local526, local4005.anInt10096); + Static231.method3378(local4005.xAngle2D, local4005.zoom2d, local526, local4005.yAngle2D); Static528.method7087(local4005.anInt10094, local526, local4005.anInt10099, local4005.anInt10126); arg0.packetType = null; return true; @@ -1060,8 +1060,8 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep arg0.packetType = null; return true; } else if (ServerProt.OPCODE_57 == arg0.packetType) { - Static436.anInt3849 = local11.g1(); - for (local277 = 0; local277 < Static436.anInt3849; local277++) { + Static436.size = local11.g1(); + for (local277 = 0; local277 < Static436.size; local277++) { Static632.aStringArray44[local277] = local11.gjstr(); Static446.aStringArray35[local277] = local11.gjstr(); if (Static446.aStringArray35[local277].equals("")) { @@ -1118,10 +1118,10 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local644 = (long) local1413 + ((long) local100 << 32); local4597 = (ServerActiveProperties) Static291.aHashTable24.get(local644); if (local4597 != null) { - local4611 = new ServerActiveProperties(local4597.anInt6909, local1409); + local4611 = new ServerActiveProperties(local4597.events, local1409); local4597.unlink(); } else if (local1413 == -1) { - local4611 = new ServerActiveProperties(Static145.method2412(local100).aClass2_Sub41_2.anInt6909, local1409); + local4611 = new ServerActiveProperties(Static145.getComponent(local100).aClass2_Sub41_2.events, local1409); } else { local4611 = new ServerActiveProperties(0, local1409); } @@ -1191,8 +1191,8 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep if (local667 == local2098) { local4888 = Static23.aSpotAnimTypeList1.method2694(local2098); if (local4888.aBoolean448 && local4888.anInt5842 != -1) { - local4905 = Static25.aSeqTypeList1.method1162(local4888.anInt5842); - @Pc(5134) int local5134 = local4905.anInt1646; + local4905 = Static25.aSeqTypeList1.get(local4888.anInt5842); + @Pc(5134) int local5134 = local4905.exactmove; if (local5134 == 0 || local5134 == 2) { local665 = false; } else if (local5134 == 1) { @@ -1203,9 +1203,9 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local4888 = Static23.aSpotAnimTypeList1.method2694(local2098); @Pc(5078) SpotAnimType local5078 = Static23.aSpotAnimTypeList1.method2694(local667); if (local4888.anInt5842 != -1 && local5078.anInt5842 != -1) { - local4911 = Static25.aSeqTypeList1.method1162(local4888.anInt5842); - @Pc(5102) SeqType local5102 = Static25.aSeqTypeList1.method1162(local5078.anInt5842); - if (local4911.anInt1649 < local5102.anInt1649) { + local4911 = Static25.aSeqTypeList1.get(local4888.anInt5842); + @Pc(5102) SeqType local5102 = Static25.aSeqTypeList1.get(local5078.anInt5842); + if (local4911.priority < local5102.priority) { local665 = false; } } @@ -1231,7 +1231,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep playerPrivilege = local100 & 0xFFFF; @Pc(4839) Player local4839; if (playerPrivilege == Static312.anInt5000) { - local4839 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2; + local4839 = Static556.self; } else { local4839 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[playerPrivilege]; } @@ -1247,8 +1247,8 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep if (local2098 == local1097) { local4883 = Static23.aSpotAnimTypeList1.method2694(local2098); if (local4883.aBoolean448 && local4883.anInt5842 != -1) { - @Pc(4940) SeqType local4940 = Static25.aSeqTypeList1.method1162(local4883.anInt5842); - local4943 = local4940.anInt1646; + @Pc(4940) SeqType local4940 = Static25.aSeqTypeList1.get(local4883.anInt5842); + local4943 = local4940.exactmove; if (local4943 == 0 || local4943 == 2) { local4857 = false; } else if (local4943 == 1) { @@ -1259,9 +1259,9 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local4883 = Static23.aSpotAnimTypeList1.method2694(local2098); local4888 = Static23.aSpotAnimTypeList1.method2694(local1097); if (local4883.anInt5842 != -1 && local4888.anInt5842 != -1) { - local4905 = Static25.aSeqTypeList1.method1162(local4883.anInt5842); - local4911 = Static25.aSeqTypeList1.method1162(local4888.anInt5842); - if (local4911.anInt1649 > local4905.anInt1649) { + local4905 = Static25.aSeqTypeList1.get(local4883.anInt5842); + local4911 = Static25.aSeqTypeList1.get(local4888.anInt5842); + if (local4911.priority > local4905.priority) { local4857 = false; } } @@ -1287,8 +1287,8 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep } } else { playerPrivilege = local100 >> 28 & 0x3; - local657 = (local100 >> 14 & 0x3FFF) - Static691.anInt10367; - local3502 = (local100 & 0x3FFF) - Static116.anInt2270; + local657 = (local100 >> 14 & 0x3FFF) - Static691.originX; + local3502 = (local100 & 0x3FFF) - Static116.originZ; if (local657 >= 0 && local3502 >= 0 && local657 < Static720.anInt10859 && local3502 < Static501.anInt7568) { if (local2098 == -1) { @Pc(5270) SecondaryLinkable_Sub20 local5270 = (SecondaryLinkable_Sub20) Static346.aHashTable29.get((long) (local657 << 16 | local3502)); @@ -1335,26 +1335,26 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local277 = local11.g4_alt2(); local100 = local11.g4_alt3(); Static574.method7573(); - @Pc(5438) SubInterface local5438 = (SubInterface) Static548.aHashTable40.get((long) local100); - local5445 = (SubInterface) Static548.aHashTable40.get((long) local277); + @Pc(5438) SubInterface local5438 = (SubInterface) Static548.openInterfaces.get((long) local100); + local5445 = (SubInterface) Static548.openInterfaces.get((long) local277); if (local5445 != null) { - Static449.method6115(false, local5438 == null || local5438.anInt147 != local5445.anInt147, local5445); + Static449.method6115(false, local5438 == null || local5438.interfaceId != local5445.interfaceId, local5445); } if (local5438 != null) { local5438.unlink(); - Static548.aHashTable40.put((long) local277, local5438); + Static548.openInterfaces.put((long) local277, local5438); } - @Pc(5487) Component local5487 = Static145.method2412(local100); + @Pc(5487) Component local5487 = Static145.getComponent(local100); if (local5487 != null) { - Static178.method2729(local5487); + Static178.redraw(local5487); } - local5487 = Static145.method2412(local277); + local5487 = Static145.getComponent(local277); if (local5487 != null) { - Static178.method2729(local5487); + Static178.redraw(local5487); Static134.method8956(local5487, true); } - if (Static377.anInt5930 != -1) { - Static145.method2411(1, Static377.anInt5930); + if (Static377.topLevelInterface != -1) { + Static145.method2411(1, Static377.topLevelInterface); } arg0.packetType = null; return true; @@ -1363,9 +1363,9 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local100 = local11.g4_alt1(); local526 = local11.g1(); Static574.method7573(); - local5445 = (SubInterface) Static548.aHashTable40.get((long) local100); + local5445 = (SubInterface) Static548.openInterfaces.get((long) local100); if (local5445 != null) { - Static449.method6115(false, local5445.anInt147 != local277, local5445); + Static449.method6115(false, local5445.interfaceId != local277, local5445); } Static163.method8850(local526, local277, local100, false); arg0.packetType = null; @@ -1381,7 +1381,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep arg0.packetType = null; return true; } else if (ServerProt.UPDATE_RUN_ENERGY == arg0.packetType) { - Static703.anInt10571 = local11.g1(); + Static703.runEnergy = local11.g1(); arg0.packetType = null; Static321.anInt5111 = Static642.anInt9599; return true; @@ -1417,7 +1417,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep while (true) { if (local3502 >= 100) { if (local996 <= 1) { - if (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.aBoolean724) { + if (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.mapQuickChat) { local1004 = true; } else if (Static71.method1524(local629)) { local1004 = true; @@ -1452,7 +1452,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local100 = -1; } local526 = local11.g1_alt2(); - Static63.method1427(local526, local100, local277); + Static63.playSong(local526, local100, local277); arg0.packetType = null; return true; } else if (ServerProt.REBUILD_LOGIN_OR_MUSIC_EFFECT == arg0.packetType) { @@ -1462,7 +1462,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep } local100 = local11.g3_alt1(); local526 = local11.g1_alt2(); - Static482.method6481(local526, local277, local100); + Static482.playJingle(local526, local277, local100); arg0.packetType = null; return true; } else if (ServerProt.OPCODE_143 == arg0.packetType) { @@ -1483,11 +1483,11 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local100 = local11.g2(); local526 = local11.g2(); Static574.method7573(); - if (Static453.aComponentArrayArray2[local277] != null) { + if (Static453.components[local277] != null) { for (local1409 = local100; local1409 < local526; local1409++) { local1413 = local11.g3(); - if (Static453.aComponentArrayArray2[local277].length > local1409 && Static453.aComponentArrayArray2[local277][local1409] != null) { - Static453.aComponentArrayArray2[local277][local1409].anInt3774 = local1413; + if (Static453.components[local277].length > local1409 && Static453.components[local277][local1409] != null) { + Static453.components[local277][local1409].anInt3774 = local1413; } } } @@ -1537,9 +1537,9 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep for (@Pc(6277) Linkable_Sub17 local6277 = (Linkable_Sub17) Static497.aHashTable35.head(); local6277 != null; local6277 = (Linkable_Sub17) Static497.aHashTable35.next()) { local100 = (int) (local6277.id >> 28 & 0x3L); local526 = (int) (local6277.id & 0x3FFFL); - local1409 = local526 - Static691.anInt10367; + local1409 = local526 - Static691.originX; local1413 = (int) (local6277.id >> 14 & 0x3FFFL); - local2098 = local1413 - Static116.anInt2270; + local2098 = local1413 - Static116.originZ; if (Static87.anInt1810 == local100 && local1409 >= Static626.anInt9476 && Static626.anInt9476 + 8 > local1409 && local2098 >= Static270.anInt4354 && Static270.anInt4354 + 8 > local2098) { local6277.unlink(); if (local1409 >= 0 && local2098 >= 0 && Static720.anInt10859 > local1409 && local2098 < Static501.anInt7568) { @@ -1578,7 +1578,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local1409 = local11.g1(); local6565 = false; if (local1409 <= 1) { - if (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.aBoolean724) { + if (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.mapQuickChat) { local6565 = true; } else if (local1409 <= 1 && Static71.method1524(local629)) { local6565 = true; @@ -1602,18 +1602,18 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local2080 = local11.g1() == 1; Static718.aBoolean823 = local2080; Static459.aClass229_2 = Static344.aClass229_1; - Static430.method5817(local277, local627); + Static430.hopWorld(local277, local627); Static81.method1586(15); arg0.packetType = null; return false; } else if (arg0.packetType == ServerProt.OPCODE_4) { - if (Static377.anInt5930 != -1) { - Static145.method2411(0, Static377.anInt5930); + if (Static377.topLevelInterface != -1) { + Static145.method2411(0, Static377.topLevelInterface); } arg0.packetType = null; return true; } else if (arg0.packetType == ServerProt.OPCODE_135) { - Static251.anInt4036 = 1; + Static251.state = 1; Static344.anInt5621 = Static642.anInt9599; arg0.packetType = null; return true; @@ -1663,8 +1663,8 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local992 = local2098 >> 2; local996 = local2098 & 0x3; local1449 = Static310.anIntArray379[local992]; - local1409 -= Static116.anInt2270; - local526 -= Static691.anInt10367; + local1409 -= Static116.originZ; + local526 -= Static691.originX; Static198.method2953(local100, local1409, local992, local1413, local526, local996, local1449); arg0.packetType = null; return true; @@ -1682,7 +1682,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local1750 = local4177; } if (local892) { - for (local992 = 0; local992 < Static436.anInt3849; local992++) { + for (local992 = 0; local992 < Static436.size; local992++) { if (Static446.aStringArray35[local992].equals(local1750)) { Static632.aStringArray44[local992] = local629; Static446.aStringArray35[local992] = local4175; @@ -1692,12 +1692,12 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep } } } else { - Static632.aStringArray44[Static436.anInt3849] = local629; - Static446.aStringArray35[Static436.anInt3849] = local4175; - Static10.aStringArray1[Static436.anInt3849] = local4177; - Static316.aStringArray41[Static436.anInt3849] = local1750; - Static65.aBooleanArray2[Static436.anInt3849] = (local277 & 0x2) == 2; - Static436.anInt3849++; + Static632.aStringArray44[Static436.size] = local629; + Static446.aStringArray35[Static436.size] = local4175; + Static10.aStringArray1[Static436.size] = local4177; + Static316.aStringArray41[Static436.size] = local1750; + Static65.aBooleanArray2[Static436.size] = (local277 & 0x2) == 2; + Static436.size++; } Static344.anInt5621 = Static642.anInt9599; arg0.packetType = null; @@ -1765,37 +1765,37 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local1425 = true; } if (local1425) { - if (Static706.anInt10633 == 0) { + if (Static706.size == 0) { arg0.packetType = null; return true; } - for (local992 = 0; Static706.anInt10633 > local992 && (!Static87.aClass241Array1[local992].aString66.equals(local627) || local1409 != Static87.aClass241Array1[local992].anInt6148); local992++) { + for (local992 = 0; Static706.size > local992 && (!Static87.members[local992].username.equals(local627) || local1409 != Static87.members[local992].world); local992++) { } - if (local992 < Static706.anInt10633) { - while (Static706.anInt10633 - 1 > local992) { - Static87.aClass241Array1[local992] = Static87.aClass241Array1[local992 + 1]; + if (local992 < Static706.size) { + while (Static706.size - 1 > local992) { + Static87.members[local992] = Static87.members[local992 + 1]; local992++; } - Static706.anInt10633--; - Static87.aClass241Array1[Static706.anInt10633] = null; + Static706.size--; + Static87.members[Static706.size] = null; } } else { local1427 = local11.gjstr(); local7394 = new Class241(); local7394.aString67 = local1937; - local7394.aString66 = local627; - local7394.aString68 = Static390.method5492(local7394.aString66); - local7394.anInt6148 = local1409; - local7394.aString65 = local1427; - local7394.aByte99 = local7377; - for (local1449 = Static706.anInt10633 - 1; local1449 >= 0; local1449--) { - playerPrivilege = Static87.aClass241Array1[local1449].aString68.compareTo(local7394.aString68); + local7394.username = local627; + local7394.aString68 = Static390.method5492(local7394.username); + local7394.world = local1409; + local7394.worldName = local1427; + local7394.rank = local7377; + for (local1449 = Static706.size - 1; local1449 >= 0; local1449--) { + playerPrivilege = Static87.members[local1449].aString68.compareTo(local7394.aString68); if (playerPrivilege == 0) { - Static87.aClass241Array1[local1449].anInt6148 = local1409; - Static87.aClass241Array1[local1449].aByte99 = local7377; - Static87.aClass241Array1[local1449].aString65 = local1427; - if (local627.equals(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2)) { - Static682.aByte142 = local7377; + Static87.members[local1449].world = local1409; + Static87.members[local1449].rank = local7377; + Static87.members[local1449].worldName = local1427; + if (local627.equals(Static556.self.username)) { + Static682.rank = local7377; } Static352.anInt5754 = Static642.anInt9599; arg0.packetType = null; @@ -1805,20 +1805,20 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep break; } } - if (Static87.aClass241Array1.length <= Static706.anInt10633) { + if (Static87.members.length <= Static706.size) { arg0.packetType = null; return true; } - for (playerPrivilege = Static706.anInt10633 - 1; playerPrivilege > local1449; playerPrivilege--) { - Static87.aClass241Array1[playerPrivilege + 1] = Static87.aClass241Array1[playerPrivilege]; + for (playerPrivilege = Static706.size - 1; playerPrivilege > local1449; playerPrivilege--) { + Static87.members[playerPrivilege + 1] = Static87.members[playerPrivilege]; } - if (Static706.anInt10633 == 0) { - Static87.aClass241Array1 = new Class241[100]; + if (Static706.size == 0) { + Static87.members = new Class241[100]; } - Static87.aClass241Array1[local1449 + 1] = local7394; - Static706.anInt10633++; - if (local627.equals(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2)) { - Static682.aByte142 = local7377; + Static87.members[local1449 + 1] = local7394; + Static706.size++; + if (local627.equals(Static556.self.username)) { + Static682.rank = local7377; } } Static352.anInt5754 = Static642.anInt9599; @@ -1838,7 +1838,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local277 = local11.g2(); @Pc(7724) Player local7724; if (local277 == Static312.anInt5000) { - local7724 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2; + local7724 = Static556.self; } else { local7724 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local277]; } @@ -1849,12 +1849,12 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local526 = local11.g2(); local1409 = local11.g1(); local6565 = (local526 & 0x8000) != 0; - if (local7724.name2 != null && local7724.aPlayerAppearance1 != null) { + if (local7724.username != null && local7724.aPlayerAppearance1 != null) { local1425 = false; if (local1409 <= 1) { - if (!local6565 && (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.aBoolean724)) { + if (!local6565 && (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.mapQuickChat)) { local1425 = true; - } else if (Static71.method1524(local7724.name2)) { + } else if (Static71.method1524(local7724.username)) { local1425 = true; } } @@ -1894,7 +1894,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local526 = local11.g2(); local1409 = local11.g1(); local1413 = local11.g2(); - Static161.method2586(local1413, local526, local277, local100, local1409); + Static161.play(local1413, local526, local277, local100, local1409); arg0.packetType = null; return true; } else if (ServerProt.OPCODE_25 == arg0.packetType) { @@ -1916,10 +1916,10 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local644 = (long) local1413 + ((long) local100 << 32); local4597 = (ServerActiveProperties) Static291.aHashTable24.get(local644); if (local4597 != null) { - local4611 = new ServerActiveProperties(local1409, local4597.anInt6904); + local4611 = new ServerActiveProperties(local1409, local4597.targetParam); local4597.unlink(); } else if (local1413 == -1) { - local4611 = new ServerActiveProperties(local1409, Static145.method2412(local100).aClass2_Sub41_2.anInt6904); + local4611 = new ServerActiveProperties(local1409, Static145.getComponent(local100).aClass2_Sub41_2.targetParam); } else { local4611 = new ServerActiveProperties(local1409, -1); } @@ -2028,45 +2028,45 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep Static352.anInt5754 = Static642.anInt9599; if (arg0.anInt3648 == 0) { arg0.packetType = null; - Static706.anInt10633 = 0; - Static87.aClass241Array1 = null; - Static723.aString129 = null; - Static158.aString28 = null; + Static706.size = 0; + Static87.members = null; + Static723.name = null; + Static158.owner = null; return true; } - Static158.aString28 = local11.gjstr(); + Static158.owner = local11.gjstr(); local446 = local11.g1() == 1; if (local446) { local11.gjstr(); } local4669 = local11.g8(); - Static723.aString129 = Static287.method4154(local4669); - Static673.aByte140 = local11.g1b(); + Static723.name = Static287.method4154(local4669); + Static673.minKick = local11.g1b(); local1409 = local11.g1(); if (local1409 == 255) { arg0.packetType = null; return true; } - Static706.anInt10633 = local1409; + Static706.size = local1409; @Pc(8611) Class241[] local8611 = new Class241[100]; - for (local2098 = 0; local2098 < Static706.anInt10633; local2098++) { + for (local2098 = 0; local2098 < Static706.size; local2098++) { local8611[local2098] = new Class241(); local8611[local2098].aString67 = local11.gjstr(); local446 = local11.g1() == 1; if (local446) { - local8611[local2098].aString66 = local11.gjstr(); + local8611[local2098].username = local11.gjstr(); } else { - local8611[local2098].aString66 = local8611[local2098].aString67; + local8611[local2098].username = local8611[local2098].aString67; } - local8611[local2098].aString68 = Static390.method5492(local8611[local2098].aString66); - local8611[local2098].anInt6148 = local11.g2(); - local8611[local2098].aByte99 = local11.g1b(); - local8611[local2098].aString65 = local11.gjstr(); - if (local8611[local2098].aString66.equals(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2)) { - Static682.aByte142 = local8611[local2098].aByte99; + local8611[local2098].aString68 = Static390.method5492(local8611[local2098].username); + local8611[local2098].world = local11.g2(); + local8611[local2098].rank = local11.g1b(); + local8611[local2098].worldName = local11.gjstr(); + if (local8611[local2098].username.equals(Static556.self.username)) { + Static682.rank = local8611[local2098].rank; } } - local1449 = Static706.anInt10633; + local1449 = Static706.size; while (local1449 > 0) { @Pc(8729) boolean local8729 = true; local1449--; @@ -2083,7 +2083,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep } } arg0.packetType = null; - Static87.aClass241Array1 = local8611; + Static87.members = local8611; return true; } else if (ServerProt.MAP_PROJ_ANIM == arg0.packetType) { Static605.method7912(ZoneProt.OPCODE_6); @@ -2130,7 +2130,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep while (true) { if (local1097 >= 100) { if (playerPrivilege <= 1) { - if (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.aBoolean724) { + if (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.mapQuickChat) { local4857 = true; } else if (Static71.method1524(local629)) { local4857 = true; diff --git a/client/src/main/java/ReferenceNodeFactory.java b/client/src/main/java/ReferenceNodeFactory.java index 39fa340..ec42369 100644 --- a/client/src/main/java/ReferenceNodeFactory.java +++ b/client/src/main/java/ReferenceNodeFactory.java @@ -6,7 +6,7 @@ public abstract class ReferenceNodeFactory { @OriginalMember(owner = "client!nw", name = "k", descriptor = "Lclient!gh;") - public static final ReferenceNodeFactory SOFT_REFERENCE_NODE_FACTORY = Static638.method8396(); + public static final ReferenceNodeFactory SOFT_REFERENCE_NODE_FACTORY = Static638.createSoftReferenceNodeFactory(); @OriginalMember(owner = "client!gh", name = "a", descriptor = "(Lclient!vw;I)Lclient!vw;") public abstract ReferenceNode create(@OriginalArg(0) ReferenceNode arg0); diff --git a/client/src/main/java/Resampler.java b/client/src/main/java/Resampler.java index 8a88b4e..322dc5e 100644 --- a/client/src/main/java/Resampler.java +++ b/client/src/main/java/Resampler.java @@ -10,10 +10,10 @@ public final class Resampler { private int[][] anIntArrayArray143; @OriginalMember(owner = "client!lg", name = "c", descriptor = "I") - private int anInt5812; + private int inputRate; @OriginalMember(owner = "client!lg", name = "a", descriptor = "I") - private int anInt5819; + private int outputRate; @OriginalMember(owner = "client!lg", name = "", descriptor = "(II)V") public Resampler(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @@ -22,8 +22,8 @@ public Resampler(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(18) int local18 = arg0 / local14; @Pc(22) int local22 = arg1 / local14; this.anIntArrayArray143 = new int[local18][14]; - this.anInt5812 = local18; - this.anInt5819 = local22; + this.inputRate = local18; + this.outputRate = local22; for (@Pc(35) int local35 = 0; local35 < local18; local35++) { @Pc(41) int[] local41 = this.anIntArrayArray143[local35]; @Pc(49) double local49 = (double) local35 / (double) local18 + 6.0D; @@ -51,17 +51,17 @@ public Resampler(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { } @OriginalMember(owner = "client!lg", name = "c", descriptor = "(II)I") - public int method5231(@OriginalArg(1) int arg0) { + public int scalePosition(@OriginalArg(1) int arg0) { if (this.anIntArrayArray143 != null) { - arg0 = (int) ((long) arg0 * (long) this.anInt5819 / (long) this.anInt5812) + 6; + arg0 = (int) ((long) arg0 * (long) this.outputRate / (long) this.inputRate) + 6; } return arg0; } @OriginalMember(owner = "client!lg", name = "a", descriptor = "(II)I") - public int method5234(@OriginalArg(1) int arg0) { + public int scaleRate(@OriginalArg(1) int arg0) { if (this.anIntArrayArray143 != null) { - arg0 = (int) ((long) this.anInt5819 * (long) arg0 / (long) this.anInt5812); + arg0 = (int) ((long) this.outputRate * (long) arg0 / (long) this.inputRate); } return arg0; } @@ -69,7 +69,7 @@ public int method5234(@OriginalArg(1) int arg0) { @OriginalMember(owner = "client!lg", name = "a", descriptor = "(I[B)[B") public byte[] method5235(@OriginalArg(1) byte[] arg0) { if (this.anIntArrayArray143 != null) { - @Pc(19) int local19 = (int) ((long) arg0.length * (long) this.anInt5819 / (long) this.anInt5812) + 14; + @Pc(19) int local19 = (int) ((long) arg0.length * (long) this.outputRate / (long) this.inputRate) + 14; @Pc(22) int[] local22 = new int[local19]; @Pc(24) int local24 = 0; @Pc(26) int local26 = 0; @@ -79,9 +79,9 @@ public byte[] method5235(@OriginalArg(1) byte[] arg0) { for (@Pc(41) int local41 = 0; local41 < 14; local41++) { local22[local24 + local41] += local39[local41] * local34; } - local26 += this.anInt5819; - @Pc(74) int local74 = local26 / this.anInt5812; - local26 -= this.anInt5812 * local74; + local26 += this.outputRate; + @Pc(74) int local74 = local26 / this.inputRate; + local26 -= this.inputRate * local74; local24 += local74; } arg0 = new byte[local19]; @@ -102,7 +102,7 @@ public byte[] method5235(@OriginalArg(1) byte[] arg0) { @OriginalMember(owner = "client!lg", name = "a", descriptor = "([SI)[S") public short[] method5237(@OriginalArg(0) short[] arg0) { if (this.anIntArrayArray143 != null) { - @Pc(23) int local23 = (int) ((long) this.anInt5819 * (long) arg0.length / (long) this.anInt5812) + 14; + @Pc(23) int local23 = (int) ((long) this.outputRate * (long) arg0.length / (long) this.inputRate) + 14; @Pc(26) int[] local26 = new int[local23]; @Pc(28) int local28 = 0; @Pc(30) int local30 = 0; @@ -112,10 +112,10 @@ public short[] method5237(@OriginalArg(0) short[] arg0) { for (@Pc(45) int local45 = 0; local45 < 14; local45++) { local26[local28 + local45] += local43[local45] * local38 >> 2; } - local30 += this.anInt5819; - @Pc(80) int local80 = local30 / this.anInt5812; + local30 += this.outputRate; + @Pc(80) int local80 = local30 / this.inputRate; local28 += local80; - local30 -= this.anInt5812 * local80; + local30 -= this.inputRate * local80; } arg0 = new short[local23]; for (@Pc(103) int local103 = 0; local103 < local23; local103++) { diff --git a/client/src/main/java/SecondaryHashTable.java b/client/src/main/java/SecondaryHashTable.java index 5d09d4d..6f0c248 100644 --- a/client/src/main/java/SecondaryHashTable.java +++ b/client/src/main/java/SecondaryHashTable.java @@ -13,17 +13,17 @@ public final class SecondaryHashTable { private long aLong115; @OriginalMember(owner = "client!gga", name = "d", descriptor = "[Lclient!cm;") - private final SecondaryLinkable[] aClass2_Sub2Array1; + private final SecondaryLinkable[] buckets; @OriginalMember(owner = "client!gga", name = "a", descriptor = "I") - private final int anInt3417; + private final int size; @OriginalMember(owner = "client!gga", name = "", descriptor = "(I)V") public SecondaryHashTable(@OriginalArg(0) int arg0) { - this.aClass2_Sub2Array1 = new SecondaryLinkable[arg0]; - this.anInt3417 = arg0; + this.buckets = new SecondaryLinkable[arg0]; + this.size = arg0; for (@Pc(10) int local10 = 0; local10 < arg0; local10++) { - @Pc(20) SecondaryLinkable local20 = this.aClass2_Sub2Array1[local10] = new SecondaryLinkable(); + @Pc(20) SecondaryLinkable local20 = this.buckets[local10] = new SecondaryLinkable(); local20.secondaryNext = local20; local20.secondaryPrev = local20; } @@ -34,7 +34,7 @@ public void method3094(@OriginalArg(1) SecondaryLinkable arg0, @OriginalArg(2) l if (arg0.secondaryNext != null) { arg0.unlinkSecondary(); } - @Pc(28) SecondaryLinkable local28 = this.aClass2_Sub2Array1[(int) ((long) (this.anInt3417 - 1) & arg1)]; + @Pc(28) SecondaryLinkable local28 = this.buckets[(int) ((long) (this.size - 1) & arg1)]; arg0.secondaryPrev = local28; arg0.secondaryNext = local28.secondaryNext; arg0.secondaryNext.secondaryPrev = arg0; @@ -45,7 +45,7 @@ public void method3094(@OriginalArg(1) SecondaryLinkable arg0, @OriginalArg(2) l @OriginalMember(owner = "client!gga", name = "a", descriptor = "(JI)Lclient!cm;") public SecondaryLinkable method3095(@OriginalArg(0) long arg0) { this.aLong115 = arg0; - @Pc(20) SecondaryLinkable local20 = this.aClass2_Sub2Array1[(int) (arg0 & (long) (this.anInt3417 - 1))]; + @Pc(20) SecondaryLinkable local20 = this.buckets[(int) (arg0 & (long) (this.size - 1))]; for (this.aClass2_Sub2_31 = local20.secondaryPrev; this.aClass2_Sub2_31 != local20; this.aClass2_Sub2_31 = this.aClass2_Sub2_31.secondaryPrev) { if (arg0 == this.aClass2_Sub2_31.secondaryKey) { @Pc(41) SecondaryLinkable local41 = this.aClass2_Sub2_31; @@ -62,7 +62,7 @@ public SecondaryLinkable method3096() { if (this.aClass2_Sub2_31 == null) { return null; } - @Pc(24) SecondaryLinkable local24 = this.aClass2_Sub2Array1[(int) (this.aLong115 & (long) (this.anInt3417 - 1))]; + @Pc(24) SecondaryLinkable local24 = this.buckets[(int) (this.aLong115 & (long) (this.size - 1))]; while (this.aClass2_Sub2_31 != local24) { if (this.aLong115 == this.aClass2_Sub2_31.secondaryKey) { @Pc(38) SecondaryLinkable local38 = this.aClass2_Sub2_31; diff --git a/client/src/main/java/SecondaryLinkable_Sub2.java b/client/src/main/java/SecondaryLinkable_Sub2.java index 25eb1c5..7d5f96f 100644 --- a/client/src/main/java/SecondaryLinkable_Sub2.java +++ b/client/src/main/java/SecondaryLinkable_Sub2.java @@ -46,7 +46,7 @@ public long method204() { } @OriginalMember(owner = "client!aj", name = "c", descriptor = "(B)V") - public void method205() { + public void pushClient() { super.secondaryKey = Static588.currentTimeWithDrift() + 500L | super.secondaryKey & Long.MIN_VALUE; Static59.aSecondaryLinkedList9.addTail(this); } diff --git a/client/src/main/java/SeqType.java b/client/src/main/java/SeqType.java index 538ee0a..588ba5d 100644 --- a/client/src/main/java/SeqType.java +++ b/client/src/main/java/SeqType.java @@ -13,183 +13,180 @@ public final class SeqType { public int[] anIntArray155; @OriginalMember(owner = "client!cka", name = "y", descriptor = "[[I") - public int[][] anIntArrayArray38; + public int[][] soundeffect; @OriginalMember(owner = "client!cka", name = "z", descriptor = "[I") public int[] anIntArray156; @OriginalMember(owner = "client!cka", name = "e", descriptor = "[Z") - public boolean[] aBooleanArray3; + public boolean[] framegroup; @OriginalMember(owner = "client!cka", name = "k", descriptor = "[I") - public int[] anIntArray157; + public int[] frameDelay; @OriginalMember(owner = "client!cka", name = "t", descriptor = "I") - public int anInt1650; + public int id; @OriginalMember(owner = "client!cka", name = "m", descriptor = "[I") - public int[] anIntArray158; + public int[] frameset; @OriginalMember(owner = "client!cka", name = "B", descriptor = "[I") - public int[] anIntArray159; + public int[] frames; @OriginalMember(owner = "client!cka", name = "l", descriptor = "I") - public int anInt1640 = -1; + public int replayoff = -1; @OriginalMember(owner = "client!cka", name = "b", descriptor = "Z") - public boolean aBoolean140 = false; + public boolean rotateNormals = false; @OriginalMember(owner = "client!cka", name = "d", descriptor = "I") - public int anInt1646 = 2; + public int exactmove = 2; @OriginalMember(owner = "client!cka", name = "w", descriptor = "I") - public int anInt1642 = -1; + public int looptype = -1; @OriginalMember(owner = "client!cka", name = "u", descriptor = "I") - public int anInt1647 = 99; + public int replaycount = 99; @OriginalMember(owner = "client!cka", name = "f", descriptor = "I") - public int anInt1649 = 5; + public int priority = 5; @OriginalMember(owner = "client!cka", name = "j", descriptor = "Z") public boolean aBoolean141 = false; @OriginalMember(owner = "client!cka", name = "g", descriptor = "Z") - public boolean aBoolean142 = false; + public boolean tween = false; @OriginalMember(owner = "client!cka", name = "h", descriptor = "I") - public int anInt1651 = -1; + public int offhand = -1; @OriginalMember(owner = "client!cka", name = "n", descriptor = "I") - public int anInt1652 = -1; + public int mainhand = -1; @OriginalMember(owner = "client!cka", name = "C", descriptor = "I") - public int anInt1654 = -1; + public int movetype = -1; @OriginalMember(owner = "client!cka", name = "b", descriptor = "(I)V") - public void method1584() { - if (this.anInt1654 == -1) { - if (this.aBooleanArray3 == null) { - this.anInt1654 = 0; + public void postDecode() { + if (this.movetype == -1) { + if (this.framegroup == null) { + this.movetype = 0; } else { - this.anInt1654 = 2; + this.movetype = 2; } } - if (this.anInt1642 != -1) { + if (this.looptype != -1) { return; } - if (this.aBooleanArray3 == null) { - this.anInt1642 = 0; + if (this.framegroup == null) { + this.looptype = 0; } else { - this.anInt1642 = 2; + this.looptype = 2; } } @OriginalMember(owner = "client!cka", name = "a", descriptor = "(Lclient!ge;I)V") - public void method1585(@OriginalArg(0) Packet arg0) { + public void decode(@OriginalArg(0) Packet arg0) { while (true) { @Pc(3) int local3 = arg0.g1(); if (local3 == 0) { return; } - this.method1588(local3, arg0); + this.decode(local3, arg0); } } @OriginalMember(owner = "client!cka", name = "a", descriptor = "(IBLclient!ge;)V") - private void method1588(@OriginalArg(0) int arg0, @OriginalArg(2) Packet arg1) { + private void decode(@OriginalArg(0) int opcode, @OriginalArg(2) Packet arg1) { @Pc(20) int local20; @Pc(26) int local26; @Pc(44) int local44; @Pc(58) int local58; - if (arg0 == 1) { + if (opcode == 1) { local20 = arg1.g2(); - this.anIntArray157 = new int[local20]; + this.frameDelay = new int[local20]; for (local26 = 0; local26 < local20; local26++) { - this.anIntArray157[local26] = arg1.g2(); + this.frameDelay[local26] = arg1.g2(); } - this.anIntArray159 = new int[local20]; + this.frames = new int[local20]; for (local44 = 0; local44 < local20; local44++) { - this.anIntArray159[local44] = arg1.g2(); + this.frames[local44] = arg1.g2(); } for (local58 = 0; local58 < local20; local58++) { - this.anIntArray159[local58] = (arg1.g2() << 16) + this.anIntArray159[local58]; + this.frames[local58] = (arg1.g2() << 16) + this.frames[local58]; } - } else if (arg0 == 2) { - this.anInt1640 = arg1.g2(); - } else if (arg0 == 3) { - this.aBooleanArray3 = new boolean[256]; + } else if (opcode == 2) { + this.replayoff = arg1.g2(); + } else if (opcode == 3) { + this.framegroup = new boolean[256]; local20 = arg1.g1(); for (local26 = 0; local26 < local20; local26++) { - this.aBooleanArray3[arg1.g1()] = true; + this.framegroup[arg1.g1()] = true; } - } else if (arg0 == 5) { - this.anInt1649 = arg1.g1(); - } else if (arg0 == 6) { - this.anInt1652 = arg1.g2(); - } else if (arg0 == 7) { - this.anInt1651 = arg1.g2(); - } else if (arg0 == 8) { - this.anInt1647 = arg1.g1(); - } else if (arg0 == 9) { - this.anInt1642 = arg1.g1(); - } else if (arg0 == 10) { - this.anInt1654 = arg1.g1(); - } else if (arg0 == 11) { - this.anInt1646 = arg1.g1(); - } else if (arg0 == 12) { + } else if (opcode == 5) { + this.priority = arg1.g1(); + } else if (opcode == 6) { + this.mainhand = arg1.g2(); + } else if (opcode == 7) { + this.offhand = arg1.g2(); + } else if (opcode == 8) { + this.replaycount = arg1.g1(); + } else if (opcode == 9) { + this.looptype = arg1.g1(); + } else if (opcode == 10) { + this.movetype = arg1.g1(); + } else if (opcode == 11) { + this.exactmove = arg1.g1(); + } else if (opcode == 12) { local20 = arg1.g1(); - this.anIntArray158 = new int[local20]; + this.frameset = new int[local20]; for (local26 = 0; local26 < local20; local26++) { - this.anIntArray158[local26] = arg1.g2(); + this.frameset[local26] = arg1.g2(); } for (local44 = 0; local44 < local20; local44++) { - this.anIntArray158[local44] += arg1.g2() << 16; + this.frameset[local44] += arg1.g2() << 16; } - } else if (arg0 == 13) { + } else if (opcode == 13) { local20 = arg1.g2(); - this.anIntArrayArray38 = new int[local20][]; + this.soundeffect = new int[local20][]; for (local26 = 0; local26 < local20; local26++) { local44 = arg1.g1(); if (local44 > 0) { - this.anIntArrayArray38[local26] = new int[local44]; - this.anIntArrayArray38[local26][0] = arg1.g3(); + this.soundeffect[local26] = new int[local44]; + this.soundeffect[local26][0] = arg1.g3(); for (local58 = 1; local58 < local44; local58++) { - this.anIntArrayArray38[local26][local58] = arg1.g2(); + this.soundeffect[local26][local58] = arg1.g2(); } } } - } else if (arg0 == 14) { - this.aBoolean140 = true; - } else if (arg0 == 15) { - this.aBoolean142 = true; - } else if (arg0 != 16) { - if (arg0 == 18) { - this.aBoolean141 = true; - } else if (arg0 == 19) { - if (this.anIntArray156 == null) { - this.anIntArray156 = new int[this.anIntArrayArray38.length]; - for (local20 = 0; local20 < this.anIntArrayArray38.length; local20++) { - this.anIntArray156[local20] = 255; - } + } else if (opcode == 14) { + this.rotateNormals = true; + } else if (opcode == 15) { + this.tween = true; + } else if (opcode == 16) { + // empty + } else if (opcode == 18) { + this.aBoolean141 = true; + } else if (opcode == 19) { + if (this.anIntArray156 == null) { + this.anIntArray156 = new int[this.soundeffect.length]; + for (local20 = 0; local20 < this.soundeffect.length; local20++) { + this.anIntArray156[local20] = 255; } - this.anIntArray156[arg1.g1()] = arg1.g1(); - return; - } else if (arg0 == 20) { - if (this.anIntArray154 == null || this.anIntArray155 == null) { - this.anIntArray154 = new int[this.anIntArrayArray38.length]; - this.anIntArray155 = new int[this.anIntArrayArray38.length]; - for (local20 = 0; local20 < this.anIntArrayArray38.length; local20++) { - this.anIntArray154[local20] = 256; - this.anIntArray155[local20] = 256; - } + } + this.anIntArray156[arg1.g1()] = arg1.g1(); + } else if (opcode == 20) { + if (this.anIntArray154 == null || this.anIntArray155 == null) { + this.anIntArray154 = new int[this.soundeffect.length]; + this.anIntArray155 = new int[this.soundeffect.length]; + for (local20 = 0; local20 < this.soundeffect.length; local20++) { + this.anIntArray154[local20] = 256; + this.anIntArray155[local20] = 256; } - local20 = arg1.g1(); - this.anIntArray154[local20] = arg1.g2(); - this.anIntArray155[local20] = arg1.g2(); - return; } - return; + local20 = arg1.g1(); + this.anIntArray154[local20] = arg1.g2(); + this.anIntArray155[local20] = arg1.g2(); } } } diff --git a/client/src/main/java/SeqTypeList.java b/client/src/main/java/SeqTypeList.java index 44994a5..fa89235 100644 --- a/client/src/main/java/SeqTypeList.java +++ b/client/src/main/java/SeqTypeList.java @@ -7,96 +7,96 @@ public final class SeqTypeList { @OriginalMember(owner = "client!bp", name = "a", descriptor = "Lclient!dla;") - private final SoftLruHashTable aSoftLruHashTable22 = new SoftLruHashTable(64); + private final SoftLruHashTable types = new SoftLruHashTable(64); @OriginalMember(owner = "client!bp", name = "f", descriptor = "Lclient!dla;") - private final SoftLruHashTable aSoftLruHashTable23 = new SoftLruHashTable(100); + private final SoftLruHashTable animFramesets = new SoftLruHashTable(100); @OriginalMember(owner = "client!bp", name = "j", descriptor = "Lclient!sb;") - private final Js5 aJs511; + private final Js5 archive; @OriginalMember(owner = "client!bp", name = "", descriptor = "(Lclient!ul;ILclient!sb;Lclient!sb;Lclient!sb;)V") public SeqTypeList(@OriginalArg(0) ModeGame arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Js5 arg2, @OriginalArg(3) Js5 arg3, @OriginalArg(4) Js5 arg4) { - this.aJs511 = arg2; - if (this.aJs511 != null) { - @Pc(26) int local26 = this.aJs511.capacity() - 1; - this.aJs511.getGroupCapacity(local26); + this.archive = arg2; + if (this.archive != null) { + @Pc(26) int local26 = this.archive.capacity() - 1; + this.archive.getGroupCapacity(local26); } Static642.method8440(arg4, arg3); } @OriginalMember(owner = "client!bp", name = "a", descriptor = "(IB)Lclient!cka;") - public SeqType method1162(@OriginalArg(0) int arg0) { - @Pc(6) SoftLruHashTable local6 = this.aSoftLruHashTable22; + public SeqType get(@OriginalArg(0) int arg0) { + @Pc(6) SoftLruHashTable local6 = this.types; @Pc(16) SeqType local16; - synchronized (this.aSoftLruHashTable22) { - local16 = (SeqType) this.aSoftLruHashTable22.get((long) arg0); + synchronized (this.types) { + local16 = (SeqType) this.types.get((long) arg0); } if (local16 != null) { return local16; } - @Pc(30) Js5 local30 = this.aJs511; + @Pc(30) Js5 local30 = this.archive; @Pc(43) byte[] local43; - synchronized (this.aJs511) { - local43 = this.aJs511.fetchFile(Static291.method4226(arg0), Static668.method8702(arg0)); + synchronized (this.archive) { + local43 = this.archive.fetchFile(Static291.getGroupId(arg0), Static668.getFileId(arg0)); } local16 = new SeqType(); - local16.anInt1650 = arg0; + local16.id = arg0; if (local43 != null) { - local16.method1585(new Packet(local43)); + local16.decode(new Packet(local43)); } - local16.method1584(); - @Pc(73) SoftLruHashTable local73 = this.aSoftLruHashTable22; - synchronized (this.aSoftLruHashTable22) { - this.aSoftLruHashTable22.put((long) arg0, local16); + local16.postDecode(); + @Pc(73) SoftLruHashTable local73 = this.types; + synchronized (this.types) { + this.types.put((long) arg0, local16); return local16; } } @OriginalMember(owner = "client!bp", name = "a", descriptor = "(II)V") - public void method1163() { - @Pc(6) SoftLruHashTable local6 = this.aSoftLruHashTable22; - synchronized (this.aSoftLruHashTable22) { - this.aSoftLruHashTable22.clean(5); + public void clean() { + @Pc(6) SoftLruHashTable local6 = this.types; + synchronized (this.types) { + this.types.clean(5); } - local6 = this.aSoftLruHashTable23; - synchronized (this.aSoftLruHashTable23) { - this.aSoftLruHashTable23.clean(5); + local6 = this.animFramesets; + synchronized (this.animFramesets) { + this.animFramesets.clean(5); } } @OriginalMember(owner = "client!bp", name = "b", descriptor = "(I)V") - public void method1164() { - @Pc(2) SoftLruHashTable local2 = this.aSoftLruHashTable22; - synchronized (this.aSoftLruHashTable22) { - this.aSoftLruHashTable22.removeSoft(); + public void removeSoft() { + @Pc(2) SoftLruHashTable local2 = this.types; + synchronized (this.types) { + this.types.removeSoft(); } - local2 = this.aSoftLruHashTable23; - synchronized (this.aSoftLruHashTable23) { - this.aSoftLruHashTable23.removeSoft(); + local2 = this.animFramesets; + synchronized (this.animFramesets) { + this.animFramesets.removeSoft(); } } @OriginalMember(owner = "client!bp", name = "a", descriptor = "(B)V") - public void method1165() { - @Pc(7) SoftLruHashTable local7 = this.aSoftLruHashTable22; - synchronized (this.aSoftLruHashTable22) { - this.aSoftLruHashTable22.clear(); + public void clear() { + @Pc(7) SoftLruHashTable local7 = this.types; + synchronized (this.types) { + this.types.clear(); } - local7 = this.aSoftLruHashTable23; - synchronized (this.aSoftLruHashTable23) { - this.aSoftLruHashTable23.clear(); + local7 = this.animFramesets; + synchronized (this.animFramesets) { + this.animFramesets.clear(); } } @OriginalMember(owner = "client!bp", name = "b", descriptor = "(II)Lclient!rw;") - public AnimFrameset method1166(@OriginalArg(0) int arg0) { - @Pc(12) SoftLruHashTable local12 = this.aSoftLruHashTable23; - synchronized (this.aSoftLruHashTable23) { - @Pc(22) AnimFrameset local22 = (AnimFrameset) this.aSoftLruHashTable23.get((long) arg0); + public AnimFrameset getAnimFrameset(@OriginalArg(0) int arg0) { + @Pc(12) SoftLruHashTable local12 = this.animFramesets; + synchronized (this.animFramesets) { + @Pc(22) AnimFrameset local22 = (AnimFrameset) this.animFramesets.get((long) arg0); if (local22 == null) { local22 = new AnimFrameset(arg0); - this.aSoftLruHashTable23.put((long) arg0, local22); + this.animFramesets.put((long) arg0, local22); } return local22.method7565() ? local22 : null; } diff --git a/client/src/main/java/ServerActiveProperties.java b/client/src/main/java/ServerActiveProperties.java index d35156a..ba20463 100644 --- a/client/src/main/java/ServerActiveProperties.java +++ b/client/src/main/java/ServerActiveProperties.java @@ -6,46 +6,46 @@ public final class ServerActiveProperties extends Linkable { @OriginalMember(owner = "client!cu", name = "T", descriptor = "Lclient!ofa;") - public static final ServerActiveProperties aClass2_Sub41_1 = new ServerActiveProperties(0, -1); + public static final ServerActiveProperties DEFAULT_SERVER_ACTIVE_PROPERTIES = new ServerActiveProperties(0, -1); @OriginalMember(owner = "client!ofa", name = "r", descriptor = "I") - public final int anInt6904; + public final int targetParam; @OriginalMember(owner = "client!ofa", name = "q", descriptor = "I") - public final int anInt6909; + public final int events; @OriginalMember(owner = "client!ofa", name = "", descriptor = "(II)V") public ServerActiveProperties(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - this.anInt6904 = arg1; - this.anInt6909 = arg0; + this.targetParam = arg1; + this.events = arg0; } @OriginalMember(owner = "client!ofa", name = "b", descriptor = "(I)I") - public int method6216() { - return Static622.method6853(this.anInt6909); + public int getTargetMask() { + return Static622.getTargetMask(this.events); } @OriginalMember(owner = "client!ofa", name = "b", descriptor = "(B)Z") - public boolean method6217() { - return (this.anInt6909 >> 22 & 0x1) != 0; + public boolean isUseTarget() { + return (this.events >> 22 & 0x1) != 0; } @OriginalMember(owner = "client!ofa", name = "g", descriptor = "(I)I") - public int method6218() { - return this.anInt6909 >> 18 & 0x7; + public int getDragDepth() { + return this.events >> 18 & 0x7; } @OriginalMember(owner = "client!ofa", name = "d", descriptor = "(I)Z") - public boolean method6219() { - return (this.anInt6909 & 0x1) != 0; + public boolean isResumePauseButtonEnabled() { + return (this.events & 0x1) != 0; } @OriginalMember(owner = "client!ofa", name = "a", descriptor = "(I)Z") - public boolean method6220() { - return (this.anInt6909 >> 21 & 0x1) != 0; + public boolean isDragTarget() { + return (this.events >> 21 & 0x1) != 0; } @OriginalMember(owner = "client!ofa", name = "a", descriptor = "(BI)Z") - public boolean method6221(@OriginalArg(1) int arg0) { - return (this.anInt6909 >> arg0 + 1 & 0x1) != 0; + public boolean isButtonEnabled(@OriginalArg(1) int button) { + return (this.events >> button + 1 & 0x1) != 0; } } diff --git a/client/src/main/java/SignLinkAudioChannel.java b/client/src/main/java/SignLinkAudioChannel.java index 276338d..8943275 100644 --- a/client/src/main/java/SignLinkAudioChannel.java +++ b/client/src/main/java/SignLinkAudioChannel.java @@ -17,7 +17,7 @@ public SignLinkAudioChannel(@OriginalArg(0) Signlink arg0, @OriginalArg(1) int a @OriginalMember(owner = "client!hq", name = "b", descriptor = "(I)V") @Override - public void method3588(@OriginalArg(0) int arg0) throws Exception { + public void open(@OriginalArg(0) int arg0) throws Exception { if (arg0 > 32768) { throw new IllegalArgumentException(); } @@ -38,14 +38,14 @@ protected void method3583() { @OriginalMember(owner = "client!hq", name = "a", descriptor = "(Ljava/awt/Component;)V") @Override - public void method3593(@OriginalArg(0) Component arg0) throws Exception { - Static253.anInterface7_1.method4096(Static686.anInt8944, Static316.aBoolean644, arg0); + public void init(@OriginalArg(0) Component arg0) throws Exception { + Static253.anInterface7_1.method4096(Static686.sampleRate, Static316.stereo, arg0); } @OriginalMember(owner = "client!hq", name = "b", descriptor = "()V") @Override protected void method3590() { - Static253.anInterface7_1.method4098(this.anInt4104, super.anIntArray315); + Static253.anInterface7_1.method4098(this.anInt4104, super.samples); } @OriginalMember(owner = "client!hq", name = "c", descriptor = "()V") diff --git a/client/src/main/java/Signlink.java b/client/src/main/java/Signlink.java index 6d9dc13..4255467 100644 --- a/client/src/main/java/Signlink.java +++ b/client/src/main/java/Signlink.java @@ -25,13 +25,13 @@ public final class Signlink implements Runnable { public FileOnDisk aFileOnDisk2 = null; @OriginalMember(owner = "client!vq", name = "l", descriptor = "Lclient!oba;") - private PrivilegedRequest aPrivilegedRequest8 = null; + private PrivilegedRequest requestQueueHead = null; @OriginalMember(owner = "client!vq", name = "F", descriptor = "Z") private boolean isShuttingDown = false; @OriginalMember(owner = "client!vq", name = "h", descriptor = "Lclient!oba;") - private PrivilegedRequest aPrivilegedRequest9 = null; + private PrivilegedRequest requestQueueTail = null; @OriginalMember(owner = "client!vq", name = "i", descriptor = "Lclient!dm;") public FileOnDisk aFileOnDisk4 = null; @@ -182,33 +182,33 @@ public Object method8976() { } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(IIIII)Lclient!oba;") - public PrivilegedRequest method8977(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { - return this.method8993(arg0 << 16, 6, (Object) null, (arg2 << 16) + arg1); + public PrivilegedRequest enterFullScreen(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { + return this.enqueue(arg0 << 16, 6, (Object) null, (arg2 << 16) + arg1); } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(Ljava/lang/Class;Ljava/lang/String;I)Lclient!oba;") - public PrivilegedRequest method8978(@OriginalArg(0) Class arg0, @OriginalArg(1) String arg1) { - return this.method8993(0, 9, new Object[] { arg0, arg1 }, 0); + public PrivilegedRequest getDeclaredField(@OriginalArg(0) Class arg0, @OriginalArg(1) String arg1) { + return this.enqueue(0, 9, new Object[] { arg0, arg1 }, 0); } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(Ljava/lang/String;ZZI)Lclient!oba;") public PrivilegedRequest method8979(@OriginalArg(0) String arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2) { - return this.method8993(0, arg1 ? 22 : 1, arg0, arg2); + return this.enqueue(0, arg1 ? 22 : 1, arg0, arg2); } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(ZLjava/lang/String;B)Lclient!oba;") - public PrivilegedRequest method8981(@OriginalArg(1) String arg0) { - return this.method8993(0, 12, arg0, 0); + public PrivilegedRequest openPreferences(@OriginalArg(1) String arg0) { + return this.enqueue(0, 12, arg0, 0); } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(BI)Lclient!oba;") - public PrivilegedRequest method8982(@OriginalArg(1) int arg0) { - return this.method8993(0, 3, (Object) null, arg0); + public PrivilegedRequest getReverseDns(@OriginalArg(1) int arg0) { + return this.enqueue(0, 3, (Object) null, arg0); } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(B)Lclient!oba;") - public PrivilegedRequest method8984() { - return this.method8993(0, 5, (Object) null, 0); + public PrivilegedRequest getDisplayModes() { + return this.enqueue(0, 5, (Object) null, 0); } @OriginalMember(owner = "client!vq", name = "b", descriptor = "(I)V") @@ -257,8 +257,8 @@ public void shutDown() { } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(Ljava/lang/String;B)Lclient!oba;") - public PrivilegedRequest method8986(@OriginalArg(0) String arg0) { - return this.method8993(0, 16, arg0, 0); + public PrivilegedRequest openUrl(@OriginalArg(0) String arg0) { + return this.enqueue(0, 16, arg0, 0); } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(Ljava/io/File;I[B)Z") @@ -274,13 +274,13 @@ public boolean method8987(@OriginalArg(0) File arg0, @OriginalArg(2) byte[] arg1 } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(Ljava/lang/Class;[Ljava/lang/Class;Ljava/lang/String;Z)Lclient!oba;") - public PrivilegedRequest method8988(@OriginalArg(0) Class arg0, @OriginalArg(1) Class[] arg1, @OriginalArg(2) String arg2) { - return this.method8993(0, 8, new Object[] { arg0, arg2, arg1 }, 0); + public PrivilegedRequest getDeclaredMethod(@OriginalArg(0) Class arg0, @OriginalArg(1) Class[] arg1, @OriginalArg(2) String arg2) { + return this.enqueue(0, 8, new Object[] { arg0, arg2, arg1 }, 0); } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(Ljava/awt/Frame;I)Lclient!oba;") - public PrivilegedRequest method8989(@OriginalArg(0) Frame arg0) { - return this.method8993(0, 7, arg0, 0); + public PrivilegedRequest exitFullScreen(@OriginalArg(0) Frame arg0) { + return this.enqueue(0, 7, arg0, 0); } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(I)Z") @@ -295,28 +295,28 @@ public boolean method8990() { } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(BLjava/lang/Runnable;I)Lclient!oba;") - public PrivilegedRequest method8991(@OriginalArg(1) Runnable arg0, @OriginalArg(2) int arg1) { - return this.method8993(0, 2, arg0, arg1); + public PrivilegedRequest startThread(@OriginalArg(1) Runnable arg0, @OriginalArg(2) int arg1) { + return this.enqueue(0, 2, arg0, arg1); } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(BLjava/net/URL;)Lclient!oba;") - public PrivilegedRequest method8992(@OriginalArg(1) URL arg0) { - return this.method8993(0, 4, arg0, 0); + public PrivilegedRequest openUrlStream(@OriginalArg(1) URL arg0) { + return this.enqueue(0, 4, arg0, 0); } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(IILjava/lang/Object;II)Lclient!oba;") - private PrivilegedRequest method8993(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Object arg2, @OriginalArg(4) int arg3) { + private PrivilegedRequest enqueue(@OriginalArg(0) int intArg1, @OriginalArg(1) int type, @OriginalArg(2) Object objectArg, @OriginalArg(4) int intArg2) { @Pc(3) PrivilegedRequest local3 = new PrivilegedRequest(); - local3.anObject12 = arg2; - local3.anInt6788 = arg3; - local3.anInt6790 = arg1; - local3.anInt6787 = arg0; + local3.objectArg = objectArg; + local3.intArg2 = intArg2; + local3.type = type; + local3.intArg1 = intArg1; synchronized (this) { - if (this.aPrivilegedRequest9 == null) { - this.aPrivilegedRequest9 = this.aPrivilegedRequest8 = local3; + if (this.requestQueueTail == null) { + this.requestQueueTail = this.requestQueueHead = local3; } else { - this.aPrivilegedRequest9.aPrivilegedRequest5 = local3; - this.aPrivilegedRequest9 = local3; + this.requestQueueTail.next = local3; + this.requestQueueTail = local3; } this.notify(); return local3; @@ -325,12 +325,12 @@ private PrivilegedRequest method8993(@OriginalArg(0) int arg0, @OriginalArg(1) i @OriginalMember(owner = "client!vq", name = "b", descriptor = "(B)V") public void method8994() { - Static689.aLong317 = Static588.currentTimeWithDrift() + 5000L; + Static689.breakConnectionsUntil = Static588.currentTimeWithDrift() + 5000L; } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(IB[ILjava/awt/Component;Ljava/awt/Point;I)Lclient!oba;") - public PrivilegedRequest method8995(@OriginalArg(0) int arg0, @OriginalArg(2) int[] arg1, @OriginalArg(3) Component arg2, @OriginalArg(4) Point arg3, @OriginalArg(5) int arg4) { - return this.method8993(arg0, 17, new Object[] { arg2, arg1, arg3 }, arg4); + public PrivilegedRequest setCursor(@OriginalArg(0) int arg0, @OriginalArg(2) int[] arg1, @OriginalArg(3) Component arg2, @OriginalArg(4) Point arg3, @OriginalArg(5) int arg4) { + return this.enqueue(arg0, 17, new Object[] { arg2, arg1, arg3 }, arg4); } @OriginalMember(owner = "client!vq", name = "run", descriptor = "()V") @@ -343,11 +343,11 @@ public void run() { if (this.isShuttingDown) { return; } - if (this.aPrivilegedRequest8 != null) { - local15 = this.aPrivilegedRequest8; - this.aPrivilegedRequest8 = this.aPrivilegedRequest8.aPrivilegedRequest5; - if (this.aPrivilegedRequest8 == null) { - this.aPrivilegedRequest9 = null; + if (this.requestQueueHead != null) { + local15 = this.requestQueueHead; + this.requestQueueHead = this.requestQueueHead.next; + if (this.requestQueueHead == null) { + this.requestQueueTail = null; } break; } @@ -358,115 +358,115 @@ public void run() { } } try { - @Pc(42) int local42 = local15.anInt6790; + @Pc(42) int local42 = local15.type; if (local42 == 1) { - if (Static588.currentTimeWithDrift() < Static689.aLong317) { + if (Static588.currentTimeWithDrift() < Static689.breakConnectionsUntil) { throw new IOException(); } - local15.anObject13 = new Socket(InetAddress.getByName((String) local15.anObject12), local15.anInt6788); + local15.result = new Socket(InetAddress.getByName((String) local15.objectArg), local15.intArg2); } else if (local42 == 22) { - if (Static689.aLong317 > Static588.currentTimeWithDrift()) { + if (Static689.breakConnectionsUntil > Static588.currentTimeWithDrift()) { throw new IOException(); } try { - local15.anObject13 = Static327.method4894((String) local15.anObject12, local15.anInt6788).method6097(); + local15.result = Static327.method4894((String) local15.objectArg, local15.intArg2).method6097(); } catch (@Pc(947) IOException_Sub1 local947) { - local15.anObject13 = local947.getMessage(); + local15.result = local947.getMessage(); throw local947; } } else if (local42 == 2) { - @Pc(911) Thread local911 = new Thread((Runnable) local15.anObject12); + @Pc(911) Thread local911 = new Thread((Runnable) local15.objectArg); local911.setDaemon(true); local911.start(); - local911.setPriority(local15.anInt6788); - local15.anObject13 = local911; + local911.setPriority(local15.intArg2); + local15.result = local911; } else if (local42 == 4) { - if (Static588.currentTimeWithDrift() < Static689.aLong317) { + if (Static588.currentTimeWithDrift() < Static689.breakConnectionsUntil) { throw new IOException(); } - local15.anObject13 = new DataInputStream(((URL) local15.anObject12).openStream()); + local15.result = new DataInputStream(((URL) local15.objectArg).openStream()); } else { @Pc(102) Object[] local102; if (local42 == 8) { - local102 = (Object[]) local15.anObject12; + local102 = (Object[]) local15.objectArg; if (this.aBoolean781 && ((Class) local102[0]).getClassLoader() == null) { throw new SecurityException(); } - local15.anObject13 = ((Class) local102[0]).getDeclaredMethod((String) local102[1], (Class[]) local102[2]); + local15.result = ((Class) local102[0]).getDeclaredMethod((String) local102[1], (Class[]) local102[2]); } else if (local42 == 9) { - local102 = (Object[]) local15.anObject12; + local102 = (Object[]) local15.objectArg; if (this.aBoolean781 && ((Class) local102[0]).getClassLoader() == null) { throw new SecurityException(); } - local15.anObject13 = ((Class) local102[0]).getDeclaredField((String) local102[1]); + local15.result = ((Class) local102[0]).getDeclaredField((String) local102[1]); } else if (local42 == 18) { @Pc(136) Clipboard local136 = Toolkit.getDefaultToolkit().getSystemClipboard(); - local15.anObject13 = local136.getContents((Object) null); + local15.result = local136.getContents((Object) null); } else if (local42 == 19) { - @Pc(149) Transferable local149 = (Transferable) local15.anObject12; + @Pc(149) Transferable local149 = (Transferable) local15.objectArg; @Pc(152) Clipboard local152 = Toolkit.getDefaultToolkit().getSystemClipboard(); local152.setContents(local149, (ClipboardOwner) null); } else if (this.aBoolean781) { @Pc(220) String local220; if (local42 == 3) { - if (Static588.currentTimeWithDrift() < Static689.aLong317) { + if (Static588.currentTimeWithDrift() < Static689.breakConnectionsUntil) { throw new IOException(); } - local220 = (local15.anInt6788 >> 24 & 0xFF) + "." + (local15.anInt6788 >> 16 & 0xFF) + "." + (local15.anInt6788 >> 8 & 0xFF) + "." + (local15.anInt6788 & 0xFF); - local15.anObject13 = InetAddress.getByName(local220).getHostName(); + local220 = (local15.intArg2 >> 24 & 0xFF) + "." + (local15.intArg2 >> 16 & 0xFF) + "." + (local15.intArg2 >> 8 & 0xFF) + "." + (local15.intArg2 & 0xFF); + local15.result = InetAddress.getByName(local220).getHostName(); } else if (local42 == 21) { - if (Static588.currentTimeWithDrift() < Static689.aLong317) { + if (Static588.currentTimeWithDrift() < Static689.breakConnectionsUntil) { throw new IOException(); } - local15.anObject13 = InetAddress.getByName((String) local15.anObject12).getAddress(); + local15.result = InetAddress.getByName((String) local15.objectArg).getAddress(); } else if (local42 == 5) { if (this.aBoolean779) { - local15.anObject13 = this.aClass15_1.method250(); + local15.result = this.aClass15_1.listmodes(); } else { - local15.anObject13 = Class.forName("Class66").getMethod("listmodes").invoke(this.anObject19); + local15.result = Class.forName("Class66").getMethod("listmodes").invoke(this.anObject19); } } else if (local42 == 6) { @Pc(268) Frame local268 = new Frame("Jagex Full Screen"); - local15.anObject13 = local268; + local15.result = local268; local268.setResizable(false); if (this.aBoolean779) { - this.aClass15_1.method248(local268, local15.anInt6787 >> 16, local15.anInt6787 & 0xFFFF, local15.anInt6788 & 0xFFFF, local15.anInt6788 >>> 16); + this.aClass15_1.enter(local268, local15.intArg1 >> 16, local15.intArg1 & 0xFFFF, local15.intArg2 & 0xFFFF, local15.intArg2 >>> 16); } else { - Class.forName("Class66").getMethod("enter", Static689.aClass24 == null ? (Static689.aClass24 = Class.forName("java.awt.Frame")) : Static689.aClass24, Integer.TYPE, Integer.TYPE, Integer.TYPE, Integer.TYPE).invoke(this.anObject19, local268, Integer.valueOf(local15.anInt6788 >>> 16), new Integer(local15.anInt6788 & 0xFFFF), Integer.valueOf(local15.anInt6787 >> 16), new Integer(local15.anInt6787 & 0xFFFF)); + Class.forName("Class66").getMethod("enter", Static689.aClass24 == null ? (Static689.aClass24 = Class.forName("java.awt.Frame")) : Static689.aClass24, Integer.TYPE, Integer.TYPE, Integer.TYPE, Integer.TYPE).invoke(this.anObject19, local268, Integer.valueOf(local15.intArg2 >>> 16), new Integer(local15.intArg2 & 0xFFFF), Integer.valueOf(local15.intArg1 >> 16), new Integer(local15.intArg1 & 0xFFFF)); } } else if (local42 != 7) { @Pc(438) FileOnDisk local438; if (local42 == 12) { - local438 = Static689.method8980(Static689.aString122, Static689.anInt10357, (String) local15.anObject12); - local15.anObject13 = local438; + local438 = Static689.method8980(Static689.aString122, Static689.anInt10357, (String) local15.objectArg); + local15.result = local438; } else if (local42 == 13) { - local438 = Static689.method8980("", Static689.anInt10357, (String) local15.anObject12); - local15.anObject13 = local438; + local438 = Static689.method8980("", Static689.anInt10357, (String) local15.objectArg); + local15.result = local438; } else if (this.aBoolean781 && local42 == 14) { - @Pc(460) int local460 = local15.anInt6788; - @Pc(463) int local463 = local15.anInt6787; + @Pc(460) int local460 = local15.intArg2; + @Pc(463) int local463 = local15.intArg1; if (this.aBoolean779) { - this.aWin32Callback.method6431(local460, local463); + this.aWin32Callback.moveMouse(local460, local463); } else { Class.forName("Class238").getDeclaredMethod("moveMouse", Integer.TYPE, Integer.TYPE).invoke(this.anObject20, Integer.valueOf(local460), new Integer(local463)); } } else if (this.aBoolean781 && local42 == 15) { - @Pc(534) boolean local534 = local15.anInt6788 != 0; - @Pc(538) Component local538 = (Component) local15.anObject12; + @Pc(534) boolean local534 = local15.intArg2 != 0; + @Pc(538) Component local538 = (Component) local15.objectArg; if (this.aBoolean779) { - this.aWin32Callback.method6432(local534, local538); + this.aWin32Callback.showCursor(local534, local538); } else { Class.forName("Class238").getDeclaredMethod("showCursor", Static689.aClass25 == null ? (Static689.aClass25 = Class.forName("java.awt.Component")) : Static689.aClass25, Boolean.TYPE).invoke(this.anObject20, local538, Boolean.valueOf(local534)); } } else if (!this.aBoolean779 && local42 == 17) { - local102 = (Object[]) local15.anObject12; - Class.forName("Class238").getDeclaredMethod("setCustomCursor", Static689.aClass25 == null ? (Static689.aClass25 = Class.forName("java.awt.Component")) : Static689.aClass25, Static689.aClass26 == null ? (Static689.aClass26 = Class.forName("[I")) : Static689.aClass26, Integer.TYPE, Integer.TYPE, Static689.aClass27 == null ? (Static689.aClass27 = Class.forName("java.awt.Point")) : Static689.aClass27).invoke(this.anObject20, (Component) local102[0], (int[]) local102[1], Integer.valueOf(local15.anInt6788), new Integer(local15.anInt6787), (Point) local102[2]); + local102 = (Object[]) local15.objectArg; + Class.forName("Class238").getDeclaredMethod("setCustomCursor", Static689.aClass25 == null ? (Static689.aClass25 = Class.forName("java.awt.Component")) : Static689.aClass25, Static689.aClass26 == null ? (Static689.aClass26 = Class.forName("[I")) : Static689.aClass26, Integer.TYPE, Integer.TYPE, Static689.aClass27 == null ? (Static689.aClass27 = Class.forName("java.awt.Point")) : Static689.aClass27).invoke(this.anObject20, (Component) local102[0], (int[]) local102[1], Integer.valueOf(local15.intArg2), new Integer(local15.intArg1), (Point) local102[2]); } else if (local42 == 16) { try { if (!Static689.osName.startsWith("win")) { throw new Exception(); } - local220 = (String) local15.anObject12; + local220 = (String) local15.objectArg; if (!local220.startsWith("http://") && !local220.startsWith("https://")) { throw new Exception(); } @@ -477,16 +477,16 @@ public void run() { } } Runtime.getRuntime().exec("cmd /c start \"j\" \"" + local220 + "\""); - local15.anObject13 = null; + local15.result = null; } catch (@Pc(793) Exception local793) { - local15.anObject13 = local793; + local15.result = local793; throw local793; } } else { throw new Exception(""); } } else if (this.aBoolean779) { - this.aClass15_1.method249((Frame) local15.anObject12); + this.aClass15_1.method249((Frame) local15.objectArg); } else { Class.forName("Class66").getMethod("exit").invoke(this.anObject19); } diff --git a/client/src/main/java/SoundPcmStream.java b/client/src/main/java/SoundPcmStream.java index 421043d..d301b39 100644 --- a/client/src/main/java/SoundPcmStream.java +++ b/client/src/main/java/SoundPcmStream.java @@ -69,12 +69,12 @@ private int method3309(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @Or do { if (this.anInt3684 <= 0) { if (this.anInt3679 == -256 && (this.anInt3686 & 0xFF) == 0) { - if (Static316.aBoolean644) { + if (Static316.stereo) { return Static730.method3334(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3680, this.anInt3677, arg3, arg2, this); } return Static730.method3343(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3676, arg3, arg2, this); } - if (Static316.aBoolean644) { + if (Static316.stereo) { return Static730.method3324(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3680, this.anInt3677, arg3, arg2, this, this.anInt3679, arg4); } return Static730.method3339(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3676, arg3, arg2, this, this.anInt3679, arg4); @@ -85,12 +85,12 @@ private int method3309(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @Or } this.anInt3684 += arg1; if (this.anInt3679 == -256 && (this.anInt3686 & 0xFF) == 0) { - if (Static316.aBoolean644) { + if (Static316.stereo) { arg1 = Static730.method3342(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3680, this.anInt3677, this.anInt3683, this.anInt3687, local5, arg2, this); } else { arg1 = Static730.method3332(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3676, this.anInt3678, local5, arg2, this); } - } else if (Static316.aBoolean644) { + } else if (Static316.stereo) { arg1 = Static730.method3326(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3680, this.anInt3677, this.anInt3683, this.anInt3687, local5, arg2, this, this.anInt3679, arg4); } else { arg1 = Static730.method3347(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3676, this.anInt3678, local5, arg2, this, this.anInt3679, arg4); @@ -284,12 +284,12 @@ private int method3317(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @Or do { if (this.anInt3684 <= 0) { if (this.anInt3679 == 256 && (this.anInt3686 & 0xFF) == 0) { - if (Static316.aBoolean644) { + if (Static316.stereo) { return Static730.method3329(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3680, this.anInt3677, arg3, arg2, this); } return Static730.method3310(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3676, arg3, arg2, this); } - if (Static316.aBoolean644) { + if (Static316.stereo) { return Static730.method3312(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3680, this.anInt3677, arg3, arg2, this, this.anInt3679, arg4); } return Static730.method3316(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3676, arg3, arg2, this, this.anInt3679, arg4); @@ -300,12 +300,12 @@ private int method3317(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @Or } this.anInt3684 += arg1; if (this.anInt3679 == 256 && (this.anInt3686 & 0xFF) == 0) { - if (Static316.aBoolean644) { + if (Static316.stereo) { arg1 = Static730.method3325(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3680, this.anInt3677, this.anInt3683, this.anInt3687, local5, arg2, this); } else { arg1 = Static730.method3321(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3676, this.anInt3678, local5, arg2, this); } - } else if (Static316.aBoolean644) { + } else if (Static316.stereo) { arg1 = Static730.method3313(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3680, this.anInt3677, this.anInt3683, this.anInt3687, local5, arg2, this, this.anInt3679, arg4); } else { arg1 = Static730.method3331(((PcmSound) super.aClass2_Sub49_6).aByteArray98, arg0, this.anInt3686, arg1, this.anInt3676, this.anInt3678, local5, arg2, this, this.anInt3679, arg4); diff --git a/client/src/main/java/Static102.java b/client/src/main/java/Static102.java index c072bd0..7bb2f51 100644 --- a/client/src/main/java/Static102.java +++ b/client/src/main/java/Static102.java @@ -60,7 +60,7 @@ public static boolean method2026(@OriginalArg(0) Entity arg0, @OriginalArg(1) bo @Pc(48) int local48; for (@Pc(44) int local44 = arg0.aShort131; local44 <= arg0.aShort134; local44++) { for (local48 = arg0.aShort132; local48 <= arg0.aShort133; local48++) { - @Pc(55) Class291 local55 = Static347.method5095(arg0.aByte144, local44, local48); + @Pc(55) Class291 local55 = Static347.method5095(arg0.plane, local44, local48); if (local55 != null) { @Pc(61) Class286 local61 = Static223.method9095(arg0); @Pc(64) Class286 local64 = local55.aClass286_2; diff --git a/client/src/main/java/Static104.java b/client/src/main/java/Static104.java index 28a5bf6..361e041 100644 --- a/client/src/main/java/Static104.java +++ b/client/src/main/java/Static104.java @@ -30,15 +30,15 @@ public static void method2029(@OriginalArg(1) String arg0) { Connection.lobbyConnection.queue(local6); Static580.anInt8621 = -3; Static654.anInt9739 = 0; - Static6.anInt95 = 1; + Static6.step = 1; Static720.anInt10865 = 0; } @OriginalMember(owner = "client!de", name = "b", descriptor = "(B)V") public static void method2033() { Static425.aClass19_13.xa(((float) Static400.aClass2_Sub34_28.aPreference_Sub22_1.method6769() * 0.1F + 0.7F) * 1.1523438F); - Static425.aClass19_13.ZA(Static68.anInt4096, 0.69921875F, 1.2F, -200.0F, -240.0F, -200.0F); - Static425.aClass19_13.L(Static563.anInt8460, -1, 0); + Static425.aClass19_13.ZA(Static68.defaultLightColorRgb, 0.69921875F, 1.2F, -200.0F, -240.0F, -200.0F); + Static425.aClass19_13.L(Static563.defaulFogColorRgb, -1, 0); Static425.aClass19_13.method7973(Static226.aClass67_9); } } diff --git a/client/src/main/java/Static106.java b/client/src/main/java/Static106.java index 2149113..7a87a2b 100644 --- a/client/src/main/java/Static106.java +++ b/client/src/main/java/Static106.java @@ -7,15 +7,15 @@ public final class Static106 { public static int anInt2153; @OriginalMember(owner = "client!dfa", name = "d", descriptor = "[Lclient!pq;") - public static World[] aClass297_Sub1Array1; + public static World[] worlds; @OriginalMember(owner = "client!dfa", name = "a", descriptor = "Lclient!av;") public static final HashTable aHashTable11 = new HashTable(4); @OriginalMember(owner = "client!dfa", name = "a", descriptor = "(ILclient!ha;)V") public static void method2046(@OriginalArg(1) Class19 arg0) { - if (Static643.anInt9604 != Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 && (Static334.aClass291ArrayArrayArray1 != null && Static484.method6494(arg0, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144))) { - Static643.anInt9604 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144; + if (Static643.anInt9604 != Static556.self.plane && (Static334.aClass291ArrayArrayArray1 != null && Static484.method6494(arg0, Static556.self.plane))) { + Static643.anInt9604 = Static556.self.plane; } } diff --git a/client/src/main/java/Static110.java b/client/src/main/java/Static110.java index aaaa163..53ebe0d 100644 --- a/client/src/main/java/Static110.java +++ b/client/src/main/java/Static110.java @@ -15,11 +15,11 @@ public final class Static110 { @OriginalMember(owner = "client!dha", name = "a", descriptor = "(IZ)V") public static void method2079(@OriginalArg(0) int arg0) { - @Pc(7) int local7 = Static333.anInt5455 - Static212.anInt3468; + @Pc(7) int local7 = Static333.loop - Static212.anInt3468; if (local7 >= 100) { Static693.anInt10383 = -1; Static692.anInt10376 = -1; - Static511.anInt7645 = 1; + Static511.cameraType = 1; return; } @Pc(28) int local28 = (int) Static479.aFloat123; @@ -30,20 +30,20 @@ public static void method2079(@OriginalArg(0) int arg0) { local28 = Static140.anIntArray222[4] + 128; } @Pc(63) int local63 = (int) Static171.aFloat64 + Static288.anInt4621 & 0x3FFF; - Static292.method4606(local28, (local28 >> 3) * 3 + 600 << 2, arg0, Static494.anInt7409, local63, Static38.anInt920, Static102.method2025(Static394.anInt6176, -29754, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690) - 200); + Static292.method4606(local28, (local28 >> 3) * 3 + 600 << 2, arg0, Static494.anInt7409, local63, Static38.anInt920, Static102.method2025(Static394.anInt6176, -29754, Static556.self.zFine, Static556.self.xFine) - 200); @Pc(107) float local107 = 1.0F - (float) ((100 - local7) * (-local7 + 100) * (100 - local7)) / 1000000.0F; Static170.anInt2864 = (int) ((float) Static70.anInt1569 + (float) (Static170.anInt2864 - Static70.anInt1569) * local107); Static359.anInt5801 = (int) ((float) (Static359.anInt5801 - Static302.anInt4854) * local107 + (float) Static302.anInt4854); anInt2186 = (int) (local107 * (float) (anInt2186 - Static411.anInt6329) + (float) Static411.anInt6329); Static598.anInt8832 = (int) ((float) (Static598.anInt8832 - Static340.anInt5584) * local107 + (float) Static340.anInt5584); - @Pc(160) int local160 = Static323.anInt5119 - Static225.anInt3641; + @Pc(160) int local160 = Static323.cameraYaw - Static225.anInt3641; if (local160 > 8192) { local160 -= 16384; } else if (local160 < -8192) { local160 += 16384; } - Static323.anInt5119 = (int) ((float) Static225.anInt3641 + (float) local160 * local107); - Static323.anInt5119 &= 0x3FFF; + Static323.cameraYaw = (int) ((float) Static225.anInt3641 + (float) local160 * local107); + Static323.cameraYaw &= 0x3FFF; } @OriginalMember(owner = "client!dha", name = "a", descriptor = "(Lclient!sb;I)V") diff --git a/client/src/main/java/Static112.java b/client/src/main/java/Static112.java index 0fa5d87..563f973 100644 --- a/client/src/main/java/Static112.java +++ b/client/src/main/java/Static112.java @@ -28,8 +28,8 @@ public static int method2104(@OriginalArg(1) PathingEntity arg0) { local24 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[arg0.anInt10722 - 32768]; } if (local24 != null) { - local67 = arg0.anInt10690 - local24.anInt10690; - local74 = arg0.anInt10694 - local24.anInt10694; + local67 = arg0.xFine - local24.xFine; + local74 = arg0.zFine - local24.zFine; if (local67 != 0 || local74 != 0) { arg0.method9305((int) (Math.atan2((double) local67, (double) local74) * 2607.5945876176133D) & 0x3FFF); } @@ -44,8 +44,8 @@ public static int method2104(@OriginalArg(1) PathingEntity arg0) { } else if (arg0 instanceof Npc) { @Pc(138) Npc local138 = (Npc) arg0; if (local138.anInt10774 != -1 && (local138.anInt10764 == 0 || local138.anInt10763 > 0)) { - local67 = local138.anInt10690 - (local138.anInt10774 - Static691.anInt10367 - Static691.anInt10367) * 256; - local74 = local138.anInt10694 - (local138.anInt10767 - Static116.anInt2270 - Static116.anInt2270) * 256; + local67 = local138.xFine - (local138.anInt10774 - Static691.originX - Static691.originX) * 256; + local74 = local138.zFine - (local138.anInt10767 - Static116.originZ - Static116.originZ) * 256; if (local67 != 0 || local74 != 0) { local138.method9305((int) (Math.atan2((double) local67, (double) local74) * 2607.5945876176133D) & 0x3FFF); } diff --git a/client/src/main/java/Static113.java b/client/src/main/java/Static113.java index ec020ea..d1aa48f 100644 --- a/client/src/main/java/Static113.java +++ b/client/src/main/java/Static113.java @@ -34,12 +34,12 @@ public static void method2121(@OriginalArg(0) byte[] arg0, @OriginalArg(2) boole return; } Static681.method8919(Static339.aPacket_9.data); - Static343.aClass297_Sub1Array2 = new World[Static476.anInt7177]; + Static343.sorted = new World[Static476.size]; @Pc(31) int local31 = 0; - for (@Pc(33) int local33 = Static494.anInt7396; local33 <= Static699.anInt10532; local33++) { - @Pc(38) World local38 = Static615.method8260(local33); + for (@Pc(33) int local33 = Static494.minId; local33 <= Static699.maxId; local33++) { + @Pc(38) World local38 = Static615.getWorld(local33); if (local38 != null) { - Static343.aClass297_Sub1Array2[local31++] = local38; + Static343.sorted[local31++] = local38; } } Static149.aBoolean221 = false; diff --git a/client/src/main/java/Static114.java b/client/src/main/java/Static114.java index b2225f2..1693985 100644 --- a/client/src/main/java/Static114.java +++ b/client/src/main/java/Static114.java @@ -13,21 +13,21 @@ public static void method2132(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 if ((long) local16 > arg2) { return; } - @Pc(37) int local37 = Math.min(arg7.anInt3802 / 2, arg7.anInt3746 / 2); + @Pc(37) int local37 = Math.min(arg7.width / 2, arg7.height / 2); if (local16 <= local37 * local37) { Static6.method107(arg5, arg3, Static174.aSoftwareIndexedSpriteArray4[arg4], arg6, arg0, arg7, arg1); return; } local37 -= 10; @Pc(64) int local64; - if (Static511.anInt7645 == 4) { + if (Static511.cameraType == 4) { local64 = (int) Static171.aFloat64 & 0x3FFF; } else { local64 = Static29.anInt723 + (int) Static171.aFloat64 & 0x3FFF; } @Pc(77) int local77 = Model.anIntArray741[local64]; @Pc(81) int local81 = Model.anIntArray740[local64]; - if (Static511.anInt7645 != 4) { + if (Static511.cameraType != 4) { local81 = local81 * 256 / (Static660.anInt9835 + 256); local77 = local77 * 256 / (Static660.anInt9835 + 256); } @@ -36,7 +36,7 @@ public static void method2132(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 @Pc(129) double local129 = Math.atan2((double) local112, (double) local123); @Pc(136) int local136 = (int) ((double) local37 * Math.sin(local129)); @Pc(143) int local143 = (int) ((double) local37 * Math.cos(local129)); - Static558.aSoftwareIndexedSpriteArray7[arg4].method8186((float) local136 + (float) arg7.anInt3802 / 2.0F + (float) arg1, (float) -local143 + (float) arg7.anInt3746 / 2.0F + (float) arg5, 4096, (int) (-local129 / 6.283185307179586D * 65535.0D)); + Static558.aSoftwareIndexedSpriteArray7[arg4].method8186((float) local136 + (float) arg7.width / 2.0F + (float) arg1, (float) -local143 + (float) arg7.height / 2.0F + (float) arg5, 4096, (int) (-local129 / 6.283185307179586D * 65535.0D)); } @OriginalMember(owner = "client!dk", name = "a", descriptor = "(III)Lclient!tla;") diff --git a/client/src/main/java/Static115.java b/client/src/main/java/Static115.java index 6f2ca57..1c1633c 100644 --- a/client/src/main/java/Static115.java +++ b/client/src/main/java/Static115.java @@ -31,12 +31,12 @@ public static void method2136(@OriginalArg(1) int arg0) { if (local32 == null) { arg0 = -1; } else { - Static446.aSignlink6.method8995(local32.method9384(), local32.method9383(), Static434.aCanvas7, new Point(local28.anInt10303, local28.anInt10308), local32.method9378()); + Static446.aSignlink6.setCursor(local32.method9384(), local32.method9383(), Static434.canvas, new Point(local28.anInt10303, local28.anInt10308), local32.method9378()); Static470.anInt7112 = arg0; } } if (arg0 == -1 && Static470.anInt7112 != -1) { - Static446.aSignlink6.method8995(-1, (int[]) null, Static434.aCanvas7, new Point(), -1); + Static446.aSignlink6.setCursor(-1, (int[]) null, Static434.canvas, new Point(), -1); Static470.anInt7112 = -1; } } diff --git a/client/src/main/java/Static116.java b/client/src/main/java/Static116.java index eec97be..efbbc17 100644 --- a/client/src/main/java/Static116.java +++ b/client/src/main/java/Static116.java @@ -7,7 +7,7 @@ public final class Static116 { public static int anInt2268; @OriginalMember(owner = "client!dl", name = "k", descriptor = "I") - public static int anInt2270; + public static int originZ; @OriginalMember(owner = "client!dl", name = "a", descriptor = "(III)Z") public static boolean method2142(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { diff --git a/client/src/main/java/Static120.java b/client/src/main/java/Static120.java index 36b2005..40c424d 100644 --- a/client/src/main/java/Static120.java +++ b/client/src/main/java/Static120.java @@ -11,67 +11,67 @@ public static void method2193(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1 if (local8 == null) { return; } - if (local8.anObjectArray15 != null) { + if (local8.onOptionClick != null) { @Pc(19) Linkable_Sub42 local19 = new Linkable_Sub42(); - local19.anObjectArray36 = local8.anObjectArray15; + local19.anObjectArray36 = local8.onOptionClick; local19.anInt7219 = arg3; local19.aString84 = arg2; local19.aComponent14 = local8; Static472.method6420(local19); } - if (Static283.gameState != 11 || !Static84.method1661(local8).method6221(arg3 - 1)) { + if (Static283.gameState != 11 || !Static84.getServerActiveProperties(local8).isButtonEnabled(arg3 - 1)) { return; } @Pc(64) OutboundPacket local64; if (arg3 == 1) { local64 = OutboundPacket.create(Static546.aClientProt98, Connection.gameConnection.random); - Static277.method4040(arg0, local8.anInt3760, local64, arg1); + Static277.method4040(arg0, local8.objId, local64, arg1); Connection.gameConnection.queue(local64); } if (arg3 == 2) { local64 = OutboundPacket.create(Static323.aClientProt65, Connection.gameConnection.random); - Static277.method4040(arg0, local8.anInt3760, local64, arg1); + Static277.method4040(arg0, local8.objId, local64, arg1); Connection.gameConnection.queue(local64); } if (arg3 == 3) { local64 = OutboundPacket.create(Static255.aClientProt54, Connection.gameConnection.random); - Static277.method4040(arg0, local8.anInt3760, local64, arg1); + Static277.method4040(arg0, local8.objId, local64, arg1); Connection.gameConnection.queue(local64); } @Pc(148) OutboundPacket local148; if (arg3 == 4) { local148 = OutboundPacket.create(Static710.aClientProt93, Connection.gameConnection.random); - Static277.method4040(arg0, local8.anInt3760, local148, arg1); + Static277.method4040(arg0, local8.objId, local148, arg1); Connection.gameConnection.queue(local148); } if (arg3 == 5) { local148 = OutboundPacket.create(Static693.aClientProt121, Connection.gameConnection.random); - Static277.method4040(arg0, local8.anInt3760, local148, arg1); + Static277.method4040(arg0, local8.objId, local148, arg1); Connection.gameConnection.queue(local148); } if (arg3 == 6) { local148 = OutboundPacket.create(Static126.aClientProt23, Connection.gameConnection.random); - Static277.method4040(arg0, local8.anInt3760, local148, arg1); + Static277.method4040(arg0, local8.objId, local148, arg1); Connection.gameConnection.queue(local148); } if (arg3 == 7) { local148 = OutboundPacket.create(Static358.aClientProt124, Connection.gameConnection.random); - Static277.method4040(arg0, local8.anInt3760, local148, arg1); + Static277.method4040(arg0, local8.objId, local148, arg1); Connection.gameConnection.queue(local148); } if (arg3 == 8) { local148 = OutboundPacket.create(Static700.aClientProt123, Connection.gameConnection.random); - Static277.method4040(arg0, local8.anInt3760, local148, arg1); + Static277.method4040(arg0, local8.objId, local148, arg1); Connection.gameConnection.queue(local148); } if (arg3 == 9) { local148 = OutboundPacket.create(Static372.aClientProt69, Connection.gameConnection.random); - Static277.method4040(arg0, local8.anInt3760, local148, arg1); + Static277.method4040(arg0, local8.objId, local148, arg1); Connection.gameConnection.queue(local148); } if (arg3 == 10) { local148 = OutboundPacket.create(ClientProt.aClientProt125, Connection.gameConnection.random); - Static277.method4040(arg0, local8.anInt3760, local148, arg1); + Static277.method4040(arg0, local8.objId, local148, arg1); Connection.gameConnection.queue(local148); } } diff --git a/client/src/main/java/Static122.java b/client/src/main/java/Static122.java index bc8df8d..ecb0643 100644 --- a/client/src/main/java/Static122.java +++ b/client/src/main/java/Static122.java @@ -24,10 +24,10 @@ public static MapElement method2207() { @OriginalMember(owner = "client!dq", name = "a", descriptor = "(II)V") public static void method2208(@OriginalArg(0) int arg0) { - if (!Static571.method7566(arg0)) { + if (!Static571.load(arg0)) { return; } - @Pc(13) Component[] local13 = Static453.aComponentArrayArray2[arg0]; + @Pc(13) Component[] local13 = Static453.components[arg0]; for (@Pc(15) int local15 = 0; local15 < local13.length; local15++) { @Pc(20) Component local20 = local13[local15]; if (local20 != null && local20.aClass152_6 != null) { diff --git a/client/src/main/java/Static126.java b/client/src/main/java/Static126.java index 5fda125..5babd01 100644 --- a/client/src/main/java/Static126.java +++ b/client/src/main/java/Static126.java @@ -8,7 +8,7 @@ public final class Static126 { public static final Class155 aClass155_12 = new Class155(52); @OriginalMember(owner = "client!du", name = "d", descriptor = "Z") - public static boolean aBoolean200 = false; + public static boolean playerMember = false; @OriginalMember(owner = "client!du", name = "m", descriptor = "Lclient!ss;") public static final ClientProt aClientProt23 = new ClientProt(91, 8); @@ -49,9 +49,9 @@ public static void method2228() { @OriginalMember(owner = "client!du", name = "b", descriptor = "(I)V") public static void method2229() { - @Pc(1) SoftLruHashTable local1 = Static354.aSoftLruHashTable120; - synchronized (Static354.aSoftLruHashTable120) { - Static354.aSoftLruHashTable120.removeSoft(); + @Pc(1) SoftLruHashTable local1 = Static354.SHADOWS; + synchronized (Static354.SHADOWS) { + Static354.SHADOWS.removeSoft(); } } } diff --git a/client/src/main/java/Static128.java b/client/src/main/java/Static128.java index ba35858..f99bdd2 100644 --- a/client/src/main/java/Static128.java +++ b/client/src/main/java/Static128.java @@ -14,8 +14,8 @@ public final class Static128 { public static String aString108 = null; @OriginalMember(owner = "client!ea", name = "a", descriptor = "(ILjava/lang/String;)V") - public static void method7754(@OriginalArg(1) String arg0) { - if (Static87.aClass241Array1 == null) { + public static void kick(@OriginalArg(1) String arg0) { + if (Static87.members == null) { return; } @Pc(21) Connection local21 = Connection.getActiveConnection(); diff --git a/client/src/main/java/Static134.java b/client/src/main/java/Static134.java index 9a921df..a766b9e 100644 --- a/client/src/main/java/Static134.java +++ b/client/src/main/java/Static134.java @@ -36,15 +36,15 @@ public static byte[] method8955(@OriginalArg(0) byte[] arg0) { @OriginalMember(owner = "client!eda", name = "a", descriptor = "(Lclient!hda;BZ)V") public static void method8956(@OriginalArg(0) Component arg0, @OriginalArg(2) boolean arg1) { - @Pc(16) int local16 = arg0.anInt3769 == 0 ? arg0.anInt3802 : arg0.anInt3769; - @Pc(37) int local37 = arg0.anInt3742 == 0 ? arg0.anInt3746 : arg0.anInt3742; - Static220.method3200(local16, arg1, local37, Static453.aComponentArrayArray2[arg0.anInt3812 >> 16], arg0.anInt3812); + @Pc(16) int local16 = arg0.scrollMaxH == 0 ? arg0.width : arg0.scrollMaxH; + @Pc(37) int local37 = arg0.scrollMaxV == 0 ? arg0.height : arg0.scrollMaxV; + Static220.method3200(local16, arg1, local37, Static453.components[arg0.id >> 16], arg0.id); if (arg0.aComponentArray1 != null) { - Static220.method3200(local16, arg1, local37, arg0.aComponentArray1, arg0.anInt3812); + Static220.method3200(local16, arg1, local37, arg0.aComponentArray1, arg0.id); } - @Pc(72) SubInterface local72 = (SubInterface) Static548.aHashTable40.get((long) arg0.anInt3812); + @Pc(72) SubInterface local72 = (SubInterface) Static548.openInterfaces.get((long) arg0.id); if (local72 != null) { - Static19.method265(arg1, local72.anInt147, local37, local16); + Static19.method265(arg1, local72.interfaceId, local37, local16); } } } diff --git a/client/src/main/java/Static135.java b/client/src/main/java/Static135.java index ad6b646..86382fe 100644 --- a/client/src/main/java/Static135.java +++ b/client/src/main/java/Static135.java @@ -34,7 +34,7 @@ public static void method7237() { @OriginalMember(owner = "client!ee", name = "a", descriptor = "(ZI)V") public static void method7239(@OriginalArg(1) int arg0) { - @Pc(14) SecondaryLinkable_Sub2 local14 = Static440.method5963(1, (long) arg0); - local14.method205(); + @Pc(14) SecondaryLinkable_Sub2 local14 = Static440.create(1, (long) arg0); + local14.pushClient(); } } diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java index 4588c8e..f812338 100644 --- a/client/src/main/java/Static137.java +++ b/client/src/main/java/Static137.java @@ -8,7 +8,7 @@ public final class Static137 { public static Hashtable aHashtable2 = new Hashtable(); @OriginalMember(owner = "client!ef", name = "e", descriptor = "Lclient!ss;") - public static final ClientProt aClientProt28 = new ClientProt(7, -1); + public static final ClientProt RESUME_P_STRINGDIALOG = new ClientProt(7, -1); @OriginalMember(owner = "client!ef", name = "f", descriptor = "Lclient!om;") public static final Class280 aClass280_4 = new Class280(1); diff --git a/client/src/main/java/Static144.java b/client/src/main/java/Static144.java index e68392c..ad00a22 100644 --- a/client/src/main/java/Static144.java +++ b/client/src/main/java/Static144.java @@ -9,7 +9,7 @@ public final class Static144 { @OriginalMember(owner = "client!ej", name = "b", descriptor = "(III)I") public static int method2406(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - @Pc(40) int local40 = Static78.method1570(arg0 + 45365, 4, arg1 + 91923) + (Static78.method1570(arg0 + 10294, 2, arg1 + 37821) - 128 >> 1) + (Static78.method1570(arg0, 1, arg1) + -128 >> 2) - 128; + @Pc(40) int local40 = Static78.interpolatedNoise(arg0 + 45365, 4, arg1 + 91923) + (Static78.interpolatedNoise(arg0 + 10294, 2, arg1 + 37821) - 128 >> 1) + (Static78.interpolatedNoise(arg0, 1, arg1) + -128 >> 2) - 128; local40 = (int) ((double) local40 * 0.3D) + 35; if (local40 < 10) { local40 = 10; diff --git a/client/src/main/java/Static145.java b/client/src/main/java/Static145.java index f7cba3d..bc0bceb 100644 --- a/client/src/main/java/Static145.java +++ b/client/src/main/java/Static145.java @@ -25,16 +25,16 @@ public static void method2409() { } Static70.anInt1569 = Static170.anInt2864; Static411.anInt6329 = Static110.anInt2186; - Static225.anInt3641 = Static323.anInt5119; + Static225.anInt3641 = Static323.cameraYaw; Static197.anInt3260 = -1; Static340.anInt5584 = Static598.anInt8832; Static693.anInt10383 = -1; Static692.anInt10376 = -1; Static374.anInt5907 = -1; - Static212.anInt3468 = Static333.anInt5455; + Static212.anInt3468 = Static333.loop; Static179.anInt2991 = 0; Static314.anInt5035 = 0; - Static511.anInt7645 = 5; + Static511.cameraType = 5; Static302.anInt4854 = Static359.anInt5801; } @@ -57,9 +57,9 @@ public static void method2410(@OriginalArg(0) PathingEntity arg0) { if ((local25 & -1073741824) == -1073741824) { local72 = local25 & 0xFFFFFFF; @Pc(148) int local148 = local72 >> 14; - local102 = arg0.anInt10690 - (local148 - Static691.anInt10367) * 512 - 256; + local102 = arg0.xFine - (local148 - Static691.originX) * 512 - 256; @Pc(164) int local164 = local72 & 0x3FFF; - local95 = arg0.anInt10694 - (local164 - Static116.anInt2270) * 512 - 256; + local95 = arg0.zFine - (local164 - Static116.originZ) * 512 - 256; } else if ((local25 & 0x8000) == 0) { @Pc(111) Linkable_Sub45 local111 = (Linkable_Sub45) Static18.aHashTable2.get((long) local25); if (local111 == null) { @@ -67,8 +67,8 @@ public static void method2410(@OriginalArg(0) PathingEntity arg0) { continue; } @Pc(116) Npc local116 = local111.aClass8_Sub2_Sub1_Sub2_Sub2_2; - local95 = arg0.anInt10694 - local116.anInt10694; - local102 = arg0.anInt10690 - local116.anInt10690; + local95 = arg0.zFine - local116.zFine; + local102 = arg0.xFine - local116.xFine; } else { local72 = local25 & 0x7FFF; @Pc(76) Player local76 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local72]; @@ -76,8 +76,8 @@ public static void method2410(@OriginalArg(0) PathingEntity arg0) { arg0.method9307(local19, -1); continue; } - local95 = arg0.anInt10694 - local76.anInt10694; - local102 = arg0.anInt10690 - local76.anInt10690; + local95 = arg0.zFine - local76.zFine; + local102 = arg0.xFine - local76.xFine; } if (local102 != 0 || local95 != 0) { arg0.method9307(local19, (int) (Math.atan2((double) local102, (double) local95) * 2607.5945876176133D) & 0x3FFF); @@ -94,21 +94,21 @@ public static void method2410(@OriginalArg(0) PathingEntity arg0) { @OriginalMember(owner = "client!eja", name = "a", descriptor = "(III)V") public static void method2411(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - if (Static571.method7566(arg1)) { - Static84.method1663(Static453.aComponentArrayArray2[arg1], arg0); + if (Static571.load(arg1)) { + Static84.method1663(Static453.components[arg1], arg0); } } @OriginalMember(owner = "client!eja", name = "a", descriptor = "(BI)Lclient!hda;") - public static Component method2412(@OriginalArg(1) int arg0) { + public static Component getComponent(@OriginalArg(1) int arg0) { @Pc(16) int local16 = arg0 >> 16; @Pc(20) int local20 = arg0 & 0xFFFF; - if (Static453.aComponentArrayArray2[local16] == null || Static453.aComponentArrayArray2[local16][local20] == null) { - @Pc(38) boolean local38 = Static571.method7566(local16); + if (Static453.components[local16] == null || Static453.components[local16][local20] == null) { + @Pc(38) boolean local38 = Static571.load(local16); if (!local38) { return null; } } - return Static453.aComponentArrayArray2[local16][local20]; + return Static453.components[local16][local20]; } } diff --git a/client/src/main/java/Static147.java b/client/src/main/java/Static147.java index 9ac91dc..9777783 100644 --- a/client/src/main/java/Static147.java +++ b/client/src/main/java/Static147.java @@ -87,9 +87,9 @@ public static void method2417(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 local295 = local239[2] - local224[2]; local306 = (int) ((float) local224[0] + local273 * (float) local286); local317 = (int) ((float) local224[2] + local273 * (float) local295); - local140 = local306 + (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method9302((byte) 111) - 1 << 8) >> 9; - local142 = local317 + (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method9302((byte) 102) - 1 << 8) >> 9; - @Pc(345) byte local345 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144; + local140 = local306 + (Static556.self.method9302((byte) 111) - 1 << 8) >> 9; + local142 = local317 + (Static556.self.method9302((byte) 102) - 1 << 8) >> 9; + @Pc(345) byte local345 = Static556.self.plane; if (local345 < 3 && (Static280.aByteArrayArrayArray3[1][local306 >> 9][local317 >> 9] & 0x2) != 0) { local370 = local345 + 1; } @@ -125,14 +125,14 @@ public static void method2417(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 } @Pc(538) ParticleLinkedList local538 = local510.aParticleLinkedList8; for (@Pc(543) ParticleNode_Sub7 local543 = (ParticleNode_Sub7) local538.method2790(); local543 != null; local543 = (ParticleNode_Sub7) local538.method2785()) { - if ((Static273.aBoolean340 || local543.aClass8_Sub2_18.aByte144 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144) && local543.method6496(arg2, local177, local148)) { + if ((Static273.aBoolean340 || local543.aClass8_Sub2_18.plane == Static556.self.plane) && local543.method6496(arg2, local177, local148)) { @Pc(584) int local584; if (local543.aClass8_Sub2_18 instanceof Entity) { local186 = ((Entity) local543.aClass8_Sub2_18).aShort131; local584 = ((Entity) local543.aClass8_Sub2_18).aShort132; } else { - local584 = local543.aClass8_Sub2_18.anInt10694 >> 9; - local186 = local543.aClass8_Sub2_18.anInt10690 >> 9; + local584 = local543.aClass8_Sub2_18.zFine >> 9; + local186 = local543.aClass8_Sub2_18.xFine >> 9; } @Pc(723) int local723; @Pc(735) int local735; @@ -141,19 +141,19 @@ public static void method2417(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 if (local543.aClass8_Sub2_18 instanceof Player) { @Pc(610) Player local610 = (Player) local543.aClass8_Sub2_18; local614 = local610.method9302((byte) 50); - if ((local614 & 0x1) == 0 && (local610.anInt10690 & 0x1FF) == 0 && (local610.anInt10694 & 0x1FF) == 0 || (local614 & 0x1) == 1 && (local610.anInt10690 & 0x1FF) == 256 && (local610.anInt10694 & 0x1FF) == 256) { - local286 = local610.anInt10690 - (local610.method9302((byte) 79) - 1 << 8); - local295 = local610.anInt10694 - (local610.method9302((byte) 61) - 1 << 8); + if ((local614 & 0x1) == 0 && (local610.xFine & 0x1FF) == 0 && (local610.zFine & 0x1FF) == 0 || (local614 & 0x1) == 1 && (local610.xFine & 0x1FF) == 256 && (local610.zFine & 0x1FF) == 256) { + local286 = local610.xFine - (local610.method9302((byte) 79) - 1 << 8); + local295 = local610.zFine - (local610.method9302((byte) 61) - 1 << 8); for (local306 = 0; local306 < Static390.anInt6126; local306++) { @Pc(690) Linkable_Sub45 local690 = (Linkable_Sub45) Static18.aHashTable2.get((long) Static103.anIntArray187[local306]); if (local690 != null) { @Pc(695) Npc local695 = local690.aClass8_Sub2_Sub1_Sub2_Sub2_2; - if (Static333.anInt5455 != local695.anInt10743 && local695.aBoolean816) { - local723 = local695.anInt10690 - (local695.aNpcType1.anInt6713 - 1 << 8); - local735 = local695.anInt10694 - (local695.aNpcType1.anInt6713 - 1 << 8); + if (Static333.loop != local695.anInt10743 && local695.aBoolean816) { + local723 = local695.xFine - (local695.aNpcType1.anInt6713 - 1 << 8); + local735 = local695.zFine - (local695.aNpcType1.anInt6713 - 1 << 8); if (local286 <= local723 && local695.aNpcType1.anInt6713 <= local610.method9302((byte) 126) - (local723 - local286 >> 9) && local735 >= local295 && local695.aNpcType1.anInt6713 <= local610.method9302((byte) 121) - (local735 - local295 >> 9)) { - Static651.method8517(local543.aClass8_Sub2_18.aByte144 != Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144, local695); - local695.anInt10743 = Static333.anInt5455; + Static651.method8517(local543.aClass8_Sub2_18.plane != Static556.self.plane, local695); + local695.anInt10743 = Static333.loop; } } } @@ -162,38 +162,38 @@ public static void method2417(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 @Pc(820) int[] local820 = Static210.anIntArray280; for (local723 = 0; local723 < local317; local723++) { @Pc(830) Player local830 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local820[local723]]; - if (local830 != null && local830.anInt10743 != Static333.anInt5455 && local830 != local610 && local830.aBoolean816) { - local864 = local830.anInt10690 - (local830.method9302((byte) 123) - 1 << 8); - @Pc(876) int local876 = local830.anInt10694 - (local830.method9302((byte) 67) - 1 << 8); + if (local830 != null && local830.anInt10743 != Static333.loop && local830 != local610 && local830.aBoolean816) { + local864 = local830.xFine - (local830.method9302((byte) 123) - 1 << 8); + @Pc(876) int local876 = local830.zFine - (local830.method9302((byte) 67) - 1 << 8); if (local864 >= local286 && local830.method9302((byte) 71) <= local610.method9302((byte) 110) - (local864 - local286 >> 9) && local876 >= local295 && local830.method9302((byte) 79) <= local610.method9302((byte) 100) - (local876 - local295 >> 9)) { - Static414.method5696(local543.aClass8_Sub2_18.aByte144 != Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144, local830); - local830.anInt10743 = Static333.anInt5455; + Static414.method5696(local543.aClass8_Sub2_18.plane != Static556.self.plane, local830); + local830.anInt10743 = Static333.loop; } } } } - if (Static333.anInt5455 == local610.anInt10743) { + if (Static333.loop == local610.anInt10743) { continue; } - Static414.method5696(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 != local543.aClass8_Sub2_18.aByte144, local610); - local610.anInt10743 = Static333.anInt5455; + Static414.method5696(Static556.self.plane != local543.aClass8_Sub2_18.plane, local610); + local610.anInt10743 = Static333.loop; } if (local543.aClass8_Sub2_18 instanceof Npc) { @Pc(988) Npc local988 = (Npc) local543.aClass8_Sub2_18; if (local988.aNpcType1 != null) { - if ((local988.aNpcType1.anInt6713 & 0x1) == 0 && (local988.anInt10690 & 0x1FF) == 0 && (local988.anInt10694 & 0x1FF) == 0 || (local988.aNpcType1.anInt6713 & 0x1) == 1 && (local988.anInt10690 & 0x1FF) == 256 && (local988.anInt10694 & 0x1FF) == 256) { - local614 = local988.anInt10690 - (local988.aNpcType1.anInt6713 - 1 << 8); - local286 = local988.anInt10694 - (local988.aNpcType1.anInt6713 - 1 << 8); + if ((local988.aNpcType1.anInt6713 & 0x1) == 0 && (local988.xFine & 0x1FF) == 0 && (local988.zFine & 0x1FF) == 0 || (local988.aNpcType1.anInt6713 & 0x1) == 1 && (local988.xFine & 0x1FF) == 256 && (local988.zFine & 0x1FF) == 256) { + local614 = local988.xFine - (local988.aNpcType1.anInt6713 - 1 << 8); + local286 = local988.zFine - (local988.aNpcType1.anInt6713 - 1 << 8); for (local295 = 0; local295 < Static390.anInt6126; local295++) { @Pc(1081) Linkable_Sub45 local1081 = (Linkable_Sub45) Static18.aHashTable2.get((long) Static103.anIntArray187[local295]); if (local1081 != null) { @Pc(1086) Npc local1086 = local1081.aClass8_Sub2_Sub1_Sub2_Sub2_2; - if (local1086.anInt10743 != Static333.anInt5455 && local1086 != local988 && local1086.aBoolean816) { - local370 = local1086.anInt10690 - (local1086.aNpcType1.anInt6713 - 1 << 8); - local723 = local1086.anInt10694 - (local1086.aNpcType1.anInt6713 - 1 << 8); + if (local1086.anInt10743 != Static333.loop && local1086 != local988 && local1086.aBoolean816) { + local370 = local1086.xFine - (local1086.aNpcType1.anInt6713 - 1 << 8); + local723 = local1086.zFine - (local1086.aNpcType1.anInt6713 - 1 << 8); if (local614 <= local370 && local988.aNpcType1.anInt6713 - (local370 - local614 >> 9) >= local1086.aNpcType1.anInt6713 && local723 >= local286 && local1086.aNpcType1.anInt6713 <= local988.aNpcType1.anInt6713 - (local723 - local286 >> 9)) { - Static651.method8517(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 != local543.aClass8_Sub2_18.aByte144, local1086); - local1086.anInt10743 = Static333.anInt5455; + Static651.method8517(Static556.self.plane != local543.aClass8_Sub2_18.plane, local1086); + local1086.anInt10743 = Static333.loop; } } } @@ -202,38 +202,38 @@ public static void method2417(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 @Pc(1216) int[] local1216 = Static210.anIntArray280; for (local370 = 0; local370 < local306; local370++) { @Pc(1226) Player local1226 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local1216[local370]]; - if (local1226 != null && local1226.anInt10743 != Static333.anInt5455 && local1226.aBoolean816) { - local735 = local1226.anInt10690 - (local1226.method9302((byte) 125) - 1 << 8); - local864 = local1226.anInt10694 - (local1226.method9302((byte) 76) - 1 << 8); + if (local1226 != null && local1226.anInt10743 != Static333.loop && local1226.aBoolean816) { + local735 = local1226.xFine - (local1226.method9302((byte) 125) - 1 << 8); + local864 = local1226.zFine - (local1226.method9302((byte) 76) - 1 << 8); if (local614 <= local735 && local1226.method9302((byte) 98) <= local988.aNpcType1.anInt6713 - (local735 - local614 >> 9) && local286 <= local864 && local1226.method9302((byte) 127) <= local988.aNpcType1.anInt6713 - (local864 - local286 >> 9)) { - Static414.method5696(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 != local543.aClass8_Sub2_18.aByte144, local1226); - local1226.anInt10743 = Static333.anInt5455; + Static414.method5696(Static556.self.plane != local543.aClass8_Sub2_18.plane, local1226); + local1226.anInt10743 = Static333.loop; } } } } - if (Static333.anInt5455 == local988.anInt10743) { + if (Static333.loop == local988.anInt10743) { continue; } - Static651.method8517(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 != local543.aClass8_Sub2_18.aByte144, local988); - local988.anInt10743 = Static333.anInt5455; + Static651.method8517(Static556.self.plane != local543.aClass8_Sub2_18.plane, local988); + local988.anInt10743 = Static333.loop; } } if (local543.aClass8_Sub2_18 instanceof ParticleNode_Sub2_Sub5_Sub1) { - @Pc(1385) int local1385 = local186 + Static691.anInt10367; - local614 = Static116.anInt2270 + local584; - @Pc(1406) Linkable_Sub17 local1406 = (Linkable_Sub17) Static497.aHashTable35.get((long) (local614 << 14 | local543.aClass8_Sub2_18.aByte144 << 28 | local1385)); + @Pc(1385) int local1385 = local186 + Static691.originX; + local614 = Static116.originZ + local584; + @Pc(1406) Linkable_Sub17 local1406 = (Linkable_Sub17) Static497.aHashTable35.get((long) (local614 << 14 | local543.aClass8_Sub2_18.plane << 28 | local1385)); if (local1406 != null) { local295 = 0; for (@Pc(1416) Linkable_Sub15 local1416 = (Linkable_Sub15) local1406.aLinkedList12.tail(); local1416 != null; local1416 = (Linkable_Sub15) local1406.aLinkedList12.prev()) { @Pc(1424) ObjType local1424 = ObjTypeList.objTypes.method2486(local1416.anInt1958); - if (Static156.aBoolean223 && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 == local543.aClass8_Sub2_18.aByte144) { + if (Static156.aBoolean223 && Static556.self.plane == local543.aClass8_Sub2_18.plane) { @Pc(1451) ParamType local1451 = Static610.anInt9329 == -1 ? null : Static386.aParamTypeList2.method1161(Static610.anInt9329); if ((Static717.anInt10822 & 0x1) != 0 && (local1451 == null || local1424.method8794(Static610.anInt9329, local1451.anInt7509) != local1451.anInt7509)) { Static416.method5707(false, -1, (long) local1416.anInt1958, local186, local584, Static153.aString27, 17, true, Static369.anInt4263, Static128.aString108 + " -> " + local1424.aString118, (long) local295, false); } } - if (local543.aClass8_Sub2_18.aByte144 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144) { + if (local543.aClass8_Sub2_18.plane == Static556.self.plane) { @Pc(1525) String[] local1525 = local1424.aStringArray46; for (local723 = local1525.length - 1; local723 >= 0; local723--) { if (local1525[local723] != null) { @@ -278,13 +278,13 @@ public static void method2417(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 local1661 = local1661.getMultiLoc(Static34.aClass304_1); } if (local1661 != null) { - if (Static156.aBoolean223 && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 == local543.aClass8_Sub2_18.aByte144) { + if (Static156.aBoolean223 && Static556.self.plane == local543.aClass8_Sub2_18.plane) { @Pc(1697) ParamType local1697 = Static610.anInt9329 == -1 ? null : Static386.aParamTypeList2.method1161(Static610.anInt9329); if ((Static717.anInt10822 & 0x4) != 0 && (local1697 == null || local1661.getParam(local1697.anInt7509, Static610.anInt9329) != local1697.anInt7509)) { Static416.method5707(false, -1, Static277.method4042(local1654, local584, local186), local186, local584, Static153.aString27, 60, true, Static369.anInt4263, Static128.aString108 + " -> " + local1661.name, (long) local1654.hashCode(), false); } } - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 == local543.aClass8_Sub2_18.aByte144) { + if (Static556.self.plane == local543.aClass8_Sub2_18.plane) { @Pc(1763) String[] local1763 = local1661.ops; if (local1763 != null) { for (local295 = local1763.length - 1; local295 >= 0; local295--) { @@ -333,12 +333,12 @@ public static void method2417(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 @OriginalMember(owner = "client!eka", name = "a", descriptor = "(IIIZIIIII)Z") public static boolean method2419(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(8) int arg7) { - @Pc(16) int local16 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray879[0]; - @Pc(21) int local21 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray878[0]; + @Pc(16) int local16 = Static556.self.anIntArray879[0]; + @Pc(21) int local21 = Static556.self.anIntArray878[0]; if (local16 < 0 || local16 >= Static720.anInt10859 || local21 < 0 || Static501.anInt7568 <= local21) { return false; } else if (arg4 >= 0 && Static720.anInt10859 > arg4 && arg1 >= 0 && arg1 < Static501.anInt7568) { - @Pc(98) int local98 = Static521.method6870(arg1, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method9302((byte) 107), arg3, arg5, local16, arg2, Static480.anIntArray583, arg7, local21, arg6, Static577.aClass110Array1[Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144], Static70.anIntArray147, arg4, arg0); + @Pc(98) int local98 = Static521.method6870(arg1, Static556.self.method9302((byte) 107), arg3, arg5, local16, arg2, Static480.anIntArray583, arg7, local21, arg6, Static577.aClass110Array1[Static556.self.plane], Static70.anIntArray147, arg4, arg0); if (local98 < 1) { return false; } @@ -354,7 +354,7 @@ public static boolean method2419(@OriginalArg(0) int arg0, @OriginalArg(1) int a @OriginalMember(owner = "client!eka", name = "a", descriptor = "(IIB)V") public static void method2420(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(5, (long) arg0); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(5, (long) arg0); local9.method202(); local9.anInt197 = arg1; } diff --git a/client/src/main/java/Static15.java b/client/src/main/java/Static15.java index bdaa047..04a0e43 100644 --- a/client/src/main/java/Static15.java +++ b/client/src/main/java/Static15.java @@ -9,13 +9,13 @@ public final class Static15 { @OriginalMember(owner = "client!aia", name = "a", descriptor = "(III)Lclient!hda;") public static Component method186(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(21) Component local21 = Static145.method2412(arg1); + @Pc(21) Component local21 = Static145.getComponent(arg1); if (arg0 == -1) { return local21; - } else if (local21 == null || local21.aComponentArray2 == null || arg0 >= local21.aComponentArray2.length) { + } else if (local21 == null || local21.createdComponents == null || arg0 >= local21.createdComponents.length) { return null; } else { - return local21.aComponentArray2[arg0]; + return local21.createdComponents[arg0]; } } diff --git a/client/src/main/java/Static150.java b/client/src/main/java/Static150.java index 3187487..1cd9705 100644 --- a/client/src/main/java/Static150.java +++ b/client/src/main/java/Static150.java @@ -22,9 +22,9 @@ public final class Static150 { public static void method2455() { Static173.closeAudioChannels(); Static517.method6822(Static400.aClass2_Sub34_28.aPreference_Sub17_1.method5667() == 1); - Static719.aAudioChannel5 = Static638.method8394(Static446.aSignlink6, 0, 22050, Static434.aCanvas7); + Static719.aAudioChannel5 = Static638.create(Static446.aSignlink6, 0, 22050, Static434.canvas); Static697.method9120(Static48.method1100((MidiPcmStream) null)); - Static559.aAudioChannel3 = Static638.method8394(Static446.aSignlink6, 1, 2048, Static434.aCanvas7); + Static559.aAudioChannel3 = Static638.create(Static446.aSignlink6, 1, 2048, Static434.canvas); Static559.aAudioChannel3.method3582(Static336.aClass2_Sub6_Sub3_1); } diff --git a/client/src/main/java/Static152.java b/client/src/main/java/Static152.java index 6e19a4b..a32c14e 100644 --- a/client/src/main/java/Static152.java +++ b/client/src/main/java/Static152.java @@ -8,7 +8,7 @@ public final class Static152 { @OriginalMember(owner = "client!ep", name = "f", descriptor = "(I)V") public static void method9273() { if (Static446.aSignlink6.aBoolean781 && Static668.aClass229_5.worldId != -1) { - Static430.method5817(Static668.aClass229_5.worldId, Static668.aClass229_5.aString60); + Static430.hopWorld(Static668.aClass229_5.worldId, Static668.aClass229_5.aString60); } } } diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java index 0ddd493..f3f07d2 100644 --- a/client/src/main/java/Static156.java +++ b/client/src/main/java/Static156.java @@ -3,7 +3,7 @@ public final class Static156 { @OriginalMember(owner = "client!et", name = "f", descriptor = "I") - public static int anInt2679; + public static int threadPriority; @OriginalMember(owner = "client!et", name = "c", descriptor = "Z") public static boolean aBoolean223 = false; diff --git a/client/src/main/java/Static157.java b/client/src/main/java/Static157.java index 0cac6c4..311b03b 100644 --- a/client/src/main/java/Static157.java +++ b/client/src/main/java/Static157.java @@ -19,9 +19,9 @@ public static void method2564(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 if (local4 == null) { return; } - arg4.anInt10690 = (arg1 << Static52.anInt1066) + Static247.anInt3993; + arg4.xFine = (arg1 << Static52.anInt1066) + Static247.anInt3993; arg4.anInt10691 = arg3; - arg4.anInt10694 = (arg2 << Static52.anInt1066) + Static247.anInt3993; + arg4.zFine = (arg2 << Static52.anInt1066) + Static247.anInt3993; local4.aClass8_Sub2_Sub5_1 = arg4; @Pc(36) int local36 = Static246.aClass178Array1 == Static693.aClass178Array2 ? 1 : 0; if (arg4.method9283()) { diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java index c95aae0..537c90f 100644 --- a/client/src/main/java/Static158.java +++ b/client/src/main/java/Static158.java @@ -11,7 +11,7 @@ public final class Static158 { public static Object anObject5; @OriginalMember(owner = "client!ev", name = "b", descriptor = "Ljava/lang/String;") - public static String aString28 = null; + public static String owner = null; @OriginalMember(owner = "client!ev", name = "b", descriptor = "(I)V") public static void method2569() { diff --git a/client/src/main/java/Static159.java b/client/src/main/java/Static159.java index 6e72f51..b9f21b0 100644 --- a/client/src/main/java/Static159.java +++ b/client/src/main/java/Static159.java @@ -76,8 +76,8 @@ public static void method2575() { if (Static41.method1027(Static283.gameState) || Static620.isInLobby(Static283.gameState)) { Static127.method2243(Static412.anInt6358, Static170.anInt2864 >> 12, Static110.anInt2186 >> 12); } else { - @Pc(20) int local20 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray879[0] >> 3; - @Pc(27) int local27 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray878[0] >> 3; + @Pc(20) int local20 = Static556.self.anIntArray879[0] >> 3; + @Pc(27) int local27 = Static556.self.anIntArray878[0] >> 3; if (local20 >= 0 && Static720.anInt10859 >> 3 > local20 && local27 >= 0 && Static501.anInt7568 >> 3 > local27) { Static127.method2243(Static412.anInt6358, local20, local27); } else { diff --git a/client/src/main/java/Static161.java b/client/src/main/java/Static161.java index 4da75c0..50d724e 100644 --- a/client/src/main/java/Static161.java +++ b/client/src/main/java/Static161.java @@ -72,8 +72,8 @@ public static void method2585(@OriginalArg(1) Player arg0, @OriginalArg(2) int a arg0.aByte147 = arg2.g1b_alt3(); arg0.aByte148 = arg2.g1b_alt2(); arg0.aByte149 = (byte) arg2.g1(); - arg0.anInt10760 = Static333.anInt5455 + arg2.g2_alt3(); - arg0.anInt10752 = Static333.anInt5455 + arg2.g2(); + arg0.anInt10760 = Static333.loop + arg2.g2_alt3(); + arg0.anInt10752 = Static333.loop + arg2.g2(); } if ((arg3 & 0x200) != 0) { local7 = arg2.g1b_alt2(); @@ -84,7 +84,7 @@ public static void method2585(@OriginalArg(1) Player arg0, @OriginalArg(2) int a arg0.anInt10731 = arg2.g1_alt2(); arg0.aBoolean818 = (local15 & 0x8000) != 0; arg0.anInt10737 = local15 & 0x7FFF; - arg0.anInt10719 = arg0.anInt10738 + arg0.anInt10737 + Static333.anInt5455; + arg0.anInt10719 = arg0.anInt10738 + arg0.anInt10737 + Static333.loop; } if ((arg3 & 0x80000) != 0) { local15 = arg2.ig2(); @@ -124,7 +124,7 @@ public static void method2585(@OriginalArg(1) Player arg0, @OriginalArg(2) int a } @Pc(436) int local436 = arg2.gSamrt1or2(); @Pc(440) int local440 = arg2.g1_alt2(); - arg0.method9301(local32, local436, local440, local26, Static333.anInt5455, local141, local108); + arg0.method9301(local32, local436, local440, local26, Static333.loop, local141, local108); } } } @@ -157,7 +157,7 @@ public static void method2585(@OriginalArg(1) Player arg0, @OriginalArg(2) int a if (local574.charAt(0) == '~') { local574 = local574.substring(1); Static44.method1072(local574, arg0.method1424(false), 0, arg0.name1, arg0.method1422(), 2); - } else if (arg0 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2) { + } else if (arg0 == Static556.self) { Static44.method1072(local574, arg0.method1424(false), 0, arg0.name1, arg0.method1422(), 2); } arg0.method1413(0, 0, local574); @@ -180,8 +180,8 @@ public static void method2585(@OriginalArg(1) Player arg0, @OriginalArg(2) int a arg0.anInt10753 = arg2.g1b(); arg0.anInt10761 = arg2.g1b_alt1(); arg0.anInt10758 = arg2.g1b_alt1(); - arg0.anInt10759 = arg2.ig2() + Static333.anInt5455; - arg0.anInt10755 = arg2.g2_alt3() + Static333.anInt5455; + arg0.anInt10759 = arg2.ig2() + Static333.loop; + arg0.anInt10755 = arg2.g2_alt3() + Static333.loop; arg0.anInt10754 = arg2.g1_alt1(); if (arg0.aBoolean127) { arg0.anInt10764 = 0; @@ -253,7 +253,7 @@ public static void method2585(@OriginalArg(1) Player arg0, @OriginalArg(2) int a } @OriginalMember(owner = "client!fa", name = "a", descriptor = "(IIIIII)V") - public static void method2586(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { + public static void play(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { if (Static400.aClass2_Sub34_28.aPreference_Sub25_3.method7208() != 0 && arg3 != 0 && Static33.anInt779 < 50 && arg2 != -1) { Static409.aClass104Array1[Static33.anInt779++] = new Class104((byte) 1, arg2, arg3, arg1, arg4, 0, arg0, (ParticleNode_Sub2) null); } @@ -305,9 +305,9 @@ public static void method2588() { if (local29) { local42.method9298(local108, true); } - local42.method9326(local170 == 1, local131 + Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray878[0], local159 + Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray879[0], local144, local42.method9302((byte) 91)); + local42.method9326(local170 == 1, local131 + Static556.self.anIntArray878[0], local159 + Static556.self.anIntArray879[0], local144, local42.method9302((byte) 91)); if (local42.aNpcType1.method5984()) { - Static89.method1714(local42.aByte144, (Player) null, local42.anIntArray879[0], local42.anIntArray878[0], local42, (LocType) null, 0); + Static89.method1714(local42.plane, (Player) null, local42.anIntArray879[0], local42.anIntArray878[0], local42, (LocType) null, 0); } } local8.bytes(); diff --git a/client/src/main/java/Static163.java b/client/src/main/java/Static163.java index 82090fe..5daf8ec 100644 --- a/client/src/main/java/Static163.java +++ b/client/src/main/java/Static163.java @@ -35,16 +35,16 @@ public static byte[] method8849(@OriginalArg(0) byte[] arg0) { @OriginalMember(owner = "client!fb", name = "a", descriptor = "(IIIIZ)Lclient!aha;") public static SubInterface method8850(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) boolean arg3) { @Pc(7) SubInterface local7 = new SubInterface(); - local7.anInt147 = arg1; + local7.interfaceId = arg1; local7.anInt146 = arg0; - Static548.aHashTable40.put((long) arg2, local7); + Static548.openInterfaces.put((long) arg2, local7); Static122.method2208(arg1); - @Pc(26) Component local26 = Static145.method2412(arg2); + @Pc(26) Component local26 = Static145.getComponent(arg2); if (local26 != null) { - Static178.method2729(local26); + Static178.redraw(local26); } if (Static390.aComponent9 != null) { - Static178.method2729(Static390.aComponent9); + Static178.redraw(Static390.aComponent9); Static390.aComponent9 = null; } Static94.method1840(); @@ -54,8 +54,8 @@ public static SubInterface method8850(@OriginalArg(0) int arg0, @OriginalArg(1) if (!arg3) { Static472.method6414(arg1); } - if (!arg3 && Static377.anInt5930 != -1) { - Static145.method2411(1, Static377.anInt5930); + if (!arg3 && Static377.topLevelInterface != -1) { + Static145.method2411(1, Static377.topLevelInterface); } return local7; } diff --git a/client/src/main/java/Static167.java b/client/src/main/java/Static167.java index 1e7a869..34dc3fe 100644 --- a/client/src/main/java/Static167.java +++ b/client/src/main/java/Static167.java @@ -9,7 +9,7 @@ public final class Static167 { @OriginalMember(owner = "client!fd", name = "a", descriptor = "(IIIII)V") public static void method2630(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - @Pc(14) SecondaryLinkable_Sub2 local14 = Static440.method5963(19, (long) arg1 << 32 | (long) arg2); + @Pc(14) SecondaryLinkable_Sub2 local14 = Static440.create(19, (long) arg1 << 32 | (long) arg2); local14.method202(); local14.anInt197 = arg0; local14.anInt195 = arg3; diff --git a/client/src/main/java/Static168.java b/client/src/main/java/Static168.java index 05373ff..7b289ac 100644 --- a/client/src/main/java/Static168.java +++ b/client/src/main/java/Static168.java @@ -18,17 +18,17 @@ public final class Static168 { public static void method2633(@OriginalArg(0) PacketBit arg0) { arg0.bits(); @Pc(10) int local10 = Static312.anInt5000; - @Pc(20) Player local20 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local10] = new Player(); + @Pc(20) Player local20 = Static556.self = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local10] = new Player(); local20.anInt10740 = local10; @Pc(28) int local28 = arg0.gBit(30); @Pc(33) byte local33 = (byte) (local28 >> 28); @Pc(39) int local39 = local28 >> 14 & 0x3FFF; - local20.anIntArray879[0] = local39 - Static691.anInt10367; + local20.anIntArray879[0] = local39 - Static691.originX; @Pc(51) int local51 = local28 & 0x3FFF; - local20.anInt10690 = (local20.anIntArray879[0] << 9) + (local20.method9302((byte) 53) << 8); - local20.anIntArray878[0] = local51 - Static116.anInt2270; - local20.anInt10694 = (local20.anIntArray878[0] << 9) + (local20.method9302((byte) 65) << 8); - Static394.anInt6176 = local20.aByte144 = local20.aByte143 = local33; + local20.xFine = (local20.anIntArray879[0] << 9) + (local20.method9302((byte) 53) << 8); + local20.anIntArray878[0] = local51 - Static116.originZ; + local20.zFine = (local20.anIntArray878[0] << 9) + (local20.method9302((byte) 65) << 8); + Static394.anInt6176 = local20.plane = local20.aByte143 = local33; if (Static441.method5968(local20.anIntArray878[0], local20.anIntArray879[0])) { local20.aByte143++; } @@ -90,18 +90,18 @@ public static void method2636(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1 } @Pc(13) int local13 = (arg1 + arg0) / 2; @Pc(15) int local15 = arg1; - @Pc(19) World local19 = Static343.aClass297_Sub1Array2[local13]; - Static343.aClass297_Sub1Array2[local13] = Static343.aClass297_Sub1Array2[arg0]; - Static343.aClass297_Sub1Array2[arg0] = local19; + @Pc(19) World local19 = Static343.sorted[local13]; + Static343.sorted[local13] = Static343.sorted[arg0]; + Static343.sorted[arg0] = local19; for (@Pc(31) int local31 = arg1; local31 < arg0; local31++) { - if (Static639.method8418(local19, arg3, arg5, arg4, 70, Static343.aClass297_Sub1Array2[local31], arg2) <= 0) { - @Pc(47) World local47 = Static343.aClass297_Sub1Array2[local31]; - Static343.aClass297_Sub1Array2[local31] = Static343.aClass297_Sub1Array2[local15]; - Static343.aClass297_Sub1Array2[local15++] = local47; + if (Static639.method8418(local19, arg3, arg5, arg4, 70, Static343.sorted[local31], arg2) <= 0) { + @Pc(47) World local47 = Static343.sorted[local31]; + Static343.sorted[local31] = Static343.sorted[local15]; + Static343.sorted[local15++] = local47; } } - Static343.aClass297_Sub1Array2[arg0] = Static343.aClass297_Sub1Array2[local15]; - Static343.aClass297_Sub1Array2[local15] = local19; + Static343.sorted[arg0] = Static343.sorted[local15]; + Static343.sorted[local15] = local19; method2636(local15 - 1, arg1, arg2, arg3, arg4, arg5); method2636(arg0, local15 + 1, arg2, arg3, arg4, arg5); } diff --git a/client/src/main/java/Static174.java b/client/src/main/java/Static174.java index d82e8d3..63f5e15 100644 --- a/client/src/main/java/Static174.java +++ b/client/src/main/java/Static174.java @@ -9,5 +9,5 @@ public final class Static174 { public static int anInt2918; @OriginalMember(owner = "client!fh", name = "a", descriptor = "Z") - public static boolean aBoolean249 = false; + public static boolean mapMembers = false; } diff --git a/client/src/main/java/Static178.java b/client/src/main/java/Static178.java index 79e5b8d..07c95ad 100644 --- a/client/src/main/java/Static178.java +++ b/client/src/main/java/Static178.java @@ -13,7 +13,7 @@ public final class Static178 { public static boolean aBoolean251 = false; @OriginalMember(owner = "client!fj", name = "a", descriptor = "(ILclient!hda;)V") - public static void method2729(@OriginalArg(1) Component arg0) { + public static void redraw(@OriginalArg(1) Component arg0) { if (arg0.anInt3813 == Static171.anInt2880) { Static364.aBooleanArray18[arg0.anInt3752] = true; } diff --git a/client/src/main/java/Static184.java b/client/src/main/java/Static184.java index 4a6a0cb..c13915a 100644 --- a/client/src/main/java/Static184.java +++ b/client/src/main/java/Static184.java @@ -22,10 +22,10 @@ public static PathingEntity method2798(@OriginalArg(0) int arg0, @OriginalArg(1) if (local35 instanceof PathingEntity) { @Pc(41) PathingEntity local41 = (PathingEntity) local35; @Pc(51) int local51 = local41.method9302((byte) 76) * 256 + 252 - 256; - @Pc(59) int local59 = local41.anInt10690 - local51 >> 9; - @Pc(66) int local66 = local41.anInt10694 - local51 >> 9; - @Pc(74) int local74 = local41.anInt10690 + local51 >> 9; - @Pc(82) int local82 = local41.anInt10694 + local51 >> 9; + @Pc(59) int local59 = local41.xFine - local51 >> 9; + @Pc(66) int local66 = local41.zFine - local51 >> 9; + @Pc(74) int local74 = local41.xFine + local51 >> 9; + @Pc(82) int local82 = local41.zFine + local51 >> 9; if (local59 <= arg0 && arg1 >= local66 && arg0 <= local74 && arg1 <= local82) { @Pc(120) int local120 = (local74 + 1 - arg0) * (local82 + (1 - arg1)); if (local120 > local22) { diff --git a/client/src/main/java/Static187.java b/client/src/main/java/Static187.java index a7f07ce..d9e7554 100644 --- a/client/src/main/java/Static187.java +++ b/client/src/main/java/Static187.java @@ -26,8 +26,8 @@ public static void method2842() { Static518.aPacket_18 = null; Static298.method4385(); Static525.anInt8907 = 0; - Static691.anInt10367 = 0; - Static116.anInt2270 = 0; + Static691.originX = 0; + Static116.originZ = 0; Static62.anInt1465 = 0; for (@Pc(34) int local34 = 0; local34 < Static527.aClass254Array1.length; local34++) { Static527.aClass254Array1[local34] = null; diff --git a/client/src/main/java/Static19.java b/client/src/main/java/Static19.java index 60d1577..5619a88 100644 --- a/client/src/main/java/Static19.java +++ b/client/src/main/java/Static19.java @@ -18,8 +18,8 @@ public static boolean method264(@OriginalArg(0) int arg0, @OriginalArg(1) int ar @OriginalMember(owner = "client!al", name = "a", descriptor = "(ZIIII)V") public static void method265(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - if (Static571.method7566(arg1)) { - Static220.method3200(arg3, arg0, arg2, Static453.aComponentArrayArray2[arg1], -1); + if (Static571.load(arg1)) { + Static220.method3200(arg3, arg0, arg2, Static453.components[arg1], -1); } } } diff --git a/client/src/main/java/Static194.java b/client/src/main/java/Static194.java index d3f6629..bc22fe6 100644 --- a/client/src/main/java/Static194.java +++ b/client/src/main/java/Static194.java @@ -21,9 +21,9 @@ public static byte method2904(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 @OriginalMember(owner = "client!g", name = "a", descriptor = "(BI)V") public static void method2907() { - @Pc(5) SoftLruHashTable local5 = Static354.aSoftLruHashTable120; - synchronized (Static354.aSoftLruHashTable120) { - Static354.aSoftLruHashTable120.clean(5); + @Pc(5) SoftLruHashTable local5 = Static354.SHADOWS; + synchronized (Static354.SHADOWS) { + Static354.SHADOWS.clean(5); } } diff --git a/client/src/main/java/Static2.java b/client/src/main/java/Static2.java index f936689..288ff4c 100644 --- a/client/src/main/java/Static2.java +++ b/client/src/main/java/Static2.java @@ -18,7 +18,7 @@ public final class Static2 { @OriginalMember(owner = "client!aaa", name = "d", descriptor = "(III)V") public static void method62(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(6, (long) arg1); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(6, (long) arg1); local9.method202(); local9.anInt197 = arg0; } diff --git a/client/src/main/java/Static205.java b/client/src/main/java/Static205.java index 712acfd..9af9638 100644 --- a/client/src/main/java/Static205.java +++ b/client/src/main/java/Static205.java @@ -21,7 +21,7 @@ public static void method3089(@OriginalArg(0) int arg0, @OriginalArg(1) boolean @OriginalMember(owner = "client!gg", name = "a", descriptor = "(BIIIIII)V") public static void method3091(@OriginalArg(1) int arg0, @OriginalArg(3) int arg1, @OriginalArg(5) int arg2, @OriginalArg(6) int arg3) { for (@Pc(17) ParticleNode_Sub3 local17 = (ParticleNode_Sub3) Static422.aParticleLinkedList9.method2790(); local17 != null; local17 = (ParticleNode_Sub3) Static422.aParticleLinkedList9.method2785()) { - if (local17.anInt953 <= Static333.anInt5455) { + if (local17.anInt953 <= Static333.loop) { local17.method9274(); } else { Static143.method3573(local17.anInt956 * 2, (local17.anInt959 << 9) + 256, arg0 >> 1, (local17.anInt954 << 9) + 256, local17.anInt958, arg1 >> 1); diff --git a/client/src/main/java/Static208.java b/client/src/main/java/Static208.java index cf2b48a..51f572d 100644 --- a/client/src/main/java/Static208.java +++ b/client/src/main/java/Static208.java @@ -35,10 +35,10 @@ public static void method3106() { Static334.aKeyboard1.method8482(); Static189.aMouse1.method8848(); Static295.aClient1.method1641(); - Static434.aCanvas7.setBackground(Color.black); + Static434.canvas.setBackground(Color.black); Static470.anInt7112 = -1; - Static334.aKeyboard1 = Static681.method8921(Static434.aCanvas7); - Static189.aMouse1 = Static70.method1513(Static434.aCanvas7); + Static334.aKeyboard1 = Static681.method8921(Static434.canvas); + Static189.aMouse1 = Static70.method1513(Static434.canvas); } @OriginalMember(owner = "client!gha", name = "a", descriptor = "(Lclient!eo;Z[[[BIB)Z") @@ -46,9 +46,9 @@ public static boolean method3107(@OriginalArg(0) ParticleNode_Sub2 arg0, @Origin if (!Static581.aBoolean657) { return false; } - @Pc(9) int local9 = arg0.anInt10690 >> Static52.anInt1066; + @Pc(9) int local9 = arg0.xFine >> Static52.anInt1066; @Pc(11) int local11 = local9; - @Pc(16) int local16 = arg0.anInt10694 >> Static52.anInt1066; + @Pc(16) int local16 = arg0.zFine >> Static52.anInt1066; @Pc(18) int local18 = local16; if (arg0 instanceof Entity) { local11 = ((Entity) arg0).aShort134; @@ -59,7 +59,7 @@ public static boolean method3107(@OriginalArg(0) ParticleNode_Sub2 arg0, @Origin for (@Pc(39) int local39 = local9; local39 <= local11; local39++) { for (@Pc(42) int local42 = local16; local42 <= local18; local42++) { if (arg0.aByte143 < Static299.anInt4824 && local39 >= Static441.anInt6691 && local39 < Static77.anInt1613 && local42 >= Static220.anInt3562 && local42 < Static692.anInt10370) { - if ((arg2 == null || arg0.aByte144 < arg3 || arg2[arg0.aByte144][local39][local42] != arg4) && arg0.method9275() && !arg0.method9284((byte) 59, Static665.aClass19_15)) { + if ((arg2 == null || arg0.plane < arg3 || arg2[arg0.plane][local39][local42] != arg4) && arg0.method9275() && !arg0.method9284((byte) 59, Static665.aClass19_15)) { return false; } if (!arg1 && local39 >= Static403.anInt6246 - 16 && local39 <= Static403.anInt6246 + 16 && local42 >= Static550.anInt8271 - 16 && local42 <= Static550.anInt8271 + 16) { diff --git a/client/src/main/java/Static21.java b/client/src/main/java/Static21.java index 764a62d..e145556 100644 --- a/client/src/main/java/Static21.java +++ b/client/src/main/java/Static21.java @@ -116,7 +116,7 @@ public static void method8048(@OriginalArg(1) File arg0) { } @OriginalMember(owner = "client!am", name = "f", descriptor = "(B)Z") - public static boolean method8119() { + public static boolean showVideoAd() { if (Static98.aBoolean191) { try { BrowserControl.call("showVideoAd", Static166.anApplet1); diff --git a/client/src/main/java/Static210.java b/client/src/main/java/Static210.java index 9ce373b..4ff71d4 100644 --- a/client/src/main/java/Static210.java +++ b/client/src/main/java/Static210.java @@ -14,7 +14,7 @@ public final class Static210 { @OriginalMember(owner = "client!gia", name = "a", descriptor = "(BZIIZ)V") public static void method3119(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) boolean arg3) { - Static168.method2636(Static343.aClass297_Sub1Array2.length - 1, 0, arg0, arg2, arg3, arg1); + Static168.method2636(Static343.sorted.length - 1, 0, arg0, arg2, arg3, arg1); Static419.anInt6434 = 0; Static522.aClass2_Sub12_4 = null; } diff --git a/client/src/main/java/Static211.java b/client/src/main/java/Static211.java index 3c74ade..52dcb3d 100644 --- a/client/src/main/java/Static211.java +++ b/client/src/main/java/Static211.java @@ -12,7 +12,7 @@ public final class Static211 { @OriginalMember(owner = "client!gj", name = "a", descriptor = "(IILjava/lang/String;)V") public static void method4998(@OriginalArg(0) int arg0, @OriginalArg(2) String arg1) { - @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.method5963(3, (long) arg0); + @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.create(3, (long) arg0); local16.method202(); local16.aString1 = arg1; } diff --git a/client/src/main/java/Static212.java b/client/src/main/java/Static212.java index e293761..93538bd 100644 --- a/client/src/main/java/Static212.java +++ b/client/src/main/java/Static212.java @@ -39,7 +39,7 @@ public static void method3136(@OriginalArg(0) Component arg0, @OriginalArg(1) in @Pc(42) int local42 = (local16 & 0x3F) << 10 | 0x3F | 0x380; @Pc(46) int local46 = Static154.anIntArray237[local42]; Static300.method4390(false, true); - arg3.aa(arg1, ((63 - local16) * arg0.anInt3746 >> 6) + arg2, arg0.anInt3802, (arg0.anInt3746 >> 6) + 1, local46, 0); + arg3.aa(arg1, ((63 - local16) * arg0.height >> 6) + arg2, arg0.width, (arg0.height >> 6) + 1, local46, 0); } } } diff --git a/client/src/main/java/Static218.java b/client/src/main/java/Static218.java index 913b3d6..9cd278a 100644 --- a/client/src/main/java/Static218.java +++ b/client/src/main/java/Static218.java @@ -26,12 +26,12 @@ public static void method3188(@OriginalArg(0) String arg0, @OriginalArg(1) Strin public static void method3189() { @Pc(7) FileOnDisk local7 = null; try { - @Pc(13) PrivilegedRequest local13 = Static446.aSignlink6.method8981("2"); + @Pc(13) PrivilegedRequest local13 = Static446.aSignlink6.openPreferences("2"); while (local13.state == 0) { Static638.sleep(1L); } if (local13.state == 1) { - local7 = (FileOnDisk) local13.anObject13; + local7 = (FileOnDisk) local13.result; @Pc(41) byte[] local41 = new byte[(int) local7.method2161()]; @Pc(57) int local57; for (@Pc(43) int local43 = 0; local43 < local41.length; local43 += local57) { diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java index 3e8be9d..9a426c3 100644 --- a/client/src/main/java/Static220.java +++ b/client/src/main/java/Static220.java @@ -68,10 +68,10 @@ public static void method3198(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 } } } - local42.anInt9357 = local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.anInt10690; - local42.anInt9362 = local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.anInt10690 + (local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.method9302((byte) 53) << 8); - local42.anInt9352 = local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.anInt10694; - local42.anInt9349 = local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.anInt10694 + (local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.method9302((byte) 68) << 8); + local42.anInt9357 = local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.xFine; + local42.anInt9362 = local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.xFine + (local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.method9302((byte) 53) << 8); + local42.anInt9352 = local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.zFine; + local42.anInt9349 = local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.zFine + (local42.aClass8_Sub2_Sub1_Sub2_Sub2_3.method9302((byte) 68) << 8); Static632.method8366(arg0, local42, arg3, arg2, arg1); } for (@Pc(329) Linkable_Sub51 local329 = (Linkable_Sub51) Static113.aHashTable12.head(); local329 != null; local329 = (Linkable_Sub51) Static113.aHashTable12.next()) { @@ -112,10 +112,10 @@ public static void method3198(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 } } } - local329.anInt9357 = local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.anInt10690; - local329.anInt9362 = local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.anInt10690 + (local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.method9302((byte) 127) << 8); - local329.anInt9352 = local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.anInt10694; - local329.anInt9349 = local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.anInt10694 + (local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.method9302((byte) 62) << 8); + local329.anInt9357 = local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.xFine; + local329.anInt9362 = local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.xFine + (local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.method9302((byte) 127) << 8); + local329.anInt9352 = local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.zFine; + local329.anInt9349 = local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.zFine + (local329.aClass8_Sub2_Sub1_Sub2_Sub1_3.method9302((byte) 62) << 8); Static632.method8366(arg0, local329, arg3, arg2, arg1); } } @@ -124,22 +124,22 @@ public static void method3198(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 public static void method3200(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Component[] arg3, @OriginalArg(5) int arg4) { for (@Pc(5) int local5 = 0; local5 < arg3.length; local5++) { @Pc(14) Component local14 = arg3[local5]; - if (local14 != null && local14.anInt3743 == arg4) { + if (local14 != null && local14.overlayer == arg4) { Static507.method6743(arg1, arg2, arg0, local14); Static470.method6383(local14, arg0, arg2, -8525); - if (local14.anInt3769 - local14.anInt3802 < local14.anInt3809) { - local14.anInt3809 = local14.anInt3769 - local14.anInt3802; + if (local14.scrollMaxH - local14.width < local14.scrollX) { + local14.scrollX = local14.scrollMaxH - local14.width; } - if (local14.anInt3809 < 0) { - local14.anInt3809 = 0; + if (local14.scrollX < 0) { + local14.scrollX = 0; } - if (local14.anInt3742 - local14.anInt3746 < local14.anInt3768) { - local14.anInt3768 = local14.anInt3742 - local14.anInt3746; + if (local14.scrollMaxV - local14.height < local14.scrollY) { + local14.scrollY = local14.scrollMaxV - local14.height; } - if (local14.anInt3768 < 0) { - local14.anInt3768 = 0; + if (local14.scrollY < 0) { + local14.scrollY = 0; } - if (local14.anInt3820 == 0) { + if (local14.type == 0) { Static134.method8956(local14, arg1); } } diff --git a/client/src/main/java/Static223.java b/client/src/main/java/Static223.java index 58d6b45..7784383 100644 --- a/client/src/main/java/Static223.java +++ b/client/src/main/java/Static223.java @@ -47,7 +47,7 @@ public static Class317 method9088(@OriginalArg(1) Class265[] arg0, @OriginalArg( @OriginalMember(owner = "client!gu", name = "a", descriptor = "(IIIII)V") public static void method9094(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - @Pc(22) SecondaryLinkable_Sub2 local22 = Static440.method5963(18, (long) arg0 << 32 | (long) arg2); + @Pc(22) SecondaryLinkable_Sub2 local22 = Static440.create(18, (long) arg0 << 32 | (long) arg2); local22.method202(); local22.anInt197 = arg3; local22.anInt195 = arg1; diff --git a/client/src/main/java/Static231.java b/client/src/main/java/Static231.java index f434dfa..fb05308 100644 --- a/client/src/main/java/Static231.java +++ b/client/src/main/java/Static231.java @@ -102,7 +102,7 @@ public static Class157 method3377(@OriginalArg(0) int arg0) { @OriginalMember(owner = "client!hd", name = "a", descriptor = "(IIIII)V") public static void method3378(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(8, (long) arg2); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(8, (long) arg2); local9.method202(); local9.anInt195 = arg3; local9.anInt192 = arg1; @@ -144,8 +144,8 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool } if (!arg2.equals("heap")) { if (arg2.equalsIgnoreCase("getcamerapos")) { - Static79.method1579("Pos: " + Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 + "," + ((Static170.anInt2864 >> 9) + Static691.anInt10367 >> 6) + "," + ((Static110.anInt2186 >> 9) + Static116.anInt2270 >> 6) + "," + ((Static170.anInt2864 >> 9) + Static691.anInt10367 & 0x3F) + "," + ((Static110.anInt2186 >> 9) + Static116.anInt2270 & 0x3F) + " Height: " + (Static102.method2025(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144, -29754, Static110.anInt2186, Static170.anInt2864) - Static359.anInt5801)); - Static79.method1579("Look: " + Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 + "," + (Static441.anInt6689 + Static691.anInt10367 >> 6) + "," + (Static116.anInt2270 + Static12.anInt5741 >> 6) + "," + (Static691.anInt10367 + Static441.anInt6689 & 0x3F) + "," + (Static116.anInt2270 + Static12.anInt5741 & 0x3F) + " Height: " + (Static102.method2025(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144, -29754, Static12.anInt5741, Static441.anInt6689) - Static55.anInt1125)); + Static79.method1579("Pos: " + Static556.self.plane + "," + ((Static170.anInt2864 >> 9) + Static691.originX >> 6) + "," + ((Static110.anInt2186 >> 9) + Static116.originZ >> 6) + "," + ((Static170.anInt2864 >> 9) + Static691.originX & 0x3F) + "," + ((Static110.anInt2186 >> 9) + Static116.originZ & 0x3F) + " Height: " + (Static102.method2025(Static556.self.plane, -29754, Static110.anInt2186, Static170.anInt2864) - Static359.anInt5801)); + Static79.method1579("Look: " + Static556.self.plane + "," + (Static441.anInt6689 + Static691.originX >> 6) + "," + (Static116.originZ + Static12.anInt5741 >> 6) + "," + (Static691.originX + Static441.anInt6689 & 0x3F) + "," + (Static116.originZ + Static12.anInt5741 & 0x3F) + " Height: " + (Static102.method2025(Static556.self.plane, -29754, Static12.anInt5741, Static441.anInt6689) - Static55.anInt1125)); return; } break label721; @@ -165,7 +165,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool Static79.method1579(LocalizedText.ERROR_EXECUTING.get(Static51.clientLanguageId)); return; } - if (ModeWhere.LIVE != Static2.aModeWhere1 || Static608.anInt9290 >= 2) { + if (ModeWhere.LIVE != Static2.aModeWhere1 || Static608.staffModLevel >= 2) { if (arg2.equalsIgnoreCase("errortest")) { throw new RuntimeException(); } @@ -329,7 +329,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool if (Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915() == 0) { Static79.method1579("Entered tk0"); Static400.aClass2_Sub34_28.method5104(0, Static400.aClass2_Sub34_28.aPreference_Sub29_2); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } @@ -341,7 +341,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool if (Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915() == 1) { Static79.method1579("Entered tk1"); Static400.aClass2_Sub34_28.method5104(1, Static400.aClass2_Sub34_28.aPreference_Sub29_2); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } @@ -353,7 +353,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool if (Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915() == 2) { Static79.method1579("Entered tk2"); Static400.aClass2_Sub34_28.method5104(2, Static400.aClass2_Sub34_28.aPreference_Sub29_2); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } @@ -368,7 +368,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool } Static79.method1579("Entered tk3"); Static400.aClass2_Sub34_28.method5104(3, Static400.aClass2_Sub34_28.aPreference_Sub29_2); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } @@ -377,7 +377,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool if (Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915() == 5) { Static79.method1579("Entered tk5"); Static400.aClass2_Sub34_28.method5104(5, Static400.aClass2_Sub34_28.aPreference_Sub29_2); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } @@ -392,7 +392,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool local501 = Static647.method8473(arg2.substring(6)); if (local501 >= 0 && local501 <= Static461.method6268(Static369.anInt4265)) { Static400.aClass2_Sub34_28.method5104(local501, Static400.aClass2_Sub34_28.aPreference_Sub5_1); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; Static79.method1579("maxbuildarea=" + Static400.aClass2_Sub34_28.aPreference_Sub5_1.method2172()); return; @@ -453,11 +453,11 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool return; } if (arg2.equalsIgnoreCase("getcgcoord")) { - Static79.method1579("x:" + (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 >> 9) + " z:" + (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 >> 9)); + Static79.method1579("x:" + (Static556.self.xFine >> 9) + " z:" + (Static556.self.zFine >> 9)); return; } if (arg2.equalsIgnoreCase("getheight")) { - Static79.method1579("Height: " + Static246.aClass178Array1[Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144].method7869(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 >> 9, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 >> 9)); + Static79.method1579("Height: " + Static246.aClass178Array1[Static556.self.plane].method7869(Static556.self.zFine >> 9, Static556.self.xFine >> 9)); return; } if (arg2.equalsIgnoreCase("resetminimap")) { @@ -540,7 +540,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool } if (arg2.startsWith("switchworld")) { local501 = Integer.parseInt(arg2.substring(12)); - Static430.method5817(local501, Static615.method8260(local501).aString90); + Static430.hopWorld(local501, Static615.getWorld(local501).hostname); Static79.method1579("switched"); return; } @@ -685,7 +685,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool } local725 = Static647.method8473(arg2.substring(local501 + 1)); Static400.aClass2_Sub34_28.method5104(local725, Static400.aClass2_Sub34_28.aPreference_Sub3_1); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; Static498.method6646(); if (local725 != Static400.aClass2_Sub34_28.aPreference_Sub3_1.method2120()) { @@ -812,11 +812,11 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool } @OriginalMember(owner = "client!hd", name = "a", descriptor = "(ZLjava/lang/String;B)V") - public static void method3382(@OriginalArg(0) boolean arg0, @OriginalArg(1) String arg1) { + public static void add(@OriginalArg(0) boolean arg0, @OriginalArg(1) String arg1) { if (arg1 == null) { return; } - if (Static436.anInt3849 >= 100) { + if (Static436.size >= 100) { Static67.method6098(LocalizedText.IGNORE_FULL.get(Static51.clientLanguageId)); return; } @@ -825,7 +825,7 @@ public static void method3382(@OriginalArg(0) boolean arg0, @OriginalArg(1) Stri return; } @Pc(76) String local76; - for (@Pc(33) int local33 = 0; local33 < Static436.anInt3849; local33++) { + for (@Pc(33) int local33 = 0; local33 < Static436.size; local33++) { @Pc(40) String local40 = Static390.method5492(Static632.aStringArray44[local33]); if (local40 != null && local40.equals(local27)) { Static67.method6098(arg1 + LocalizedText.IGNORE_ALREADY_ADDED.get(Static51.clientLanguageId)); @@ -839,7 +839,7 @@ public static void method3382(@OriginalArg(0) boolean arg0, @OriginalArg(1) Stri } } } - for (@Pc(106) int local106 = 0; local106 < Static327.anInt5392; local106++) { + for (@Pc(106) int local106 = 0; local106 < Static327.size; local106++) { local76 = Static390.method5492(Static330.aStringArray25[local106]); if (local76 != null && local76.equals(local27)) { Static67.method6098(LocalizedText.FRIEND_REMOVE_PRE.get(Static51.clientLanguageId) + arg1 + LocalizedText.FRIEND_REMOVE_POST.get(Static51.clientLanguageId)); @@ -853,7 +853,7 @@ public static void method3382(@OriginalArg(0) boolean arg0, @OriginalArg(1) Stri } } } - if (Static390.method5492(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2).equals(local27)) { + if (Static390.method5492(Static556.self.username).equals(local27)) { Static67.method6098(LocalizedText.IGNORE_CANNOT_ADD_SELF.get(Static51.clientLanguageId)); return; } diff --git a/client/src/main/java/Static232.java b/client/src/main/java/Static232.java index 4ee513b..fc25310 100644 --- a/client/src/main/java/Static232.java +++ b/client/src/main/java/Static232.java @@ -5,7 +5,7 @@ public final class Static232 { @OriginalMember(owner = "client!hda", name = "Tc", descriptor = "Lclient!faa;") - public static AudioThread aAudioThread1; + public static AudioThread thread; @OriginalMember(owner = "client!hda", name = "id", descriptor = "I") public static int anInt3829; diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java index 06de221..77c52d6 100644 --- a/client/src/main/java/Static233.java +++ b/client/src/main/java/Static233.java @@ -17,7 +17,7 @@ public static void method3407(@OriginalArg(3) int arg0, @OriginalArg(4) int arg1 @Pc(22) Class254 local22 = local14[local16]; if (local22 != null && local22.anInt6363 == 2) { Static143.method3573(local22.anInt6365 * 2, local22.anInt6369, arg0 >> 1, local22.anInt6362, local22.anInt6368, arg3 >> 1); - if (Static215.anIntArray284[0] > -1 && Static333.anInt5455 % 20 < 10) { + if (Static215.anIntArray284[0] > -1 && Static333.loop % 20 < 10) { @Pc(76) SoftwareIndexedSprite local76 = Static28.aSoftwareIndexedSpriteArray1[local22.anInt6367]; @Pc(84) int local84 = arg2 + Static215.anIntArray284[0] - 12; @Pc(92) int local92 = Static215.anIntArray284[1] + arg1 - 28; diff --git a/client/src/main/java/Static236.java b/client/src/main/java/Static236.java index 5d134d8..fded2df 100644 --- a/client/src/main/java/Static236.java +++ b/client/src/main/java/Static236.java @@ -19,8 +19,8 @@ public final class Static236 { @OriginalMember(owner = "client!hfa", name = "a", descriptor = "(IZ)V") public static void method3450(@OriginalArg(0) int arg0) { - @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.method5963(14, (long) arg0); - local16.method205(); + @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.create(14, (long) arg0); + local16.pushClient(); } @OriginalMember(owner = "client!hfa", name = "a", descriptor = "(Lclient!gw;I)Z") @@ -36,7 +36,7 @@ public static boolean method3451(@OriginalArg(0) Connection arg0) { return true; } } catch (@Pc(29) Exception local29) { - @Pc(106) String local106 = "T2 - " + (arg0.packetType == null ? -1 : arg0.packetType.getOpcode()) + "," + (arg0.lastPacketType == null ? -1 : arg0.lastPacketType.getOpcode()) + "," + (arg0.lastPacketType2 == null ? -1 : arg0.lastPacketType2.getOpcode()) + " - " + arg0.anInt3648 + "," + (Static691.anInt10367 + Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray879[0]) + "," + (Static116.anInt2270 + Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray878[0]) + " - "; + @Pc(106) String local106 = "T2 - " + (arg0.packetType == null ? -1 : arg0.packetType.getOpcode()) + "," + (arg0.lastPacketType == null ? -1 : arg0.lastPacketType.getOpcode()) + "," + (arg0.lastPacketType2 == null ? -1 : arg0.lastPacketType2.getOpcode()) + " - " + arg0.anInt3648 + "," + (Static691.originX + Static556.self.anIntArray879[0]) + "," + (Static116.originZ + Static556.self.anIntArray878[0]) + " - "; for (@Pc(108) int local108 = 0; arg0.anInt3648 > local108 && local108 < 50; local108++) { local106 = local106 + arg0.inboundPacket.data[local108] + ","; } diff --git a/client/src/main/java/Static237.java b/client/src/main/java/Static237.java index 484f7f3..370ae0a 100644 --- a/client/src/main/java/Static237.java +++ b/client/src/main/java/Static237.java @@ -6,7 +6,7 @@ public final class Static237 { public static Js5 aJs587; @OriginalMember(owner = "client!hga", name = "A", descriptor = "[I") - public static final int[] anIntArray518 = new int[25]; + public static final int[] experience = new int[25]; @OriginalMember(owner = "client!hga", name = "q", descriptor = "I") public static final int anInt6524 = 2; diff --git a/client/src/main/java/Static24.java b/client/src/main/java/Static24.java index 78c67c2..64fab6b 100644 --- a/client/src/main/java/Static24.java +++ b/client/src/main/java/Static24.java @@ -15,9 +15,9 @@ public final class Static24 { @OriginalMember(owner = "client!aq", name = "a", descriptor = "(I)V") public static void method680() { - Static147.method2421((long) Static333.anInt5455, Static163.aClass19_17); - if (Static377.anInt5930 != -1) { - Static26.method716(Static377.anInt5930); + Static147.method2421((long) Static333.loop, Static163.aClass19_17); + if (Static377.topLevelInterface != -1) { + Static26.method716(Static377.topLevelInterface); } for (@Pc(23) int local23 = 0; local23 < Static122.anInt2339; local23++) { if (Static364.aBooleanArray18[local23]) { @@ -26,8 +26,8 @@ public static void method680() { Static359.aBooleanArray17[local23] = Static364.aBooleanArray18[local23]; Static364.aBooleanArray18[local23] = false; } - Static171.anInt2880 = Static333.anInt5455; - if (Static377.anInt5930 != -1) { + Static171.anInt2880 = Static333.loop; + if (Static377.topLevelInterface != -1) { Static122.anInt2339 = 0; Static261.method3833(); } diff --git a/client/src/main/java/Static240.java b/client/src/main/java/Static240.java index 94bceb0..2023898 100644 --- a/client/src/main/java/Static240.java +++ b/client/src/main/java/Static240.java @@ -36,12 +36,12 @@ public static void method3496(@OriginalArg(0) Throwable arg0, @OriginalArg(1) St local12 = Static232.method3395(local12, "&", "%26"); local12 = Static232.method3395(local12, "#", "%23"); if (Static631.anApplet4 != null) { - @Pc(131) PrivilegedRequest local131 = Static284.aSignlink4.method8992(new URL(Static631.anApplet4.getCodeBase(), "clienterror.ws?c=" + Static373.anInt5905 + "&u=" + (Static515.aString96 == null ? String.valueOf(Static292.aLong163) : Static515.aString96) + "&v1=" + Static689.aString123 + "&v2=" + Static689.aString124 + "&e=" + local12)); + @Pc(131) PrivilegedRequest local131 = Static284.aSignlink4.openUrlStream(new URL(Static631.anApplet4.getCodeBase(), "clienterror.ws?c=" + Static373.anInt5905 + "&u=" + (Static515.aString96 == null ? String.valueOf(Static292.aLong163) : Static515.aString96) + "&v1=" + Static689.aString123 + "&v2=" + Static689.aString124 + "&e=" + local12)); while (local131.state == 0) { Static638.sleep(1L); } if (local131.state == 1) { - @Pc(148) DataInputStream local148 = (DataInputStream) local131.anObject13; + @Pc(148) DataInputStream local148 = (DataInputStream) local131.result; local148.read(); local148.close(); } diff --git a/client/src/main/java/Static242.java b/client/src/main/java/Static242.java index 88e922b..f6c5ddf 100644 --- a/client/src/main/java/Static242.java +++ b/client/src/main/java/Static242.java @@ -54,13 +54,13 @@ public static int method3503(@OriginalArg(1) boolean arg0) { } @OriginalMember(owner = "client!hj", name = "a", descriptor = "(Ljava/lang/String;II)V") - public static void method3504(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1) { + public static void clickPlayerOption(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1) { @Pc(5) int local5 = Static338.anInt5564; @Pc(7) int[] local7 = Static210.anIntArray280; @Pc(9) boolean local9 = false; for (@Pc(19) int local19 = 0; local19 < local5; local19++) { @Pc(26) Player local26 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local7[local19]]; - if (local26 != null && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 != local26 && local26.name2 != null && local26.name2.equalsIgnoreCase(arg0)) { + if (local26 != null && Static556.self != local26 && local26.username != null && local26.username.equalsIgnoreCase(arg0)) { @Pc(47) ClientProt local47 = null; if (arg1 == 1) { local47 = Static424.aClientProt79; diff --git a/client/src/main/java/Static247.java b/client/src/main/java/Static247.java index 2f784da..44989ac 100644 --- a/client/src/main/java/Static247.java +++ b/client/src/main/java/Static247.java @@ -11,7 +11,7 @@ public final class Static247 { public static void method3523(@OriginalArg(1) Player arg0) { @Pc(16) Linkable_Sub51 local16 = (Linkable_Sub51) Static113.aHashTable12.get((long) arg0.anInt10740); if (local16 == null) { - Static89.method1714(arg0.aByte144, arg0, arg0.anIntArray879[0], arg0.anIntArray878[0], (Npc) null, (LocType) null, 0); + Static89.method1714(arg0.plane, arg0, arg0.anIntArray879[0], arg0.anIntArray878[0], (Npc) null, (LocType) null, 0); } else { local16.method8236(); } diff --git a/client/src/main/java/Static249.java b/client/src/main/java/Static249.java index 610b50f..03b5505 100644 --- a/client/src/main/java/Static249.java +++ b/client/src/main/java/Static249.java @@ -5,7 +5,7 @@ public final class Static249 { @OriginalMember(owner = "client!hma", name = "B", descriptor = "I") - public static int anInt4008 = 0; + public static int rebootTimer = 0; @OriginalMember(owner = "client!hma", name = "k", descriptor = "I") public static int anInt4018 = 0; @@ -87,7 +87,7 @@ public static boolean method3537(@OriginalArg(1) boolean arg0) { return false; } else { Static400.aClass2_Sub34_28.method5104(arg0 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub20_1); - Static666.method8693(1); + Static666.write(1); return true; } } diff --git a/client/src/main/java/Static25.java b/client/src/main/java/Static25.java index 70e0739..9ee9f84 100644 --- a/client/src/main/java/Static25.java +++ b/client/src/main/java/Static25.java @@ -19,25 +19,25 @@ public final class Static25 { @OriginalMember(owner = "client!as", name = "a", descriptor = "(ZZ)V") public static void method688(@OriginalArg(0) boolean arg0) { if (arg0) { - if (Static377.anInt5930 != -1) { - Static347.method5094(Static377.anInt5930); + if (Static377.topLevelInterface != -1) { + Static347.method5094(Static377.topLevelInterface); } - for (@Pc(16) SubInterface local16 = (SubInterface) Static548.aHashTable40.head(); local16 != null; local16 = (SubInterface) Static548.aHashTable40.next()) { + for (@Pc(16) SubInterface local16 = (SubInterface) Static548.openInterfaces.head(); local16 != null; local16 = (SubInterface) Static548.openInterfaces.next()) { if (!local16.isLinked()) { - local16 = (SubInterface) Static548.aHashTable40.head(); + local16 = (SubInterface) Static548.openInterfaces.head(); if (local16 == null) { break; } } Static449.method6115(false, true, local16); } - Static377.anInt5930 = -1; - Static548.aHashTable40 = new HashTable(8); + Static377.topLevelInterface = -1; + Static548.openInterfaces = new HashTable(8); Static656.method6692(); - Static377.anInt5930 = Static65.aClass3_1.anInt82; + Static377.topLevelInterface = Static65.aClass3_1.anInt82; Static640.method8435(false); Static469.method6362(); - Static472.method6414(Static377.anInt5930); + Static472.method6414(Static377.topLevelInterface); } Static461.aBoolean529 = true; } diff --git a/client/src/main/java/Static251.java b/client/src/main/java/Static251.java index 794e8ab..f29c7d9 100644 --- a/client/src/main/java/Static251.java +++ b/client/src/main/java/Static251.java @@ -8,7 +8,7 @@ public final class Static251 { public static int anInt4037; @OriginalMember(owner = "client!ho", name = "l", descriptor = "I") - public static int anInt4036 = 0; + public static int state = 0; @OriginalMember(owner = "client!ho", name = "a", descriptor = "(BII)Z") public static boolean method3549(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { @@ -17,16 +17,16 @@ public static boolean method3549(@OriginalArg(1) int arg0, @OriginalArg(2) int a } @Pc(12) int local12 = arg0 >> 16; @Pc(23) int local23 = arg0 & 0xFFFF; - if (Static453.aComponentArrayArray2[local12] == null || Static453.aComponentArrayArray2[local12][local23] == null) { + if (Static453.components[local12] == null || Static453.components[local12][local23] == null) { return false; } - @Pc(44) Component local44 = Static453.aComponentArrayArray2[local12][local23]; + @Pc(44) Component local44 = Static453.components[local12][local23]; @Pc(57) SecondaryLinkable_Sub16 local57; - if (arg1 == -1 && local44.anInt3820 == 0) { + if (arg1 == -1 && local44.type == 0) { for (local57 = (SecondaryLinkable_Sub16) Static693.aLinkedList79.head(); local57 != null; local57 = (SecondaryLinkable_Sub16) Static693.aLinkedList79.next()) { if (local57.anInt7314 == 18 || local57.anInt7314 == 1002 || local57.anInt7314 == 12 || local57.anInt7314 == 20 || local57.anInt7314 == 10) { - for (@Pc(160) Component local160 = Static145.method2412(local57.anInt7313); local160 != null; local160 = Static556.method7299(local160)) { - if (local160.anInt3812 == local44.anInt3812) { + for (@Pc(160) Component local160 = Static145.getComponent(local57.anInt7313); local160 != null; local160 = Static556.method7299(local160)) { + if (local160.id == local44.id) { return true; } } @@ -34,7 +34,7 @@ public static boolean method3549(@OriginalArg(1) int arg0, @OriginalArg(2) int a } } else { for (local57 = (SecondaryLinkable_Sub16) Static693.aLinkedList79.head(); local57 != null; local57 = (SecondaryLinkable_Sub16) Static693.aLinkedList79.next()) { - if (local57.anInt7316 == arg1 && local44.anInt3812 == local57.anInt7313 && (local57.anInt7314 == 18 || local57.anInt7314 == 1002 || local57.anInt7314 == 12 || local57.anInt7314 == 20 || local57.anInt7314 == 10)) { + if (local57.anInt7316 == arg1 && local44.id == local57.anInt7313 && (local57.anInt7314 == 18 || local57.anInt7314 == 1002 || local57.anInt7314 == 12 || local57.anInt7314 == 20 || local57.anInt7314 == 10)) { return true; } } diff --git a/client/src/main/java/Static254.java b/client/src/main/java/Static254.java index 6e553bf..fc6ee98 100644 --- a/client/src/main/java/Static254.java +++ b/client/src/main/java/Static254.java @@ -63,20 +63,20 @@ public static void method3605() { Static511.anIntArray614[local8765] = -1; } } - if (Static377.anInt5930 != -1) { - Static347.method5094(Static377.anInt5930); + if (Static377.topLevelInterface != -1) { + Static347.method5094(Static377.topLevelInterface); } - for (@Pc(8803) SubInterface local8803 = (SubInterface) Static548.aHashTable40.head(); local8803 != null; local8803 = (SubInterface) Static548.aHashTable40.next()) { + for (@Pc(8803) SubInterface local8803 = (SubInterface) Static548.openInterfaces.head(); local8803 != null; local8803 = (SubInterface) Static548.openInterfaces.next()) { if (!local8803.isLinked()) { - local8803 = (SubInterface) Static548.aHashTable40.head(); + local8803 = (SubInterface) Static548.openInterfaces.head(); if (local8803 == null) { break; } } Static449.method6115(false, true, local8803); } - Static377.anInt5930 = -1; - Static548.aHashTable40 = new HashTable(8); + Static377.topLevelInterface = -1; + Static548.openInterfaces = new HashTable(8); Static656.method6692(); Static390.aComponent9 = null; for (@Pc(8849) int local8849 = 0; local8849 < 8; local8849++) { @@ -93,9 +93,9 @@ public static void method3605() { Static105.aClass171Array1[local8893] = new Class171(); } for (@Pc(8911) int local8911 = 0; local8911 < 25; local8911++) { - Static581.anIntArray688[local8911] = 0; - Static498.anIntArray604[local8911] = 0; - Static237.anIntArray518[local8911] = 0; + Static581.boostedLevels[local8911] = 0; + Static498.baseLevels[local8911] = 0; + Static237.experience[local8911] = 0; } Static218.method3187(); Static273.aBoolean339 = true; diff --git a/client/src/main/java/Static256.java b/client/src/main/java/Static256.java index b12fcd8..e862f27 100644 --- a/client/src/main/java/Static256.java +++ b/client/src/main/java/Static256.java @@ -41,13 +41,13 @@ public static void method3638(@OriginalArg(1) PathingEntity arg0, @OriginalArg(2 } if (arg0.aClass152_11.method9109() && !arg0.aClass152_11.method9106()) { @Pc(41) SeqType local41 = arg0.aClass152_11.method9107(); - if (arg0.anInt10762 > 0 && local41.anInt1642 == 0) { + if (arg0.anInt10762 > 0 && local41.looptype == 0) { Static524.anInt8042 = 0; Static521.anInt7756 = -1; arg0.anInt10763++; return; } - if (arg0.anInt10762 <= 0 && local41.anInt1654 == 0) { + if (arg0.anInt10762 <= 0 && local41.movetype == 0) { Static521.anInt7756 = -1; arg0.anInt10763++; Static524.anInt8042 = 0; @@ -58,14 +58,14 @@ public static void method3638(@OriginalArg(1) PathingEntity arg0, @OriginalArg(2 if (arg0.aClass199Array3[local86].anInt4930 != -1 && arg0.aClass199Array3[local86].aClass152_7.method9106()) { @Pc(117) SpotAnimType local117 = Static23.aSpotAnimTypeList1.method2694(arg0.aClass199Array3[local86].anInt4930); if (local117.aBoolean448 && local117.anInt5842 != -1) { - @Pc(133) SeqType local133 = Static25.aSeqTypeList1.method1162(local117.anInt5842); - if (arg0.anInt10762 > 0 && local133.anInt1642 == 0) { + @Pc(133) SeqType local133 = Static25.aSeqTypeList1.get(local117.anInt5842); + if (arg0.anInt10762 > 0 && local133.looptype == 0) { Static521.anInt7756 = -1; arg0.anInt10763++; Static524.anInt8042 = 0; return; } - if (arg0.anInt10762 <= 0 && local133.anInt1654 == 0) { + if (arg0.anInt10762 <= 0 && local133.movetype == 0) { Static521.anInt7756 = -1; arg0.anInt10763++; Static524.anInt8042 = 0; @@ -74,8 +74,8 @@ public static void method3638(@OriginalArg(1) PathingEntity arg0, @OriginalArg(2 } } } - @Pc(186) int local186 = arg0.anInt10690; - @Pc(189) int local189 = arg0.anInt10694; + @Pc(186) int local186 = arg0.xFine; + @Pc(189) int local189 = arg0.zFine; @Pc(206) int local206 = arg0.anIntArray879[arg0.anInt10764 - 1] * 512 + arg0.method9302((byte) 76) * 256; @Pc(222) int local222 = arg0.anIntArray878[arg0.anInt10764 - 1] * 512 + arg0.method9302((byte) 105) * 256; if (local186 < local206) { @@ -101,8 +101,8 @@ public static void method3638(@OriginalArg(1) PathingEntity arg0, @OriginalArg(2 } @Pc(348) byte local348 = arg0.aByteArray111[arg0.anInt10764 - 1]; if (!arg1 && (local206 - local186 > 1024 || local206 - local186 < -1024 || local222 - local189 > 1024 || local222 - local189 < -1024)) { - arg0.anInt10694 = local222; - arg0.anInt10690 = local206; + arg0.zFine = local222; + arg0.xFine = local206; arg0.method9298(arg0.anInt10756, false); Static524.anInt8042 = 0; if (arg0.anInt10762 > 0) { @@ -150,8 +150,8 @@ public static void method3638(@OriginalArg(1) PathingEntity arg0, @OriginalArg(2 local422 <<= 0x9; if (arg0.anInt10764 == 1) { local468 = arg0.anInt10765 * arg0.anInt10765; - @Pc(642) int local642 = (local206 >= arg0.anInt10690 ? local206 - arg0.anInt10690 : arg0.anInt10690 - local206) << 9; - @Pc(661) int local661 = (arg0.anInt10694 <= local222 ? local222 - arg0.anInt10694 : arg0.anInt10694 + -local222) << 9; + @Pc(642) int local642 = (local206 >= arg0.xFine ? local206 - arg0.xFine : arg0.xFine - local206) << 9; + @Pc(661) int local661 = (arg0.zFine <= local222 ? local222 - arg0.zFine : arg0.zFine + -local222) << 9; @Pc(673) int local673 = local642 > local661 ? local642 : local661; @Pc(680) int local680 = local673 * local9.anInt7229 * 2; if (local680 < local468) { @@ -188,16 +188,16 @@ public static void method3638(@OriginalArg(1) PathingEntity arg0, @OriginalArg(2 Static521.anInt7756 = -1; } else { if (local206 > local186) { - arg0.anInt10690 += local422; + arg0.xFine += local422; Static524.anInt8042 |= 0x4; - if (arg0.anInt10690 > local206) { - arg0.anInt10690 = local206; + if (arg0.xFine > local206) { + arg0.xFine = local206; } } else if (local206 < local186) { - arg0.anInt10690 -= local422; + arg0.xFine -= local422; Static524.anInt8042 |= 0x8; - if (local206 > arg0.anInt10690) { - arg0.anInt10690 = local206; + if (local206 > arg0.xFine) { + arg0.xFine = local206; } } if (local422 >= 32) { @@ -207,19 +207,19 @@ public static void method3638(@OriginalArg(1) PathingEntity arg0, @OriginalArg(2 } if (local222 > local189) { Static524.anInt8042 |= 0x1; - arg0.anInt10694 += local422; - if (local222 < arg0.anInt10694) { - arg0.anInt10694 = local222; + arg0.zFine += local422; + if (local222 < arg0.zFine) { + arg0.zFine = local222; } } else if (local222 < local189) { - arg0.anInt10694 -= local422; + arg0.zFine -= local422; Static524.anInt8042 |= 0x2; - if (local222 > arg0.anInt10694) { - arg0.anInt10694 = local222; + if (local222 > arg0.zFine) { + arg0.zFine = local222; } } } - if (arg0.anInt10690 != local206 || local222 != arg0.anInt10694) { + if (arg0.xFine != local206 || local222 != arg0.zFine) { return; } arg0.anInt10764--; @@ -232,19 +232,19 @@ public static void method3638(@OriginalArg(1) PathingEntity arg0, @OriginalArg(2 @OriginalMember(owner = "client!hu", name = "a", descriptor = "(Lclient!da;Ljava/lang/String;Lclient!ve;IIIZLclient!hda;Lclient!aa;III)V") public static void method3639(@OriginalArg(0) Class14 arg0, @OriginalArg(1) String arg1, @OriginalArg(2) Class381 arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) Component arg6, @OriginalArg(8) Class1 arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) int arg10) { @Pc(11) int local11; - if (Static511.anInt7645 == 4) { + if (Static511.cameraType == 4) { local11 = (int) Static171.aFloat64 & 0x3FFF; } else { local11 = (int) Static171.aFloat64 + Static29.anInt723 & 0x3FFF; } - @Pc(33) int local33 = Math.max(arg6.anInt3802 / 2, arg6.anInt3746 / 2) + 10; + @Pc(33) int local33 = Math.max(arg6.width / 2, arg6.height / 2) + 10; @Pc(59) int local59 = arg8 * arg8 + arg10 * arg10; if (local33 * local33 < local59) { return; } @Pc(74) int local74 = Model.anIntArray741[local11]; @Pc(78) int local78 = Model.anIntArray740[local11]; - if (Static511.anInt7645 != 4) { + if (Static511.cameraType != 4) { local74 = local74 * 256 / (Static660.anInt9835 + 256); local78 = local78 * 256 / (Static660.anInt9835 + 256); } @@ -253,8 +253,8 @@ public static void method3639(@OriginalArg(0) Class14 arg0, @OriginalArg(1) Stri @Pc(125) int local125 = arg2.method8741((SoftwareIndexedSprite[]) null, arg1, 100); @Pc(131) int local131 = local107 - local125 / 2; @Pc(139) int local139 = arg2.method8745(100, 0, arg1, (SoftwareIndexedSprite[]) null); - if (local131 >= -arg6.anInt3802 && arg6.anInt3802 >= local131 && local118 >= -arg6.anInt3746 && arg6.anInt3746 >= local118) { - arg0.method8826(arg9, (int[]) null, arg4, arg1, arg7, (SoftwareIndexedSprite[]) null, arg6.anInt3746 / 2 + arg9 - local118 - arg5 - local139, 0, arg3, 1, arg6.anInt3802 / 2 + local131 + arg3, 0, 0, local125, 50); + if (local131 >= -arg6.width && arg6.width >= local131 && local118 >= -arg6.height && arg6.height >= local118) { + arg0.method8826(arg9, (int[]) null, arg4, arg1, arg7, (SoftwareIndexedSprite[]) null, arg6.height / 2 + arg9 - local118 - arg5 - local139, 0, arg3, 1, arg6.width / 2 + local131 + arg3, 0, 0, local125, 50); } } } diff --git a/client/src/main/java/Static26.java b/client/src/main/java/Static26.java index 89d3c35..f050dfb 100644 --- a/client/src/main/java/Static26.java +++ b/client/src/main/java/Static26.java @@ -9,8 +9,8 @@ public final class Static26 { @OriginalMember(owner = "client!at", name = "a", descriptor = "(II)V") public static void method716(@OriginalArg(1) int arg0) { - if (Static571.method7566(arg0)) { - Static643.method8444(-1, Static453.aComponentArrayArray2[arg0]); + if (Static571.load(arg0)) { + Static643.method8444(-1, Static453.components[arg0]); } } diff --git a/client/src/main/java/Static261.java b/client/src/main/java/Static261.java index 06dd1fb..ae51cd9 100644 --- a/client/src/main/java/Static261.java +++ b/client/src/main/java/Static261.java @@ -18,7 +18,7 @@ public static void method3833() { local46 = Static130.method2283(); local48 = Static422.method5771(); } - Static534.method7120(Static377.anInt5930, local46, Static680.anInt10289 + local46, local48, local48, -1, local46, Static380.anInt5979 + local48); + Static534.method7120(Static377.topLevelInterface, local46, Static680.anInt10289 + local46, local48, local48, -1, local46, Static380.anInt5979 + local48); if (Static438.aComponentArray3 != null) { Static71.method1522(-1412584499, Static213.anInt3475, Static438.aComponentArray3, local46, local48, local48 + Static380.anInt5979, Static354.aComponent8.anInt3752, true, local46 + Static680.anInt10289, Static101.anInt2098); Static438.aComponentArray3 = null; diff --git a/client/src/main/java/Static273.java b/client/src/main/java/Static273.java index e7413a0..a269e7d 100644 --- a/client/src/main/java/Static273.java +++ b/client/src/main/java/Static273.java @@ -21,8 +21,8 @@ public final class Static273 { @OriginalMember(owner = "client!ik", name = "a", descriptor = "(II)V") public static void method3959(@OriginalArg(0) int arg0) { - @Pc(17) SecondaryLinkable_Sub2 local17 = Static440.method5963(16, (long) arg0); - local17.method205(); + @Pc(17) SecondaryLinkable_Sub2 local17 = Static440.create(16, (long) arg0); + local17.pushClient(); } @OriginalMember(owner = "client!ik", name = "a", descriptor = "(Lclient!bd;ZIILclient!sb;II)V") diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java index eb87998..f657c19 100644 --- a/client/src/main/java/Static276.java +++ b/client/src/main/java/Static276.java @@ -4,7 +4,7 @@ public final class Static276 { @OriginalMember(owner = "client!ila", name = "k", descriptor = "Lclient!ss;") - public static final ClientProt aClientProt56 = new ClientProt(59, -1); + public static final ClientProt RESUME_P_NAMEDIALOG = new ClientProt(59, -1); @OriginalMember(owner = "client!ila", name = "a", descriptor = "(I)V") public static void method3986() { @@ -50,10 +50,10 @@ public static void method3988() { Static682.anIntArray817[local30] = 1000000; Static153.anIntArray235[local30] = 0; } - @Pc(92) int local92 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690; - @Pc(95) int local95 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694; + @Pc(92) int local92 = Static556.self.xFine; + @Pc(95) int local95 = Static556.self.zFine; @Pc(149) int local149; - if (Static511.anInt7645 != 1 && Static692.anInt10376 == -1) { + if (Static511.cameraType != 1 && Static692.anInt10376 == -1) { local149 = Static102.method2025(Static394.anInt6176, -29754, Static110.anInt2186, Static170.anInt2864); if (local149 - Static359.anInt5801 < 3200 && (Static280.aByteArrayArrayArray3[Static394.anInt6176][Static170.anInt2864 >> 9][Static110.anInt2186 >> 9] & 0x4) != 0) { Static409.method5656(Static110.anInt2186 >> 9, Static334.aClass291ArrayArrayArray1, 1, Static170.anInt2864 >> 9, false); @@ -61,7 +61,7 @@ public static void method3988() { } return; } - if (Static511.anInt7645 != 1) { + if (Static511.cameraType != 1) { local92 = Static692.anInt10376; local95 = Static693.anInt10383; } @@ -147,7 +147,7 @@ public static void method3988() { } return; } - Static240.method3496((Throwable) null, "RC: " + local149 + "," + local153 + " " + local157 + "," + local161 + " " + Static691.anInt10367 + "," + Static116.anInt2270); + Static240.method3496((Throwable) null, "RC: " + local149 + "," + local153 + " " + local157 + "," + local161 + " " + Static691.originX + "," + Static116.originZ); return; } } diff --git a/client/src/main/java/Static28.java b/client/src/main/java/Static28.java index 19b6fe8..efa1cb4 100644 --- a/client/src/main/java/Static28.java +++ b/client/src/main/java/Static28.java @@ -17,7 +17,7 @@ public static void method746(@OriginalArg(0) int arg0, @OriginalArg(1) Class19 a return; } @Pc(30) Class1 local30 = local23.aClass1_1; - arg1.KA(arg3, arg0, arg3 + arg2.anInt3802, arg0 - -arg2.anInt3746); + arg1.KA(arg3, arg0, arg3 + arg2.width, arg0 - -arg2.height); if (Static578.anInt8595 == 2 || Static578.anInt8595 == 5 || Static12.aSoftwareIndexedSprite26 == null) { arg1.A(-16777216, local30, arg3, arg0); return; @@ -26,7 +26,7 @@ public static void method746(@OriginalArg(0) int arg0, @OriginalArg(1) Class19 a @Pc(93) int local93; @Pc(87) int local87; @Pc(79) int local79; - if (Static511.anInt7645 == 4) { + if (Static511.cameraType == 4) { local87 = (int) -Static171.aFloat64 & 0x3FFF; local79 = 4096; local93 = Static249.anInt4018; @@ -34,20 +34,20 @@ public static void method746(@OriginalArg(0) int arg0, @OriginalArg(1) Class19 a } else { local79 = 4096 - Static660.anInt9835 * 16; local87 = (int) -Static171.aFloat64 + Static29.anInt723 & 0x3FFF; - local90 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690; - local93 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694; + local90 = Static556.self.xFine; + local93 = Static556.self.zFine; } @Pc(120) int local120 = local90 / 128 + 208 + 48 - Static720.anInt10859 * 2; @Pc(137) int local137 = Static501.anInt7568 * 4 + 48 - local93 / 128 - (Static501.anInt7568 - 104) * 2; - Static12.aSoftwareIndexedSprite26.method8185((float) arg3 + (float) arg2.anInt3802 / 2.0F, (float) arg2.anInt3746 / 2.0F + (float) arg0, (float) local120, (float) local137, local79, local87 << 2, local30, arg3, arg0); + Static12.aSoftwareIndexedSprite26.method8185((float) arg3 + (float) arg2.width / 2.0F, (float) arg2.height / 2.0F + (float) arg0, (float) local120, (float) local137, local79, local87 << 2, local30, arg3, arg0); @Pc(190) int local190; @Pc(200) int local200; @Pc(211) int local211; @Pc(222) int local222; for (@Pc(171) IntNode local171 = (IntNode) Static612.aLinkedList67.head(); local171 != null; local171 = (IntNode) Static612.aLinkedList67.next()) { @Pc(178) int local178 = local171.value; - local190 = (Static42.aClass255_2.anIntArray495[local178] >> 14 & 0x3FFF) - Static691.anInt10367; - local200 = (Static42.aClass255_2.anIntArray495[local178] & 0x3FFF) - Static116.anInt2270; + local190 = (Static42.aClass255_2.anIntArray495[local178] >> 14 & 0x3FFF) - Static691.originX; + local200 = (Static42.aClass255_2.anIntArray495[local178] & 0x3FFF) - Static116.originZ; local211 = local190 * 4 + 2 - local90 / 128; local222 = local200 * 4 + 2 - local93 / 128; Static620.method8322(local222, arg3, local30, arg1, Static42.aClass255_2.anIntArray496[local178], arg0, local211, arg2); @@ -69,8 +69,8 @@ public static void method746(@OriginalArg(0) int arg0, @OriginalArg(1) Class19 a for (@Pc(334) Linkable_Sub17 local334 = (Linkable_Sub17) Static497.aHashTable35.head(); local334 != null; local334 = (Linkable_Sub17) Static497.aHashTable35.next()) { local211 = (int) (local334.id >> 28 & 0x3L); if (Static643.anInt9604 == local211) { - local222 = (int) (local334.id & 0x3FFFL) - Static691.anInt10367; - @Pc(370) int local370 = (int) (local334.id >> 14 & 0x3FFFL) - Static116.anInt2270; + local222 = (int) (local334.id & 0x3FFFL) - Static691.originX; + @Pc(370) int local370 = (int) (local334.id >> 14 & 0x3FFFL) - Static116.originZ; local381 = local222 * 4 + 2 - local90 / 128; local392 = local370 * 4 + 2 - local93 / 128; Static6.method107(arg0, local30, Static471.aSoftwareIndexedSpriteArray11[0], local392, local381, arg2, arg3); @@ -81,14 +81,14 @@ public static void method746(@OriginalArg(0) int arg0, @OriginalArg(1) Class19 a @Pc(427) Linkable_Sub45 local427 = (Linkable_Sub45) Static18.aHashTable2.get((long) Static103.anIntArray187[local211]); if (local427 != null) { @Pc(432) Npc local432 = local427.aClass8_Sub2_Sub1_Sub2_Sub2_2; - if (local432.method9322() && local432.aByte144 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144) { + if (local432.method9322() && local432.plane == Static556.self.plane) { @Pc(446) NpcType local446 = local432.aNpcType1; if (local446 != null && local446.anIntArray532 != null) { local446 = local446.method5985(65535, Static34.aClass304_1); } if (local446 != null && local446.aBoolean507 && local446.aBoolean505) { - local392 = local432.anInt10690 / 128 - local90 / 128; - local490 = local432.anInt10694 / 128 - local93 / 128; + local392 = local432.xFine / 128 - local90 / 128; + local490 = local432.zFine / 128 - local93 / 128; if (local446.anInt6733 == -1) { Static6.method107(arg0, local30, Static471.aSoftwareIndexedSpriteArray11[1], local490, local392, arg2, arg3); } else { @@ -105,25 +105,25 @@ public static void method746(@OriginalArg(0) int arg0, @OriginalArg(1) Class19 a @Pc(622) int local622; for (local381 = 0; local381 < local222; local381++) { @Pc(541) Player local541 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local531[local381]]; - if (local541 != null && local541.method1417() && !local541.aBoolean124 && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 != local541 && local541.aByte144 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144) { - local490 = local541.anInt10690 / 128 - local90 / 128; - local585 = local541.anInt10694 / 128 - local93 / 128; + if (local541 != null && local541.method1417() && !local541.aBoolean124 && Static556.self != local541 && local541.plane == Static556.self.plane) { + local490 = local541.xFine / 128 - local90 / 128; + local585 = local541.zFine / 128 - local93 / 128; @Pc(587) boolean local587 = false; - for (local589 = 0; local589 < Static327.anInt5392; local589++) { - if (local541.name2.equals(Static330.aStringArray25[local589]) && Static371.anIntArray455[local589] != 0) { + for (local589 = 0; local589 < Static327.size; local589++) { + if (local541.username.equals(Static330.aStringArray25[local589]) && Static371.worlds[local589] != 0) { local587 = true; break; } } @Pc(620) boolean local620 = false; - for (local622 = 0; local622 < Static706.anInt10633; local622++) { - if (local541.name2.equals(Static87.aClass241Array1[local622].aString66)) { + for (local622 = 0; local622 < Static706.size; local622++) { + if (local541.username.equals(Static87.members[local622].username)) { local620 = true; break; } } @Pc(652) boolean local652 = false; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt1433 != 0 && local541.anInt1433 != 0 && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt1433 == local541.anInt1433) { + if (Static556.self.anInt1433 != 0 && local541.anInt1433 != 0 && Static556.self.anInt1433 == local541.anInt1433) { local652 = true; } if (local541.aBoolean128) { @@ -145,14 +145,14 @@ public static void method746(@OriginalArg(0) int arg0, @OriginalArg(1) Class19 a @Pc(878) int local878; for (local490 = 0; local490 < local788.length; local490++) { @Pc(796) Class254 local796 = local788[local490]; - if (local796 != null && local796.anInt6363 != 0 && Static333.anInt5455 % 20 < 10) { + if (local796 != null && local796.anInt6363 != 0 && Static333.loop % 20 < 10) { @Pc(843) int local843; if (local796.anInt6363 == 1) { @Pc(828) Linkable_Sub45 local828 = (Linkable_Sub45) Static18.aHashTable2.get((long) local796.anInt6366); if (local828 != null) { @Pc(833) Npc local833 = local828.aClass8_Sub2_Sub1_Sub2_Sub2_2; - local843 = local833.anInt10690 / 128 - local90 / 128; - local622 = local833.anInt10694 / 128 - local93 / 128; + local843 = local833.xFine / 128 - local90 / 128; + local622 = local833.zFine / 128 - local93 / 128; Static114.method2132(local843, arg3, 360000L, local30, local796.anInt6367, arg0, local622, arg2); } } @@ -166,23 +166,23 @@ public static void method746(@OriginalArg(0) int arg0, @OriginalArg(1) Class19 a if (local796.anInt6363 == 10 && local796.anInt6366 >= 0 && local796.anInt6366 < Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3.length) { @Pc(932) Player local932 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local796.anInt6366]; if (local932 != null) { - local589 = local932.anInt10690 / 128 - local90 / 128; - local843 = local932.anInt10694 / 128 - local93 / 128; + local589 = local932.xFine / 128 - local90 / 128; + local843 = local932.zFine / 128 - local93 / 128; Static114.method2132(local589, arg3, 360000L, local30, local796.anInt6367, arg0, local843, arg2); } } } } - if (Static511.anInt7645 == 4) { + if (Static511.cameraType == 4) { return; } if (Static675.anInt10156 != 0) { - local585 = Static675.anInt10156 * 4 + (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method9302((byte) 50) + -1) * 2 + 2 - local90 / 128; - local878 = Static212.anInt3466 * 4 + Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method9302((byte) 127) * 2 + 2 - local93 / 128 - 2; + local585 = Static675.anInt10156 * 4 + (Static556.self.method9302((byte) 50) + -1) * 2 + 2 - local90 / 128; + local878 = Static212.anInt3466 * 4 + Static556.self.method9302((byte) 127) * 2 + 2 - local93 / 128 - 2; Static6.method107(arg0, local30, Static691.aSoftwareIndexedSpriteArray15[Static266.aBoolean583 ? 1 : 0], local878, local585, arg2, arg3); } - if (!Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aBoolean124) { - arg1.method7971(3, 3, arg0 + arg2.anInt3746 / 2 - 1, arg2.anInt3802 / 2 + arg3 + -1, -1); + if (!Static556.self.aBoolean124) { + arg1.method7971(3, 3, arg0 + arg2.height / 2 - 1, arg2.width / 2 + arg3 + -1, -1); return; } } diff --git a/client/src/main/java/Static291.java b/client/src/main/java/Static291.java index 9c4ce0d..81f9e6f 100644 --- a/client/src/main/java/Static291.java +++ b/client/src/main/java/Static291.java @@ -10,7 +10,7 @@ public final class Static291 { public static final HashTable aHashTable24 = new HashTable(512); @OriginalMember(owner = "client!je", name = "b", descriptor = "(II)I") - public static int method4226(@OriginalArg(1) int arg0) { + public static int getGroupId(@OriginalArg(1) int arg0) { return arg0 >>> 7; } } diff --git a/client/src/main/java/Static292.java b/client/src/main/java/Static292.java index 31e06d0..ada454c 100644 --- a/client/src/main/java/Static292.java +++ b/client/src/main/java/Static292.java @@ -71,7 +71,7 @@ public static void method4606(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 Static170.anInt2864 = arg3 - local67; Static359.anInt5801 = arg6 - local69; Static81.anInt1644 = 0; - Static323.anInt5119 = arg4; + Static323.cameraYaw = arg4; } @OriginalMember(owner = "client!jea", name = "b", descriptor = "(I)V") diff --git a/client/src/main/java/Static294.java b/client/src/main/java/Static294.java index 4e40aa1..e51d1ba 100644 --- a/client/src/main/java/Static294.java +++ b/client/src/main/java/Static294.java @@ -40,7 +40,7 @@ public static void method4339(@OriginalArg(1) int arg0, @OriginalArg(2) boolean } @Pc(19) boolean local19 = false; if (Static1.anInt10798 == 0) { - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 < 0 || Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 >= Static720.anInt10859 * 512 || Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 < 0 || Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 >= Static501.anInt7568 * 512) { + if (Static556.self.xFine < 0 || Static556.self.xFine >= Static720.anInt10859 * 512 || Static556.self.zFine < 0 || Static556.self.zFine >= Static501.anInt7568 * 512) { local19 = true; } } else if (!Static421.aBoolean480) { @@ -51,7 +51,7 @@ public static void method4339(@OriginalArg(1) int arg0, @OriginalArg(2) boolean return; } Static198.anInt3276++; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 != null && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 + 256 - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method9302((byte) 45) * 256 >> 9 == Static675.anInt10156 && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 - (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method9302((byte) 48) - 1) * 256 >> 9 == Static212.anInt3466) { + if (Static556.self != null && Static556.self.xFine + 256 - Static556.self.method9302((byte) 45) * 256 >> 9 == Static675.anInt10156 && Static556.self.zFine - (Static556.self.method9302((byte) 48) - 1) * 256 >> 9 == Static212.anInt3466) { Static675.anInt10156 = -1; Static212.anInt3466 = -1; Static444.method5988(); @@ -68,7 +68,7 @@ public static void method4339(@OriginalArg(1) int arg0, @OriginalArg(2) boolean @Pc(161) int local161 = Static200.anInt3305; @Pc(169) int local169; @Pc(204) int local204; - if (Static511.anInt7645 == 1) { + if (Static511.cameraType == 1) { local169 = (int) Static479.aFloat123; if (Static188.anInt3103 >> 8 > local169) { local169 = Static188.anInt3103 >> 8; @@ -77,8 +77,8 @@ public static void method4339(@OriginalArg(1) int arg0, @OriginalArg(2) boolean local169 = Static140.anIntArray222[4] + 128; } local204 = Static288.anInt4621 + (int) Static171.aFloat64 & 0x3FFF; - Static292.method4606(local169, (local169 >> 3) * 3 + 600 << 2, local161, Static494.anInt7409, local204, Static38.anInt920, Static102.method2025(Static394.anInt6176, -29754, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690) - 200); - } else if (Static511.anInt7645 == 4) { + Static292.method4606(local169, (local169 >> 3) * 3 + 600 << 2, local161, Static494.anInt7409, local204, Static38.anInt920, Static102.method2025(Static394.anInt6176, -29754, Static556.self.zFine, Static556.self.xFine) - 200); + } else if (Static511.cameraType == 4) { local169 = (int) Static479.aFloat123; if (Static188.anInt3103 >> 8 > local169) { local169 = Static188.anInt3103 >> 8; @@ -88,20 +88,20 @@ public static void method4339(@OriginalArg(1) int arg0, @OriginalArg(2) boolean } local204 = (int) Static171.aFloat64 & 0x3FFF; Static292.method4606(local169, (local169 >> 3) * 3 + 600 << 2, local161, Static494.anInt7409, local204, Static38.anInt920, Static102.method2025(Static394.anInt6176, -29754, Static249.anInt4018, Static433.anInt6262) - 200); - } else if (Static511.anInt7645 == 5) { + } else if (Static511.cameraType == 5) { Static110.method2079(local161); } local169 = Static170.anInt2864; local204 = Static359.anInt5801; @Pc(325) int local325 = Static110.anInt2186; @Pc(327) int local327 = Static598.anInt8832; - @Pc(329) int local329 = Static323.anInt5119; + @Pc(329) int local329 = Static323.cameraYaw; @Pc(375) int local375; for (@Pc(331) int local331 = 0; local331 < 5; local331++) { if (Static572.aBooleanArray29[local331]) { local375 = (int) ((double) -Static331.anIntArray403[local331] + (double) (Static331.anIntArray403[local331] * 2 + 1) * Math.random() + Math.sin((double) Static362.anIntArray450[local331] / 100.0D * (double) Static194.anIntArray268[local331]) * (double) Static140.anIntArray222[local331]); if (local331 == 3) { - Static323.anInt5119 = local375 + Static323.anInt5119 & 0x3FFF; + Static323.cameraYaw = local375 + Static323.cameraYaw & 0x3FFF; } if (local331 == 0) { Static170.anInt2864 += local375 << 2; @@ -138,7 +138,7 @@ public static void method4339(@OriginalArg(1) int arg0, @OriginalArg(2) boolean Static163.aClass19_17.KA(local153, local159, local155 + local153, local159 + local161); Static501.method6716(true); local375 = Static251.anInt4037; - Static460.aClass73_10.method7135(Static170.anInt2864, Static359.anInt5801, Static110.anInt2186, -Static598.anInt8832 & 0x3FFF, -Static323.anInt5119 & 0x3FFF, -Static81.anInt1644 & 0x3FFF); + Static460.aClass73_10.method7135(Static170.anInt2864, Static359.anInt5801, Static110.anInt2186, -Static598.anInt8832 & 0x3FFF, -Static323.cameraYaw & 0x3FFF, -Static81.anInt1644 & 0x3FFF); Static163.aClass19_17.method8000(Static460.aClass73_10); Static163.aClass19_17.DA(local155 / 2 + local153, local161 / 2 + local159, Static428.anInt6495 << 1, Static428.anInt6495 << 1); if (Static137.aBoolean210) { @@ -155,18 +155,18 @@ public static void method4339(@OriginalArg(1) int arg0, @OriginalArg(2) boolean } else { Static163.aClass19_17.xa(1.0F); Static163.aClass19_17.ZA(16777215, 0.0F, 0.0F, 1.0F, 0.0F, 0.0F); - Static456.aClass148_3.method3159(local159, Static163.aClass19_17, Static323.anInt5119, local155, local375, Static81.anInt1644, local161, local153, Static436.anInt3852 << 3, Static598.anInt8832); + Static456.aClass148_3.method3159(local159, Static163.aClass19_17, Static323.cameraYaw, local155, local375, Static81.anInt1644, local161, local153, Static436.anInt3852 << 3, Static598.anInt8832); } Static557.method7331(); Static527.method7081(Static428.anInt6495 << 1, local161 / 2 + local159, Static428.anInt6495 << 1, local153 + local155 / 2); - Static620.method8324(-Static323.anInt5119 & 0x3FFF, Static110.anInt2186, -Static81.anInt1644 & 0x3FFF, Static359.anInt5801, -Static598.anInt8832 & 0x3FFF, Static170.anInt2864); + Static620.method8324(-Static323.cameraYaw & 0x3FFF, Static110.anInt2186, -Static81.anInt1644 & 0x3FFF, Static359.anInt5801, -Static598.anInt8832 & 0x3FFF, Static170.anInt2864); Static159.method2575(); @Pc(688) byte local688 = Static400.aClass2_Sub34_28.aPreference_Sub4_2.method2143() == 2 ? (byte) Static198.anInt3276 : 1; if (Static137.aBoolean210) { - Static648.method8483(-Static323.anInt5119 & 0x3FFF, -Static81.anInt1644 & 0x3FFF, -Static598.anInt8832 & 0x3FFF); - Static466.method6324(local688, Static170.anInt2864, Static110.anInt2186, Static359.anInt5801, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 >> 9, Static457.anIntArray552, Static682.anIntArray817, Static333.anInt5455, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 + 1, Static482.anIntArray588, Static400.aClass2_Sub34_28.aPreference_Sub8_1.method3176() == 0, Static582.anInt8627, Static9.anIntArray18, Static328.aByteArrayArrayArray4, Static153.anIntArray235, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 >> 9); + Static648.method8483(-Static323.cameraYaw & 0x3FFF, -Static81.anInt1644 & 0x3FFF, -Static598.anInt8832 & 0x3FFF); + Static466.method6324(local688, Static170.anInt2864, Static110.anInt2186, Static359.anInt5801, Static556.self.zFine >> 9, Static457.anIntArray552, Static682.anIntArray817, Static333.loop, Static556.self.plane + 1, Static482.anIntArray588, Static400.aClass2_Sub34_28.aPreference_Sub8_1.method3176() == 0, Static582.anInt8627, Static9.anIntArray18, Static328.aByteArrayArrayArray4, Static153.anIntArray235, Static556.self.xFine >> 9); } else { - Static283.method4100(Static333.anInt5455, Static170.anInt2864, Static359.anInt5801, Static110.anInt2186, Static328.aByteArrayArrayArray4, Static482.anIntArray588, Static9.anIntArray18, Static457.anIntArray552, Static153.anIntArray235, Static682.anIntArray817, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 + 1, local688, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 >> 9, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 >> 9, Static400.aClass2_Sub34_28.aPreference_Sub8_1.method3176() == 0, Static504.aBoolean579 ? Static582.anInt8627 : -1, 0, false); + Static283.method4100(Static333.loop, Static170.anInt2864, Static359.anInt5801, Static110.anInt2186, Static328.aByteArrayArrayArray4, Static482.anIntArray588, Static9.anIntArray18, Static457.anIntArray552, Static153.anIntArray235, Static682.anIntArray817, Static556.self.plane + 1, local688, Static556.self.xFine >> 9, Static556.self.zFine >> 9, Static400.aClass2_Sub34_28.aPreference_Sub8_1.method3176() == 0, Static504.aBoolean579 ? Static582.anInt8627 : -1, 0, false); } Static557.method7331(); if (Static283.gameState == 11) { @@ -180,7 +180,7 @@ public static void method4339(@OriginalArg(1) int arg0, @OriginalArg(2) boolean Static170.anInt2864 = local169; Static598.anInt8832 = local327; Static359.anInt5801 = local204; - Static323.anInt5119 = local329; + Static323.cameraYaw = local329; Static288.aBoolean356 = false; if (Static426.aBoolean72 && client.js5NetQueue.method6622() == 0) { Static426.aBoolean72 = false; diff --git a/client/src/main/java/Static295.java b/client/src/main/java/Static295.java index d8cf0df..bd62e02 100644 --- a/client/src/main/java/Static295.java +++ b/client/src/main/java/Static295.java @@ -12,7 +12,7 @@ public final class Static295 { @OriginalMember(owner = "client!jga", name = "a", descriptor = "(III)V") public static void method4347(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(14) SecondaryLinkable_Sub2 local14 = Static440.method5963(13, (long) arg0); + @Pc(14) SecondaryLinkable_Sub2 local14 = Static440.create(13, (long) arg0); local14.method202(); local14.anInt197 = arg1; } diff --git a/client/src/main/java/Static298.java b/client/src/main/java/Static298.java index 6d8bc0a..0b26c78 100644 --- a/client/src/main/java/Static298.java +++ b/client/src/main/java/Static298.java @@ -53,9 +53,9 @@ public static boolean method4387(@OriginalArg(0) int arg0, @OriginalArg(2) int a @OriginalMember(owner = "client!ji", name = "a", descriptor = "(II)V") public static void method4388(@OriginalArg(1) int arg0) { Static722.anInt10905 = arg0; - @Pc(14) SoftLruHashTable local14 = Static354.aSoftLruHashTable120; - synchronized (Static354.aSoftLruHashTable120) { - Static354.aSoftLruHashTable120.clear(); + @Pc(14) SoftLruHashTable local14 = Static354.SHADOWS; + synchronized (Static354.SHADOWS) { + Static354.SHADOWS.clear(); } } } diff --git a/client/src/main/java/Static300.java b/client/src/main/java/Static300.java index 8b576af..def802b 100644 --- a/client/src/main/java/Static300.java +++ b/client/src/main/java/Static300.java @@ -32,29 +32,29 @@ public static void method4390(@OriginalArg(0) boolean arg0, @OriginalArg(2) bool } @OriginalMember(owner = "client!jj", name = "a", descriptor = "(ILclient!ge;)V") - public static void method4392(@OriginalArg(1) Packet arg0) { + public static void decodeWorlds(@OriginalArg(1) Packet arg0) { @Pc(7) int local7 = arg0.gSamrt1or2(); - Static511.aCountryArray1 = new Country[local7]; + Static511.countries = new Country[local7]; for (@Pc(12) int local12 = 0; local12 < local7; local12++) { - Static511.aCountryArray1[local12] = new Country(); - Static511.aCountryArray1[local12].anInt1610 = arg0.gSamrt1or2(); - Static511.aCountryArray1[local12].aString13 = arg0.gjstr2(); + Static511.countries[local12] = new Country(); + Static511.countries[local12].flag = arg0.gSamrt1or2(); + Static511.countries[local12].name = arg0.gjstr2(); } - Static494.anInt7396 = arg0.gSamrt1or2(); - Static699.anInt10532 = arg0.gSamrt1or2(); - Static476.anInt7177 = arg0.gSamrt1or2(); - Static106.aClass297_Sub1Array1 = new World[Static699.anInt10532 + 1 - Static494.anInt7396]; - for (@Pc(63) int local63 = 0; local63 < Static476.anInt7177; local63++) { + Static494.minId = arg0.gSamrt1or2(); + Static699.maxId = arg0.gSamrt1or2(); + Static476.size = arg0.gSamrt1or2(); + Static106.worlds = new World[Static699.maxId + 1 - Static494.minId]; + for (@Pc(63) int local63 = 0; local63 < Static476.size; local63++) { @Pc(68) int local68 = arg0.gSamrt1or2(); - @Pc(76) World local76 = Static106.aClass297_Sub1Array1[local68] = new World(); - local76.anInt7564 = arg0.g1(); - local76.anInt7563 = arg0.g4(); - local76.anInt7569 = Static494.anInt7396 + local68; - local76.aString91 = arg0.gjstr2(); - local76.aString90 = arg0.gjstr2(); + @Pc(76) World local76 = Static106.worlds[local68] = new World(); + local76.country = arg0.g1(); + local76.flags = arg0.g4(); + local76.id = Static494.minId + local68; + local76.activity = arg0.gjstr2(); + local76.hostname = arg0.gjstr2(); } - Static379.anInt5968 = arg0.g4(); - Static518.aBoolean814 = true; + Static379.checksum = arg0.g4(); + Static518.loaded = true; } @OriginalMember(owner = "client!jj", name = "a", descriptor = "(I)V") diff --git a/client/src/main/java/Static301.java b/client/src/main/java/Static301.java index 9a0ac36..60fb666 100644 --- a/client/src/main/java/Static301.java +++ b/client/src/main/java/Static301.java @@ -6,7 +6,7 @@ public final class Static301 { @OriginalMember(owner = "client!jja", name = "a", descriptor = "(IIII)V") public static void method4394(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(9, (long) arg0); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(9, (long) arg0); local9.method202(); local9.anInt197 = arg2; local9.anInt195 = arg1; diff --git a/client/src/main/java/Static305.java b/client/src/main/java/Static305.java index 3df7d73..12ccb1c 100644 --- a/client/src/main/java/Static305.java +++ b/client/src/main/java/Static305.java @@ -37,7 +37,7 @@ public static Class154_Sub4 method4437(@OriginalArg(0) Packet arg0) { @OriginalMember(owner = "client!jm", name = "a", descriptor = "(ILjava/awt/Color;Ljava/awt/Color;Ljava/awt/Color;Ljava/lang/String;B)V") public static void method4439(@OriginalArg(0) int arg0, @OriginalArg(1) Color arg1, @OriginalArg(2) Color arg2, @OriginalArg(3) Color arg3, @OriginalArg(4) String arg4) { try { - @Pc(6) Graphics local6 = Static434.aCanvas7.getGraphics(); + @Pc(6) Graphics local6 = Static434.canvas.getGraphics(); if (Static589.aFont1 == null) { Static589.aFont1 = new Font("Helvetica", 1, 13); } @@ -53,7 +53,7 @@ public static void method4439(@OriginalArg(0) int arg0, @OriginalArg(1) Color ar @Pc(73) int local73; try { if (Static103.anImage1 == null) { - Static103.anImage1 = Static434.aCanvas7.createImage(Static680.anInt10289, Static380.anInt5979); + Static103.anImage1 = Static434.canvas.createImage(Static680.anInt10289, Static380.anInt5979); } @Pc(58) Graphics local58 = Static103.anImage1.getGraphics(); local58.setColor(Color.black); @@ -98,7 +98,7 @@ public static void method4439(@OriginalArg(0) int arg0, @OriginalArg(1) Color ar local6.drawString(arg4, local220 + (304 - arg4.length() * 6) / 2, local73 + 22); } } catch (@Pc(336) Exception local336) { - Static434.aCanvas7.repaint(); + Static434.canvas.repaint(); } } diff --git a/client/src/main/java/Static310.java b/client/src/main/java/Static310.java index c5520a2..1a7ad53 100644 --- a/client/src/main/java/Static310.java +++ b/client/src/main/java/Static310.java @@ -19,8 +19,8 @@ public static void method4505(@OriginalArg(0) int[] arg0, @OriginalArg(2) int[] if (local20 == -1) { arg3.aClass152_Sub2_Sub1Array3[local30] = null; } else { - @Pc(60) SeqType local60 = Static25.aSeqTypeList1.method1162(local20); - @Pc(63) int local63 = local60.anInt1646; + @Pc(60) SeqType local60 = Static25.aSeqTypeList1.get(local20); + @Pc(63) int local63 = local60.exactmove; @Pc(68) Class152_Sub2_Sub1 local68 = arg3.aClass152_Sub2_Sub1Array3[local30]; if (local68 != null && local68.method9109()) { if (local20 == local68.method9114()) { @@ -32,7 +32,7 @@ public static void method4505(@OriginalArg(0) int[] arg0, @OriginalArg(2) int[] } else if (local63 == 2) { local68.method9115(); } - } else if (local60.anInt1649 >= local68.method9107().anInt1649) { + } else if (local60.priority >= local68.method9107().priority) { local68 = arg3.aClass152_Sub2_Sub1Array3[local30] = null; } } diff --git a/client/src/main/java/Static312.java b/client/src/main/java/Static312.java index 4c98381..82de372 100644 --- a/client/src/main/java/Static312.java +++ b/client/src/main/java/Static312.java @@ -38,12 +38,12 @@ public static void method4542(@OriginalArg(1) Component arg0) { } } @Pc(45) OutboundPacket local45 = OutboundPacket.create(Static505.aClientProt119, Connection.gameConnection.random); - local45.buffer.p4_alt2(arg0.anInt3812); + local45.buffer.p4_alt2(arg0.id); local45.buffer.p2_alt2(Static162.anInt2799); local45.buffer.p2_alt3(Static77.anInt1614); local45.buffer.p4_alt3(Static450.anInt6819); - local45.buffer.p2_alt2(arg0.anInt3760); - local45.buffer.ip2(arg0.anInt3741); + local45.buffer.p2_alt2(arg0.objId); + local45.buffer.ip2(arg0.createdComponentId); Connection.gameConnection.queue(local45); } } diff --git a/client/src/main/java/Static314.java b/client/src/main/java/Static314.java index d8594ed..a898347 100644 --- a/client/src/main/java/Static314.java +++ b/client/src/main/java/Static314.java @@ -21,7 +21,7 @@ public static void method4560() { } @OriginalMember(owner = "client!jw", name = "b", descriptor = "(B)V") - public static void method4562() { + public static void topBannerRefresh() { if (Static2.aModeWhere1 != ModeWhere.LOCAL) { try { BrowserControl.call("tbrefresh", Static295.aClient1); diff --git a/client/src/main/java/Static315.java b/client/src/main/java/Static315.java index 2c38ac5..07a0507 100644 --- a/client/src/main/java/Static315.java +++ b/client/src/main/java/Static315.java @@ -81,16 +81,16 @@ public static long method4576(@OriginalArg(0) long arg0, @OriginalArg(1) long ar @OriginalMember(owner = "client!k", name = "a", descriptor = "(IILclient!cka;)V") public static void method4577(@OriginalArg(0) int arg0, @OriginalArg(2) SeqType arg1) { - if (Static33.anInt779 >= 50 || (arg1 == null || arg1.anIntArrayArray38 == null || arg1.anIntArrayArray38.length <= arg0 || arg1.anIntArrayArray38[arg0] == null)) { + if (Static33.anInt779 >= 50 || (arg1 == null || arg1.soundeffect == null || arg1.soundeffect.length <= arg0 || arg1.soundeffect[arg0] == null)) { return; } - @Pc(42) int local42 = arg1.anIntArrayArray38[arg0][0]; + @Pc(42) int local42 = arg1.soundeffect[arg0][0]; @Pc(46) int local46 = local42 >> 8; @Pc(63) int local63; - if (arg1.anIntArrayArray38[arg0].length > 1) { - local63 = (int) (Math.random() * (double) arg1.anIntArrayArray38[arg0].length); + if (arg1.soundeffect[arg0].length > 1) { + local63 = (int) (Math.random() * (double) arg1.soundeffect[arg0].length); if (local63 > 0) { - local46 = arg1.anIntArrayArray38[arg0][local63]; + local46 = arg1.soundeffect[arg0][local63]; } } @Pc(81) int local81 = local42 >> 5 & 0x7; @@ -101,7 +101,7 @@ public static void method4577(@OriginalArg(0) int arg0, @OriginalArg(2) SeqType if (arg1.aBoolean141) { Static186.method2818(local46, local81, local63, 0, 255, false); } else { - Static161.method2586(local63, 0, local46, local81, 255); + Static161.play(local63, 0, local46, local81, 255); } } } diff --git a/client/src/main/java/Static316.java b/client/src/main/java/Static316.java index 2e60be9..a7ebc82 100644 --- a/client/src/main/java/Static316.java +++ b/client/src/main/java/Static316.java @@ -9,7 +9,7 @@ public final class Static316 { public static Frame aFrame8; @OriginalMember(owner = "client!ka", name = "f", descriptor = "Z") - public static boolean aBoolean644; + public static boolean stereo; @OriginalMember(owner = "client!ka", name = "h", descriptor = "[Ljava/lang/String;") public static final String[] aStringArray41 = new String[100]; diff --git a/client/src/main/java/Static319.java b/client/src/main/java/Static319.java index d7fcff6..eeee892 100644 --- a/client/src/main/java/Static319.java +++ b/client/src/main/java/Static319.java @@ -41,7 +41,7 @@ public static void method4595(@OriginalArg(0) int arg0, @OriginalArg(1) boolean Static110.anInt2186 = Static709.anInt10667 * 512 + 256; Static359.anInt5801 = Static102.method2025(Static394.anInt6176, -29754, Static110.anInt2186, Static170.anInt2864) - Static363.anInt6934; } - Static511.anInt7645 = 2; + Static511.cameraType = 2; Static693.anInt10383 = -1; Static692.anInt10376 = -1; } diff --git a/client/src/main/java/Static32.java b/client/src/main/java/Static32.java index 5c6451b..906c686 100644 --- a/client/src/main/java/Static32.java +++ b/client/src/main/java/Static32.java @@ -31,8 +31,8 @@ public static OutboundPacket method878(@OriginalArg(0) int arg0, @OriginalArg(2) if (arg2 == 1) { local11 = OutboundPacket.create(Static632.aClientProt111, Connection.gameConnection.random); } - local11.buffer.p2_alt3(arg0 + Static691.anInt10367); - local11.buffer.p2_alt3(Static116.anInt2270 + arg1); + local11.buffer.p2_alt3(arg0 + Static691.originX); + local11.buffer.p2_alt3(Static116.originZ + arg1); local11.buffer.p1(Static334.aKeyboard1.method8479(82) ? 1 : 0); Static266.aBoolean583 = false; Static675.anInt10156 = arg0; diff --git a/client/src/main/java/Static321.java b/client/src/main/java/Static321.java index 4f92261..bb138d2 100644 --- a/client/src/main/java/Static321.java +++ b/client/src/main/java/Static321.java @@ -18,8 +18,8 @@ public final class Static321 { @OriginalMember(owner = "client!kca", name = "a", descriptor = "(IIZ)V") public static void method4619(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(23) SecondaryLinkable_Sub2 local23 = Static440.method5963(18, (long) arg1 << 32 | (long) arg0); - local23.method205(); + @Pc(23) SecondaryLinkable_Sub2 local23 = Static440.create(18, (long) arg1 << 32 | (long) arg0); + local23.pushClient(); } @OriginalMember(owner = "client!kca", name = "a", descriptor = "(IB)Lclient!wca;") diff --git a/client/src/main/java/Static323.java b/client/src/main/java/Static323.java index 879a2ac..f6739b5 100644 --- a/client/src/main/java/Static323.java +++ b/client/src/main/java/Static323.java @@ -8,7 +8,7 @@ public final class Static323 { public static int anInt5118; @OriginalMember(owner = "client!kda", name = "d", descriptor = "I") - public static int anInt5119; + public static int cameraYaw; @OriginalMember(owner = "client!kda", name = "e", descriptor = "[I") public static int[] anIntArray389; @@ -20,7 +20,7 @@ public final class Static323 { public static final ClientProt aClientProt65 = new ClientProt(64, 8); @OriginalMember(owner = "client!kda", name = "j", descriptor = "I") - public static int anInt5121 = 0; + public static int affiliate = 0; @OriginalMember(owner = "client!kda", name = "a", descriptor = "()V") public static void method4624() { diff --git a/client/src/main/java/Static327.java b/client/src/main/java/Static327.java index 25363df..a535c35 100644 --- a/client/src/main/java/Static327.java +++ b/client/src/main/java/Static327.java @@ -5,7 +5,7 @@ public final class Static327 { @OriginalMember(owner = "client!kg", name = "N", descriptor = "I") - public static int anInt5392 = 0; + public static int size = 0; @OriginalMember(owner = "client!kg", name = "M", descriptor = "Lclient!hda;") public static Component aComponent7 = null; diff --git a/client/src/main/java/Static329.java b/client/src/main/java/Static329.java index f8c63cf..d7641ab 100644 --- a/client/src/main/java/Static329.java +++ b/client/src/main/java/Static329.java @@ -74,9 +74,9 @@ public final class Static329 { public static int anInt1749 = -1; @OriginalMember(owner = "client!kh", name = "a", descriptor = "(BI)V") - public static void method1631(@OriginalArg(1) int arg0) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(9, (long) arg0); - local9.method205(); + public static void setComponentObjClient(@OriginalArg(1) int arg0) { + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(9, (long) arg0); + local9.pushClient(); } @OriginalMember(owner = "client!kh", name = "b", descriptor = "(B)V") diff --git a/client/src/main/java/Static330.java b/client/src/main/java/Static330.java index 0b22600..862a280 100644 --- a/client/src/main/java/Static330.java +++ b/client/src/main/java/Static330.java @@ -6,7 +6,7 @@ public final class Static330 { public static final Class155 aClass155_23 = new Class155(70); @OriginalMember(owner = "client!kha", name = "j", descriptor = "Lclient!ss;") - public static final ClientProt aClientProt66 = new ClientProt(3, 4); + public static final ClientProt RESUME_P_COUNTDIALOG = new ClientProt(3, 4); @OriginalMember(owner = "client!kha", name = "m", descriptor = "I") public static int anInt5434 = 0; diff --git a/client/src/main/java/Static333.java b/client/src/main/java/Static333.java index 389ad61..7ae4f2a 100644 --- a/client/src/main/java/Static333.java +++ b/client/src/main/java/Static333.java @@ -6,7 +6,7 @@ public final class Static333 { public static Class279 aClass279_1; @OriginalMember(owner = "client!kj", name = "d", descriptor = "I") - public static int anInt5455 = 0; + public static int loop = 0; @OriginalMember(owner = "client!kj", name = "c", descriptor = "[C") public static final char[] aCharArray4 = new char[] { '_', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }; diff --git a/client/src/main/java/Static338.java b/client/src/main/java/Static338.java index c051a6f..a42ba33 100644 --- a/client/src/main/java/Static338.java +++ b/client/src/main/java/Static338.java @@ -19,8 +19,8 @@ public static void method4994(@OriginalArg(1) byte[][] arg0, @OriginalArg(2) Cla for (@Pc(8) int local8 = 0; local8 < local6; local8++) { @Pc(13) byte[] local13 = arg0[local8]; if (local13 != null) { - @Pc(26) int local26 = (Static89.anIntArray169[local8] >> 8) * 64 - Static691.anInt10367; - @Pc(36) int local36 = (Static89.anIntArray169[local8] & 0xFF) * 64 - Static116.anInt2270; + @Pc(26) int local26 = (Static89.anIntArray169[local8] >> 8) * 64 - Static691.originX; + @Pc(36) int local36 = (Static89.anIntArray169[local8] & 0xFF) * 64 - Static116.originZ; Static557.method7331(); arg1.method7892(local26, local36, Static577.aClass110Array1, Static163.aClass19_17, local13); } diff --git a/client/src/main/java/Static343.java b/client/src/main/java/Static343.java index ecece3f..d065ca2 100644 --- a/client/src/main/java/Static343.java +++ b/client/src/main/java/Static343.java @@ -14,13 +14,13 @@ public final class Static343 { public static final int anInt5612 = 1409; @OriginalMember(owner = "client!kq", name = "i", descriptor = "[Lclient!pq;") - public static World[] aClass297_Sub1Array2 = new World[0]; + public static World[] sorted = new World[0]; @OriginalMember(owner = "client!kq", name = "a", descriptor = "(III)I") - public static int method5036(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - @Pc(41) int local41 = Static659.method8604(arg0 - 1, arg1 + -1) + Static659.method8604(arg0 - 1, arg1 + 1) + Static659.method8604(arg0 + 1, arg1 + -1) + Static659.method8604(arg0 + 1, arg1 + 1); - @Pc(77) int local77 = Static659.method8604(arg0, arg1 - 1) + Static659.method8604(arg0, arg1 + 1) + Static659.method8604(arg0 + -1, arg1) + Static659.method8604(arg0 - -1, arg1); - @Pc(82) int local82 = Static659.method8604(arg0, arg1); + public static int smoothNoise(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { + @Pc(41) int local41 = Static659.noise(arg0 - 1, arg1 + -1) + Static659.noise(arg0 - 1, arg1 + 1) + Static659.noise(arg0 + 1, arg1 + -1) + Static659.noise(arg0 + 1, arg1 + 1); + @Pc(77) int local77 = Static659.noise(arg0, arg1 - 1) + Static659.noise(arg0, arg1 + 1) + Static659.noise(arg0 + -1, arg1) + Static659.noise(arg0 - -1, arg1); + @Pc(82) int local82 = Static659.noise(arg0, arg1); return local77 / 8 + local41 / 16 + local82 / 4; } } diff --git a/client/src/main/java/Static347.java b/client/src/main/java/Static347.java index 244ce20..1c62fe0 100644 --- a/client/src/main/java/Static347.java +++ b/client/src/main/java/Static347.java @@ -8,7 +8,7 @@ public final class Static347 { public static void method5094(@OriginalArg(0) int arg0) { if (arg0 != -1 && Static132.aBooleanArray5[arg0]) { Static666.aJs5118.discardUnpacked(arg0); - Static453.aComponentArrayArray2[arg0] = null; + Static453.components[arg0] = null; Static148.aComponentArrayArray1[arg0] = null; Static132.aBooleanArray5[arg0] = false; } diff --git a/client/src/main/java/Static35.java b/client/src/main/java/Static35.java index d72d1db..3775c20 100644 --- a/client/src/main/java/Static35.java +++ b/client/src/main/java/Static35.java @@ -50,13 +50,13 @@ public static void method918() { local179 = local13.anInt2577 * (local13.aByte49 == 3 ? Static400.aClass2_Sub34_28.lb.method7208() : Static400.aClass2_Sub34_28.aPreference_Sub25_3.method7208()) >> 2; } else { @Pc(188) int local188 = local13.anInt2578 >> 24 & 0x3; - if (local188 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144) { + if (local188 == Static556.self.plane) { @Pc(199) int local199 = (local13.anInt2578 & 0xFF) << 9; - @Pc(205) int local205 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method9302((byte) 126) << 8; + @Pc(205) int local205 = Static556.self.method9302((byte) 126) << 8; @Pc(212) int local212 = local13.anInt2578 >> 16 & 0xFF; - @Pc(224) int local224 = (local212 << 9) + local205 + 256 - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690; + @Pc(224) int local224 = (local212 << 9) + local205 + 256 - Static556.self.xFine; @Pc(231) int local231 = local13.anInt2578 >> 8 & 0xFF; - @Pc(243) int local243 = local205 + (local231 << 9) + 256 - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694; + @Pc(243) int local243 = local205 + (local231 << 9) + 256 - Static556.self.zFine; @Pc(251) int local251 = Math.abs(local224) + Math.abs(local243) - 512; if (local199 < local251) { local13.anInt2571 = -99999; @@ -72,7 +72,7 @@ public static void method918() { @Pc(307) short local307 = local301.aShort131; } if (local224 != 0 || local243 != 0) { - @Pc(336) int local336 = -Static323.anInt5119 - (int) (Math.atan2((double) local224, (double) local243) * 2607.5945876176133D) - 4096 & 0x3FFF; + @Pc(336) int local336 = -Static323.cameraYaw - (int) (Math.atan2((double) local224, (double) local243) * 2607.5945876176133D) - 4096 & 0x3FFF; if (local336 > 8192) { local336 = 16384 - local336; } diff --git a/client/src/main/java/Static352.java b/client/src/main/java/Static352.java index 73f2b5c..1c784cd 100644 --- a/client/src/main/java/Static352.java +++ b/client/src/main/java/Static352.java @@ -32,7 +32,7 @@ public static void resetCache() { Static354.aLocTypeList4.clearCaches(); Static690.aNpcTypeList2.method7086(); ObjTypeList.objTypes.method2476(); - Static25.aSeqTypeList1.method1165(); + Static25.aSeqTypeList1.clear(); Static23.aSpotAnimTypeList1.method2699(); Static529.aVarBitTypeList1.method3429(); Static36.aVarPlayerTypeList1.method5784(); diff --git a/client/src/main/java/Static354.java b/client/src/main/java/Static354.java index 8574331..211f524 100644 --- a/client/src/main/java/Static354.java +++ b/client/src/main/java/Static354.java @@ -17,7 +17,7 @@ public final class Static354 { public static int anInt5763; @OriginalMember(owner = "client!ld", name = "p", descriptor = "Lclient!dla;") - public static final SoftLruHashTable aSoftLruHashTable120 = new SoftLruHashTable(32); + public static final SoftLruHashTable SHADOWS = new SoftLruHashTable(32); @OriginalMember(owner = "client!ld", name = "k", descriptor = "Z") public static boolean aBoolean439 = false; @@ -31,15 +31,15 @@ public final class Static354 { @OriginalMember(owner = "client!ld", name = "a", descriptor = "(BLclient!cg;)V") public static void method5181(@OriginalArg(1) PathingEntity arg0) { @Pc(6) Class152 local6 = arg0.aClass152_11; - if (Static333.anInt5455 == arg0.anInt10755 || !local6.method9109() || local6.method9090()) { + if (Static333.loop == arg0.anInt10755 || !local6.method9109() || local6.method9090()) { @Pc(34) int local34 = arg0.anInt10755 - arg0.anInt10759; - @Pc(40) int local40 = Static333.anInt5455 - arg0.anInt10759; + @Pc(40) int local40 = Static333.loop - arg0.anInt10759; @Pc(52) int local52 = arg0.anInt10750 * 512 + arg0.method9302((byte) 124) * 256; @Pc(64) int local64 = arg0.anInt10753 * 512 + arg0.method9302((byte) 89) * 256; @Pc(76) int local76 = arg0.anInt10761 * 512 + arg0.method9302((byte) 107) * 256; @Pc(88) int local88 = arg0.anInt10758 * 512 + arg0.method9302((byte) 115) * 256; - arg0.anInt10690 = (local76 * local40 + local52 * (local34 - local40)) / local34; - arg0.anInt10694 = (local40 * local88 + local64 * (local34 - local40)) / local34; + arg0.xFine = (local76 * local40 + local52 * (local34 - local40)) / local34; + arg0.zFine = (local40 * local88 + local64 * (local34 - local40)) / local34; } arg0.anInt10763 = 0; if (arg0.anInt10754 == 0) { diff --git a/client/src/main/java/Static36.java b/client/src/main/java/Static36.java index 30f8cdb..f30f507 100644 --- a/client/src/main/java/Static36.java +++ b/client/src/main/java/Static36.java @@ -42,7 +42,7 @@ public static int method978(@OriginalArg(0) int arg0) { @OriginalMember(owner = "client!bda", name = "a", descriptor = "(BLclient!vq;Ljava/lang/String;Ljava/lang/String;I)Lclient!oba;") public static PrivilegedRequest method980(@OriginalArg(1) Signlink arg0, @OriginalArg(2) String arg1, @OriginalArg(3) String arg2, @OriginalArg(4) int arg3) { if (arg3 == 0) { - return arg0.method8986(arg1); + return arg0.openUrl(arg1); } @Pc(57) PrivilegedRequest local57; if (arg3 == 1) { diff --git a/client/src/main/java/Static360.java b/client/src/main/java/Static360.java index 4b34333..a6b8db5 100644 --- a/client/src/main/java/Static360.java +++ b/client/src/main/java/Static360.java @@ -83,7 +83,7 @@ public static void method5232(@OriginalArg(0) Player arg0, @OriginalArg(1) int a if (local10 < 0 || local10 >= Static720.anInt10859 || local15 < 0 || Static501.anInt7568 <= local15 || (arg1 < 0 || arg1 >= Static720.anInt10859 || arg2 < 0 || Static501.anInt7568 <= arg2)) { return; } - @Pc(76) int local76 = Static521.method6870(arg2, arg0.method9302((byte) 65), true, 0, local10, 0, Static480.anIntArray583, 0, local15, -4, Static577.aClass110Array1[arg0.aByte144], Static70.anIntArray147, arg1, 0); + @Pc(76) int local76 = Static521.method6870(arg2, arg0.method9302((byte) 65), true, 0, local10, 0, Static480.anIntArray583, 0, local15, -4, Static577.aClass110Array1[arg0.plane], Static70.anIntArray147, arg1, 0); if (local76 >= 1 && local76 <= 3) { for (@Pc(92) int local92 = 0; local92 < local76 - 1; local92++) { arg0.method1418(Static480.anIntArray583[local92], Static70.anIntArray147[local92], (byte) 2); diff --git a/client/src/main/java/Static362.java b/client/src/main/java/Static362.java index ea5189a..4227e42 100644 --- a/client/src/main/java/Static362.java +++ b/client/src/main/java/Static362.java @@ -21,11 +21,11 @@ public static boolean method5241(@OriginalArg(0) int arg0, @OriginalArg(1) Strin if (arg1 == null) { return false; } - for (@Pc(10) int local10 = arg0; local10 < Static327.anInt5392; local10++) { + for (@Pc(10) int local10 = arg0; local10 < Static327.size; local10++) { if (arg1.equalsIgnoreCase(Static330.aStringArray25[local10])) { return true; } } - return arg1.equalsIgnoreCase(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2); + return arg1.equalsIgnoreCase(Static556.self.username); } } diff --git a/client/src/main/java/Static363.java b/client/src/main/java/Static363.java index a7aec54..c7544a8 100644 --- a/client/src/main/java/Static363.java +++ b/client/src/main/java/Static363.java @@ -59,7 +59,7 @@ public static int method6235(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) } } try { - @Pc(43) Dimension local43 = Static434.aCanvas7.getSize(); + @Pc(43) Dimension local43 = Static434.canvas.getSize(); Static694.method9028(Static163.aClass19_17, LocalizedText.PROFILING.get(Static51.clientLanguageId), true, Static694.aClass381_13, Static437.aClass14_9); @Pc(67) Class88 local67 = Static121.method2201(Static65.aClass3_1.anInt81, client.models); @Pc(70) long local70 = Static588.currentTimeWithDrift(); @@ -107,7 +107,7 @@ public static void method6236(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 if (Static316.aFrame8 != null) { Static328.anInt5427 = arg3; Static110.anInt2189 = arg1; - Static666.method8693(1); + Static666.write(1); } } if (arg2 == 3 && Static316.aFrame8 == null) { @@ -154,17 +154,17 @@ public static void method6236(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 if (arg4) { Static574.method7572(); } else { - Static434.aCanvas7.setSize(Static680.anInt10289, Static380.anInt5979); + Static434.canvas.setSize(Static680.anInt10289, Static380.anInt5979); if (Static137.aBoolean210) { - Static575.method7606(Static434.aCanvas7); + Static575.method7606(Static434.canvas); } else { - Static163.aClass19_17.method7935(Static434.aCanvas7, Static680.anInt10289, Static380.anInt5979); + Static163.aClass19_17.method7935(Static434.canvas, Static680.anInt10289, Static380.anInt5979); } if (local95 == Static353.aFrame10) { local110 = Static353.aFrame10.getInsets(); - Static434.aCanvas7.setLocation(Static134.anInt10329 + local110.left, Static241.anInt3962 + local110.top); + Static434.canvas.setLocation(Static134.anInt10329 + local110.left, Static241.anInt3962 + local110.top); } else { - Static434.aCanvas7.setLocation(Static134.anInt10329, Static241.anInt3962); + Static434.canvas.setLocation(Static134.anInt10329, Static241.anInt3962); } } if (arg2 >= 2) { @@ -172,7 +172,7 @@ public static void method6236(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 } else { Static152.aBoolean811 = false; } - if (Static377.anInt5930 != -1) { + if (Static377.topLevelInterface != -1) { Static640.method8435(true); } if (Connection.gameConnection.aClass348_1 != null && Static109.method2070(Static283.gameState)) { diff --git a/client/src/main/java/Static364.java b/client/src/main/java/Static364.java index e8bb0b4..bf59538 100644 --- a/client/src/main/java/Static364.java +++ b/client/src/main/java/Static364.java @@ -106,7 +106,7 @@ public static void method5253() { if (Static524.aConnection3.aPrivilegedRequest1.state != 1) { return; } - Static524.aConnection3.aClass348_1 = Static99.method1975((Socket) Static524.aConnection3.aPrivilegedRequest1.anObject13); + Static524.aConnection3.aClass348_1 = Static99.method1975((Socket) Static524.aConnection3.aPrivilegedRequest1.result); Static524.aConnection3.aPrivilegedRequest1 = null; Static524.aConnection3.method3272(); local186 = Static273.method3962(); @@ -122,7 +122,7 @@ public static void method5253() { local229.p1(Static129.anInt2409); local229.p2((int) (Math.random() * 9.9999999E7D)); local229.p1(Static51.clientLanguageId); - local229.p4(Static323.anInt5121); + local229.p4(Static323.affiliate); for (local250 = 0; local250 < 6; local250++) { local229.p4((int) (Math.random() * 9.9999999E7D)); } @@ -239,8 +239,8 @@ public static void method5253() { local618.p1(Static400.aClass2_Sub34_28.aPreference_Sub13_1.method4373()); Static176.method6690(local618); local618.pjstr(Static150.aString26); - local618.p4(Static323.anInt5121); - local672 = Static400.aClass2_Sub34_28.method5110(); + local618.p4(Static323.affiliate); + local672 = Static400.aClass2_Sub34_28.encode(); local618.p1(local672.pos); local618.pdata(local672.data, 0, local672.pos); Static503.aBoolean578 = true; @@ -280,7 +280,7 @@ public static void method5253() { local618.p1(Static51.clientLanguageId); Static176.method6690(local618); local618.pjstr(Static150.aString26); - local618.p4(Static323.anInt5121); + local618.p4(Static323.affiliate); Static169.method2647(local618); local618.tinyenc(Static219.anIntArray287, local646, local618.pos); local618.psize2(local618.pos - local250); @@ -400,32 +400,32 @@ public static void method5253() { } Static524.aConnection3.aClass348_1.method7929(local1435.data, Static94.anInt1961, 0); local1435.pos = 0; - Static608.anInt9290 = local1435.g1(); - Static38.anInt928 = local1435.g1(); + Static608.staffModLevel = local1435.g1(); + Static38.blackmarks = local1435.g1(); Static389.aBoolean459 = local1435.g1() == 1; Static34.aBoolean62 = local1435.g1() == 1; Static298.aBoolean369 = local1435.g1() == 1; - Static617.aBoolean724 = local1435.g1() == 1; + Static617.mapQuickChat = local1435.g1() == 1; Static312.anInt5000 = local1435.g2(); - Static126.aBoolean200 = local1435.g1() == 1; + Static126.playerMember = local1435.g1() == 1; Static106.anInt2153 = local1435.g3s(); - Static174.aBoolean249 = local1435.g1() == 1; + Static174.mapMembers = local1435.g1() == 1; Static416.aString71 = local1435.gjstr(); - Static354.aLocTypeList4.setMembers(Static174.aBoolean249); - ObjTypeList.objTypes.method2485(Static174.aBoolean249); - Static690.aNpcTypeList2.method7090(Static174.aBoolean249); + Static354.aLocTypeList4.setMembers(Static174.mapMembers); + ObjTypeList.objTypes.method2485(Static174.mapMembers); + Static690.aNpcTypeList2.method7090(Static174.mapMembers); } else if (Static524.aConnection3.aClass348_1.method7932(Static94.anInt1961)) { Static524.aConnection3.aClass348_1.method7929(local1435.data, Static94.anInt1961, 0); local1435.pos = 0; - Static608.anInt9290 = local1435.g1(); - Static38.anInt928 = local1435.g1(); + Static608.staffModLevel = local1435.g1(); + Static38.blackmarks = local1435.g1(); Static389.aBoolean459 = local1435.g1() == 1; Static34.aBoolean62 = local1435.g1() == 1; Static298.aBoolean369 = local1435.g1() == 1; Static416.aLong207 = local1435.g8(); Static94.aLong70 = Static416.aLong207 - Static588.currentTimeWithDrift() - local1435.g5(); local203 = local1435.g1(); - Static126.aBoolean200 = (local203 & 0x1) != 0; + Static126.playerMember = (local203 & 0x1) != 0; Static425.aBoolean482 = (local203 & 0x2) != 0; Static435.anInt6594 = local1435.g4(); Static684.aBoolean775 = local1435.g1() == 1; @@ -434,12 +434,12 @@ public static void method5253() { Static476.anInt7175 = local1435.g2(); Static323.anInt5118 = local1435.g2(); Static392.anInt6141 = local1435.g4(); - Static439.aPrivilegedRequest4 = Static446.aSignlink6.method8982(Static392.anInt6141); + Static439.aPrivilegedRequest4 = Static446.aSignlink6.getReverseDns(Static392.anInt6141); Static335.anInt5462 = local1435.g1(); Static626.anInt9473 = local1435.g2(); Static636.anInt9527 = local1435.g2(); Static420.aBoolean479 = local1435.g1() == 1; - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name1 = Static515.aString96 = local1435.gjstr2(); + Static556.self.username = Static556.self.name1 = Static515.aString96 = local1435.gjstr2(); Static639.anInt9571 = local1435.g1(); Static438.anInt6640 = local1435.g4(); Static587.aBoolean663 = local1435.g1() == 1; @@ -453,13 +453,13 @@ public static void method5253() { Static668.aClass229_5.anInt5854 = Static668.aClass229_5.worldId + 40000; Static668.aClass229_5.anInt5853 = Static668.aClass229_5.worldId + 50000; } - if (ModeWhere.LOCAL != Static2.aModeWhere1 && (Static2.aModeWhere1 != ModeWhere.WTQA || Static608.anInt9290 < 2) && Static344.aClass229_1.method5265(Static527.aClass229_3)) { + if (ModeWhere.LOCAL != Static2.aModeWhere1 && (Static2.aModeWhere1 != ModeWhere.WTQA || Static608.staffModLevel < 2) && Static344.aClass229_1.method5265(Static527.aClass229_3)) { Static152.method9273(); } } else { return; } - if (Static389.aBoolean459 && !Static298.aBoolean369 || Static126.aBoolean200) { + if (Static389.aBoolean459 && !Static298.aBoolean369 || Static126.playerMember) { try { BrowserControl.call("zap", Static166.anApplet1); } catch (@Pc(1850) Throwable local1850) { diff --git a/client/src/main/java/Static367.java b/client/src/main/java/Static367.java index f6ab202..fa3f471 100644 --- a/client/src/main/java/Static367.java +++ b/client/src/main/java/Static367.java @@ -8,9 +8,9 @@ public final class Static367 { @OriginalMember(owner = "client!lk", name = "a", descriptor = "(I)V") public static void method5267() { - @Pc(1) SoftLruHashTable local1 = Static354.aSoftLruHashTable120; - synchronized (Static354.aSoftLruHashTable120) { - Static354.aSoftLruHashTable120.clear(); + @Pc(1) SoftLruHashTable local1 = Static354.SHADOWS; + synchronized (Static354.SHADOWS) { + Static354.SHADOWS.clear(); } } diff --git a/client/src/main/java/Static369.java b/client/src/main/java/Static369.java index 7d1ee0f..efb6874 100644 --- a/client/src/main/java/Static369.java +++ b/client/src/main/java/Static369.java @@ -38,8 +38,8 @@ public static void method3847() { @Pc(98) int local98 = local94 >> 14; @Pc(104) int local104 = local94 >> 7 & 0x3F; @Pc(108) int local108 = local94 & 0x3F; - @Pc(121) int local121 = local104 + (Static89.anIntArray169[local13] >> 8) * 64 - Static691.anInt10367; - @Pc(135) int local135 = (Static89.anIntArray169[local13] & 0xFF) * 64 + local108 - Static116.anInt2270; + @Pc(121) int local121 = local104 + (Static89.anIntArray169[local13] >> 8) * 64 - Static691.originX; + @Pc(135) int local135 = (Static89.anIntArray169[local13] & 0xFF) * 64 + local108 - Static116.originZ; @Pc(142) NpcType local142 = Static690.aNpcTypeList2.method7092(local66.g2()); @Pc(149) Linkable_Sub45 local149 = (Linkable_Sub45) Static18.aHashTable2.get((long) local88); if (local149 == null && (local142.aByte103 & 0x1) > 0 && local98 == Static164.anInt2808 && local121 >= 0 && local142.anInt6713 + local121 < Static720.anInt10859 && local135 >= 0 && local135 + local142.anInt6713 < Static501.anInt7568) { @@ -49,7 +49,7 @@ public static void method3847() { Static18.aHashTable2.put((long) local88, local205); Static592.aClass2_Sub45Array1[Static416.anInt6378++] = local205; Static103.anIntArray187[Static390.anInt6126++] = local88; - local197.anInt10751 = Static333.anInt5455; + local197.anInt10751 = Static333.loop; local197.method9328(local142); local197.method9310(local197.aNpcType1.anInt6713); local197.anInt10757 = local197.aNpcType1.lb << 3; @@ -69,7 +69,7 @@ public static void method3851(@OriginalArg(0) Class19 arg0) { @Pc(31) Linkable_Sub36 local31; if (Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915() == 0) { for (local31 = (Linkable_Sub36) Static133.aLinkedList13.head(); local31 != null; local31 = (Linkable_Sub36) Static133.aLinkedList13.next()) { - ObjTypeList.objTypes.method2478(local31.anInt5893, arg0, arg0, local31.aBoolean451 ? Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 : null, false, local31.anInt5891, local31.anInt5888, false, local31.anInt5890, Static665.aClass14_12, local31.anInt5895); + ObjTypeList.objTypes.method2478(local31.anInt5893, arg0, arg0, local31.aBoolean451 ? Static556.self.aPlayerAppearance1 : null, false, local31.anInt5891, local31.anInt5888, false, local31.anInt5890, Static665.aClass14_12, local31.anInt5895); local31.unlink(); } Static469.method6362(); @@ -82,7 +82,7 @@ public static void method3851(@OriginalArg(0) Class19 arg0) { Static629.aClass14_11 = Static158.aClass19_5.method8010(Static74.method1535(Static662.anInt9845, client.fontMetrics), Static735.method9375(client.sprites, Static662.anInt9845), true); } for (local31 = (Linkable_Sub36) Static133.aLinkedList13.head(); local31 != null; local31 = (Linkable_Sub36) Static133.aLinkedList13.next()) { - ObjTypeList.objTypes.method2478(local31.anInt5893, Static158.aClass19_5, arg0, local31.aBoolean451 ? Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 : null, false, local31.anInt5891, local31.anInt5888, false, local31.anInt5890, Static629.aClass14_11, local31.anInt5895); + ObjTypeList.objTypes.method2478(local31.anInt5893, Static158.aClass19_5, arg0, local31.aBoolean451 ? Static556.self.aPlayerAppearance1 : null, false, local31.anInt5891, local31.anInt5888, false, local31.anInt5890, Static629.aClass14_11, local31.anInt5895); local31.unlink(); } } diff --git a/client/src/main/java/Static37.java b/client/src/main/java/Static37.java index c804858..dc4de97 100644 --- a/client/src/main/java/Static37.java +++ b/client/src/main/java/Static37.java @@ -3,7 +3,7 @@ public final class Static37 { @OriginalMember(owner = "client!be", name = "M", descriptor = "[Ljava/lang/String;") - public static String[] aStringArray4; + public static String[] varcstrs; @OriginalMember(owner = "client!be", name = "O", descriptor = "I") public static int anInt916 = 0; diff --git a/client/src/main/java/Static371.java b/client/src/main/java/Static371.java index c00aeb4..b41dca1 100644 --- a/client/src/main/java/Static371.java +++ b/client/src/main/java/Static371.java @@ -4,7 +4,7 @@ public final class Static371 { @OriginalMember(owner = "client!lma", name = "a", descriptor = "[I") - public static final int[] anIntArray455 = new int[200]; + public static final int[] worlds = new int[200]; @OriginalMember(owner = "client!lma", name = "b", descriptor = "(I)V") public static void method5284() { diff --git a/client/src/main/java/Static372.java b/client/src/main/java/Static372.java index 5199fd2..91f7d0d 100644 --- a/client/src/main/java/Static372.java +++ b/client/src/main/java/Static372.java @@ -38,7 +38,7 @@ public static int method5291(@OriginalArg(0) boolean arg0) { @OriginalMember(owner = "client!ln", name = "a", descriptor = "(ILclient!hda;I)I") public static int method5292(@OriginalArg(0) int arg0, @OriginalArg(1) Component arg1) { - if (!Static84.method1661(arg1).method6221(arg0) && arg1.anObjectArray15 == null) { + if (!Static84.getServerActiveProperties(arg1).isButtonEnabled(arg0) && arg1.onOptionClick == null) { return -1; } else if (arg1.anIntArray301 == null || arg0 >= arg1.anIntArray301.length) { return -1; diff --git a/client/src/main/java/Static377.java b/client/src/main/java/Static377.java index 5e73fee..53a0dbc 100644 --- a/client/src/main/java/Static377.java +++ b/client/src/main/java/Static377.java @@ -6,6 +6,6 @@ public final class Static377 { public static String[] aStringArray30; @OriginalMember(owner = "client!ls", name = "j", descriptor = "I") - public static volatile int anInt5930 = -1; + public static volatile int topLevelInterface = -1; } diff --git a/client/src/main/java/Static379.java b/client/src/main/java/Static379.java index 8bafddb..359aaeb 100644 --- a/client/src/main/java/Static379.java +++ b/client/src/main/java/Static379.java @@ -4,7 +4,7 @@ public final class Static379 { @OriginalMember(owner = "client!lu", name = "G", descriptor = "I") - public static int anInt5968; + public static int checksum; @OriginalMember(owner = "client!lu", name = "a", descriptor = "(Z)V") public static void method5355(@OriginalArg(0) boolean arg0) { diff --git a/client/src/main/java/Static38.java b/client/src/main/java/Static38.java index 91b6156..9678d9a 100644 --- a/client/src/main/java/Static38.java +++ b/client/src/main/java/Static38.java @@ -11,7 +11,7 @@ public final class Static38 { public static int anInt922 = 0; @OriginalMember(owner = "client!bea", name = "f", descriptor = "I") - public static int anInt928 = 0; + public static int blackmarks = 0; @OriginalMember(owner = "client!bea", name = "a", descriptor = "(IIJI)V") public static void method1001(@OriginalArg(1) int arg0, @OriginalArg(2) long arg1, @OriginalArg(3) int arg2) { diff --git a/client/src/main/java/Static380.java b/client/src/main/java/Static380.java index fbf1236..817fa38 100644 --- a/client/src/main/java/Static380.java +++ b/client/src/main/java/Static380.java @@ -8,12 +8,12 @@ public final class Static380 { @OriginalMember(owner = "client!lv", name = "a", descriptor = "(Lclient!hda;B)Ljava/lang/String;") public static String method5359(@OriginalArg(0) Component arg0) { - if (Static84.method1661(arg0).method6216() == 0) { + if (Static84.getServerActiveProperties(arg0).getTargetMask() == 0) { return null; - } else if (arg0.aString43 == null || arg0.aString43.trim().length() == 0) { + } else if (arg0.optionCircumfix == null || arg0.optionCircumfix.trim().length() == 0) { return Static103.aBoolean195 ? "Hidden-use" : null; } else { - return arg0.aString43; + return arg0.optionCircumfix; } } } diff --git a/client/src/main/java/Static382.java b/client/src/main/java/Static382.java index bb93e25..4da5795 100644 --- a/client/src/main/java/Static382.java +++ b/client/src/main/java/Static382.java @@ -12,7 +12,7 @@ public final class Static382 { @OriginalMember(owner = "client!m", name = "a", descriptor = "(BII)V") public static void method5370(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(14) SecondaryLinkable_Sub2 local14 = Static440.method5963(12, (long) arg1); + @Pc(14) SecondaryLinkable_Sub2 local14 = Static440.create(12, (long) arg1); local14.method202(); local14.anInt197 = arg0; } diff --git a/client/src/main/java/Static383.java b/client/src/main/java/Static383.java index b473fec..30d5568 100644 --- a/client/src/main/java/Static383.java +++ b/client/src/main/java/Static383.java @@ -40,12 +40,12 @@ public static boolean method5379(@OriginalArg(0) int arg0, @OriginalArg(1) Packe local131 = local127 >> 28; local137 = local127 >> 14 & 0xFF; @Pc(141) int local141 = local127 & 0xFF; - @Pc(149) int local149 = (local137 << 6) + (local45 - Static691.anInt10367); + @Pc(149) int local149 = (local137 << 6) + (local45 - Static691.originX); local99.aBoolean125 = local91.aBoolean712; - @Pc(161) int local161 = (local141 << 6) + local50 - Static116.anInt2270; + @Pc(161) int local161 = (local141 << 6) + local50 - Static116.originZ; local99.aBoolean128 = local91.aBoolean711; local99.aByteArray111[0] = Static139.aByteArray30[arg0]; - local99.aByte144 = local99.aByte143 = (byte) local131; + local99.plane = local99.aByte143 = (byte) local131; if (Static441.method5968(local161, local149)) { local99.aByte143++; } diff --git a/client/src/main/java/Static385.java b/client/src/main/java/Static385.java index dd846e7..d196108 100644 --- a/client/src/main/java/Static385.java +++ b/client/src/main/java/Static385.java @@ -60,7 +60,7 @@ public static void method5420(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 } @OriginalMember(owner = "client!mb", name = "a", descriptor = "(B)Z") - public static boolean method5421() { + public static boolean isShowingVideoAd() { if (Static98.aBoolean191) { try { if ((Boolean) BrowserControl.call("showingVideoAd", Static166.anApplet1)) { diff --git a/client/src/main/java/Static389.java b/client/src/main/java/Static389.java index a2b0194..a1d963b 100644 --- a/client/src/main/java/Static389.java +++ b/client/src/main/java/Static389.java @@ -20,20 +20,20 @@ public static void method5476(@OriginalArg(0) int arg0, @OriginalArg(2) Componen if (arg1 == null) { return; } - if (arg1.anObjectArray14 != null) { + if (arg1.onUse != null) { @Pc(14) Linkable_Sub42 local14 = new Linkable_Sub42(); local14.aComponent14 = arg1; - local14.anObjectArray36 = arg1.anObjectArray14; + local14.anObjectArray36 = arg1.onUse; Static472.method6420(local14); } - Static162.anInt2799 = arg1.anInt3760; - Static450.anInt6819 = arg1.anInt3812; + Static162.anInt2799 = arg1.objId; + Static450.anInt6819 = arg1.id; Static156.aBoolean223 = true; Static610.anInt9329 = arg2; Static369.anInt4263 = arg1.anInt3749; - Static77.anInt1614 = arg1.anInt3741; + Static77.anInt1614 = arg1.createdComponentId; Static442.anInt6699 = arg1.anInt3819; Static717.anInt10822 = arg0; - Static178.method2729(arg1); + Static178.redraw(arg1); } } diff --git a/client/src/main/java/Static390.java b/client/src/main/java/Static390.java index 96a6558..609da90 100644 --- a/client/src/main/java/Static390.java +++ b/client/src/main/java/Static390.java @@ -96,7 +96,7 @@ public static WorldMapFont method5493(@OriginalArg(1) int arg0) { } @OriginalMember(owner = "client!mda", name = "a", descriptor = "(IZIZI)I") - public static int method5494(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(4) int arg2) { + public static int getTotalParam(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(4) int arg2) { @Pc(18) Linkable_Sub22 local18 = Static556.method7303(arg2, false); if (local18 == null) { return 0; diff --git a/client/src/main/java/Static393.java b/client/src/main/java/Static393.java index 3225a72..d90dab6 100644 --- a/client/src/main/java/Static393.java +++ b/client/src/main/java/Static393.java @@ -24,7 +24,7 @@ public static void method5509(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int @Pc(40) int local40 = (arg1 & 0x3F) << 10 | (local10 & 0x7) << 7 | local16 & 0x7F; @Pc(44) int local44 = Static154.anIntArray237[local40]; Static300.method4390(false, true); - arg0.aa(arg3 + (arg2.anInt3802 * local16 >> 7), arg4 + ((-local10 + 7) * arg2.anInt3746 >> 3), (arg2.anInt3802 >> 7) + 1, (arg2.anInt3746 >> 3) - -1, local44, 0); + arg0.aa(arg3 + (arg2.width * local16 >> 7), arg4 + ((-local10 + 7) * arg2.height >> 3), (arg2.width >> 7) + 1, (arg2.height >> 3) - -1, local44, 0); } } anInt6147++; diff --git a/client/src/main/java/Static394.java b/client/src/main/java/Static394.java index cc868a6..c3680dc 100644 --- a/client/src/main/java/Static394.java +++ b/client/src/main/java/Static394.java @@ -23,7 +23,7 @@ public static float method5543(@OriginalArg(1) float arg0, @OriginalArg(2) float @Pc(70) int local70 = (int) local53 >> 9; @Pc(75) int local75 = (int) local65 >> 9; if (local70 > 0 && local75 > 0 && Static720.anInt10859 > local70 && local75 < Static501.anInt7568) { - @Pc(104) int local104 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144; + @Pc(104) int local104 = Static556.self.plane; if (local104 < 3 && (Static280.aByteArrayArrayArray3[1][local70][local75] & 0x2) != 0) { local104++; } @@ -45,7 +45,7 @@ public static float method5543(@OriginalArg(1) float arg0, @OriginalArg(2) float @OriginalMember(owner = "client!mh", name = "a", descriptor = "(ZILjava/lang/String;)V") public static void method5544(@OriginalArg(1) int arg0, @OriginalArg(2) String arg1) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(2, (long) arg0); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(2, (long) arg0); local9.method202(); local9.aString1 = arg1; } diff --git a/client/src/main/java/Static396.java b/client/src/main/java/Static396.java index 61baf9a..9cd200a 100644 --- a/client/src/main/java/Static396.java +++ b/client/src/main/java/Static396.java @@ -12,7 +12,7 @@ public static byte[] method5550(@OriginalArg(0) int arg0, @OriginalArg(2) byte[] } @OriginalMember(owner = "client!mi", name = "a", descriptor = "(I)V") - public static void method5551() { + public static void leave() { @Pc(10) Connection local10 = Connection.getActiveConnection(); @Pc(18) OutboundPacket local18 = OutboundPacket.create(ClientProt.aClientProt53, local10.random); local18.buffer.p1(0); diff --git a/client/src/main/java/Static397.java b/client/src/main/java/Static397.java index 2dd65a7..5ad6e80 100644 --- a/client/src/main/java/Static397.java +++ b/client/src/main/java/Static397.java @@ -105,7 +105,7 @@ public static void method5557(@OriginalArg(1) int arg0, @OriginalArg(2) PathingE local27 = Static163.aClass19_17.method7948(local34[0], true); Static541.aSoftLruHashTable174.put((long) local7, local27); } - Static418.method7860(arg1.aByte144, arg1.anInt10694, 0, arg1.anInt10690, arg1.method9302((byte) 55) * 256); + Static418.method7860(arg1.plane, arg1.zFine, 0, arg1.xFine, arg1.method9302((byte) 55) * 256); @Pc(75) int local75 = arg0 + Static215.anIntArray284[0] - 18; @Pc(83) int local83 = local75 + arg6 / 4 * 18; @Pc(94) int local94 = arg5 + Static215.anIntArray284[1] - 54 - 16; diff --git a/client/src/main/java/Static398.java b/client/src/main/java/Static398.java index cfce87d..9861dd6 100644 --- a/client/src/main/java/Static398.java +++ b/client/src/main/java/Static398.java @@ -11,7 +11,7 @@ public final class Static398 { public static ParticleNode_Sub2[] aClass8_Sub2Array7; @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IIIII)I") - public static int method5560(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { + public static int interpolate(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { @Pc(15) int local15 = 65536 - Model.anIntArray740[arg3 * 8192 / arg0] >> 1; return (local15 * arg2 >> 16) + (arg1 * (65536 - local15) >> 16); } diff --git a/client/src/main/java/Static399.java b/client/src/main/java/Static399.java index da581d9..2158f73 100644 --- a/client/src/main/java/Static399.java +++ b/client/src/main/java/Static399.java @@ -34,7 +34,7 @@ public static int method5571(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) Static400.aClass2_Sub34_28.method5104(arg0, Static400.aClass2_Sub34_28.aPreference_Sub29_2); Static32.method880(arg0, false); } - Static666.method8693(1); + Static666.write(1); return local27; } diff --git a/client/src/main/java/Static408.java b/client/src/main/java/Static408.java index 19531ca..2707f8b 100644 --- a/client/src/main/java/Static408.java +++ b/client/src/main/java/Static408.java @@ -8,19 +8,19 @@ public static void method5632() { Static295.aClient1.method1634(); Static524.aConnection3.method3272(); Static524.aConnection3.anInt3646 = 0; - Static249.anInt4008 = 0; + Static249.rebootTimer = 0; Static524.aConnection3.lastPacketType2 = null; Static524.aConnection3.lastPacketType = null; Static524.aConnection3.aServerProt_92 = null; Static524.aConnection3.inboundPacket.pos = 0; Static102.method2022(); - Static251.anInt4036 = 0; - Static723.aString129 = null; - Static327.anInt5392 = 0; + Static251.state = 0; + Static723.name = null; + Static327.size = 0; Static91.aClass164_9 = null; Static128.aClass164_8 = null; - Static706.anInt10633 = 0; - Static87.aClass241Array1 = null; + Static706.size = 0; + Static87.members = null; } @OriginalMember(owner = "client!ms", name = "a", descriptor = "(ZLclient!el;)Z") diff --git a/client/src/main/java/Static414.java b/client/src/main/java/Static414.java index afa9ba1..76639fd 100644 --- a/client/src/main/java/Static414.java +++ b/client/src/main/java/Static414.java @@ -15,13 +15,13 @@ public static void method5696(@OriginalArg(0) boolean arg0, @OriginalArg(1) Play if (Static594.anInt8777 >= 400) { return; } - if (arg1 != Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2) { + if (arg1 != Static556.self) { @Pc(177) String local177; if (arg1.anInt1436 == 0) { @Pc(63) boolean local63 = true; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt1471 != -1 && arg1.anInt1471 != -1) { - @Pc(91) int local91 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt1471 < arg1.anInt1471 ? Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt1471 : arg1.anInt1471; - @Pc(98) int local98 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.combatLevel2 - arg1.combatLevel2; + if (Static556.self.anInt1471 != -1 && arg1.anInt1471 != -1) { + @Pc(91) int local91 = Static556.self.anInt1471 < arg1.anInt1471 ? Static556.self.anInt1471 : arg1.anInt1471; + @Pc(98) int local98 = Static556.self.combatLevel2 - arg1.combatLevel2; if (local98 < 0) { local98 = -local98; } @@ -31,9 +31,9 @@ public static void method5696(@OriginalArg(0) boolean arg0, @OriginalArg(1) Play } @Pc(129) String local129 = ModeGame.GAME_STELLARDAWN == Static392.clientModeGame ? LocalizedText.RATING.get(Static51.clientLanguageId) : LocalizedText.LEVEL.get(Static51.clientLanguageId); if (arg1.combatLevel2 >= arg1.combatLevel1) { - local177 = arg1.method1424(false) + (local63 ? Static693.levelDifferenceColor(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.combatLevel2, arg1.combatLevel2) : "") + " (" + local129 + arg1.combatLevel2 + ")"; + local177 = arg1.method1424(false) + (local63 ? Static693.levelDifferenceColor(Static556.self.combatLevel2, arg1.combatLevel2) : "") + " (" + local129 + arg1.combatLevel2 + ")"; } else { - local177 = arg1.method1424(false) + (local63 ? Static693.levelDifferenceColor(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.combatLevel2, arg1.combatLevel2) : "") + " (" + local129 + arg1.combatLevel2 + "+" + (arg1.combatLevel1 - arg1.combatLevel2) + ")"; + local177 = arg1.method1424(false) + (local63 ? Static693.levelDifferenceColor(Static556.self.combatLevel2, arg1.combatLevel2) : "") + " (" + local129 + arg1.combatLevel2 + "+" + (arg1.combatLevel1 - arg1.combatLevel2) + ")"; } } else if (arg1.anInt1436 == -1) { local177 = arg1.method1424(false); @@ -50,14 +50,14 @@ public static void method5696(@OriginalArg(0) boolean arg0, @OriginalArg(1) Play if (Static297.aStringArray24[local318] != null) { @Pc(325) short local325 = 0; if (Static392.clientModeGame == ModeGame.GAME_RUNESCAPE && Static297.aStringArray24[local318].equalsIgnoreCase(LocalizedText.ATTACK.get(Static51.clientLanguageId))) { - if (Static324.aBoolean388 && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.combatLevel2 < arg1.combatLevel2) { + if (Static324.aBoolean388 && Static556.self.combatLevel2 < arg1.combatLevel2) { local325 = 2000; } - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt1433 == 0 || arg1.anInt1433 == 0) { + if (Static556.self.anInt1433 == 0 || arg1.anInt1433 == 0) { if (arg1.aBoolean125) { local325 = 2000; } - } else if (arg1.anInt1433 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt1433) { + } else if (arg1.anInt1433 == Static556.self.anInt1433) { local325 = 2000; } else { local325 = 0; diff --git a/client/src/main/java/Static415.java b/client/src/main/java/Static415.java index 02fb625..3721922 100644 --- a/client/src/main/java/Static415.java +++ b/client/src/main/java/Static415.java @@ -12,7 +12,7 @@ public final class Static415 { @OriginalMember(owner = "client!nc", name = "a", descriptor = "(II)V") public static void method5698(@OriginalArg(0) int arg0) { - @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.method5963(11, (long) arg0); - local16.method205(); + @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.create(11, (long) arg0); + local16.pushClient(); } } diff --git a/client/src/main/java/Static419.java b/client/src/main/java/Static419.java index b4b77d1..13a9dba 100644 --- a/client/src/main/java/Static419.java +++ b/client/src/main/java/Static419.java @@ -8,7 +8,7 @@ public final class Static419 { public static int[] anIntArray500; @OriginalMember(owner = "client!ne", name = "u", descriptor = "[Ljava/lang/String;") - public static final String[] aStringArray33 = new String[200]; + public static final String[] worldNames = new String[200]; @OriginalMember(owner = "client!ne", name = "p", descriptor = "Lclient!ss;") public static final ClientProt aClientProt77 = new ClientProt(42, 15); diff --git a/client/src/main/java/Static420.java b/client/src/main/java/Static420.java index dc633b5..1084735 100644 --- a/client/src/main/java/Static420.java +++ b/client/src/main/java/Static420.java @@ -20,34 +20,34 @@ public final class Static420 { public static void method5758(@OriginalArg(1) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { if (Static156.aBoolean223) { @Pc(16) ParamType local16 = Static610.anInt9329 == -1 ? null : Static386.aParamTypeList2.method1161(Static610.anInt9329); - if (Static84.method1661(arg0).method6217() && (Static717.anInt10822 & 0x20) != 0 && (local16 == null || arg0.method3404(local16.anInt7509, Static610.anInt9329) != local16.anInt7509)) { - Static416.method5707(false, arg0.anInt3760, 0L, arg0.anInt3741, arg0.anInt3812, Static153.aString27, 18, true, Static369.anInt4263, Static128.aString108 + " -> " + arg0.aString41, (long) (arg0.anInt3741 << 0 | arg0.anInt3812), false); + if (Static84.getServerActiveProperties(arg0).isUseTarget() && (Static717.anInt10822 & 0x20) != 0 && (local16 == null || arg0.method3404(local16.anInt7509, Static610.anInt9329) != local16.anInt7509)) { + Static416.method5707(false, arg0.objId, 0L, arg0.createdComponentId, arg0.id, Static153.aString27, 18, true, Static369.anInt4263, Static128.aString108 + " -> " + arg0.optionBase, (long) (arg0.createdComponentId << 0 | arg0.id), false); } } @Pc(106) String local106; for (@Pc(97) int local97 = 9; local97 >= 5; local97--) { local106 = Static443.method5982(arg0, local97); if (local106 != null) { - Static416.method5707(false, arg0.anInt3760, (long) (local97 + 1), arg0.anInt3741, arg0.anInt3812, local106, 1002, true, Static372.method5292(local97, arg0), arg0.aString41, (long) (arg0.anInt3812 | arg0.anInt3741 << 0), false); + Static416.method5707(false, arg0.objId, (long) (local97 + 1), arg0.createdComponentId, arg0.id, local106, 1002, true, Static372.method5292(local97, arg0), arg0.optionBase, (long) (arg0.id | arg0.createdComponentId << 0), false); } } local106 = Static380.method5359(arg0); if (local106 != null) { - Static416.method5707(false, arg0.anInt3760, 0L, arg0.anInt3741, arg0.anInt3812, local106, 12, true, arg0.anInt3776, arg0.aString41, (long) (arg0.anInt3741 << 0 | arg0.anInt3812), false); + Static416.method5707(false, arg0.objId, 0L, arg0.createdComponentId, arg0.id, local106, 12, true, arg0.anInt3776, arg0.optionBase, (long) (arg0.createdComponentId << 0 | arg0.id), false); } for (@Pc(193) int local193 = 4; local193 >= 0; local193--) { @Pc(204) String local204 = Static443.method5982(arg0, local193); if (local204 != null) { - Static416.method5707(false, arg0.anInt3760, (long) (local193 + 1), arg0.anInt3741, arg0.anInt3812, local204, 20, true, Static372.method5292(local193, arg0), arg0.aString41, (long) (arg0.anInt3812 | arg0.anInt3741 << 0), false); + Static416.method5707(false, arg0.objId, (long) (local193 + 1), arg0.createdComponentId, arg0.id, local204, 20, true, Static372.method5292(local193, arg0), arg0.optionBase, (long) (arg0.id | arg0.createdComponentId << 0), false); } } - if (!Static84.method1661(arg0).method6219()) { + if (!Static84.getServerActiveProperties(arg0).isResumePauseButtonEnabled()) { return; } if (arg0.aString42 == null) { - Static416.method5707(false, arg0.anInt3760, 0L, arg0.anInt3741, arg0.anInt3812, LocalizedText.CONTINUE.get(Static51.clientLanguageId), 10, true, -1, "", (long) (arg0.anInt3812 | arg0.anInt3741 << 0), false); + Static416.method5707(false, arg0.objId, 0L, arg0.createdComponentId, arg0.id, LocalizedText.CONTINUE.get(Static51.clientLanguageId), 10, true, -1, "", (long) (arg0.id | arg0.createdComponentId << 0), false); } else { - Static416.method5707(false, arg0.anInt3760, 0L, arg0.anInt3741, arg0.anInt3812, arg0.aString42, 10, true, -1, "", (long) (arg0.anInt3812 | arg0.anInt3741 << 0), false); + Static416.method5707(false, arg0.objId, 0L, arg0.createdComponentId, arg0.id, arg0.aString42, 10, true, -1, "", (long) (arg0.id | arg0.createdComponentId << 0), false); } } diff --git a/client/src/main/java/Static430.java b/client/src/main/java/Static430.java index a694ad3..7ae44e0 100644 --- a/client/src/main/java/Static430.java +++ b/client/src/main/java/Static430.java @@ -20,7 +20,7 @@ public static void method5815(@OriginalArg(1) int[][] arg0) { } @OriginalMember(owner = "client!nja", name = "a", descriptor = "(IBLjava/lang/String;)Z") - public static boolean method5817(@OriginalArg(0) int arg0, @OriginalArg(2) String arg1) { + public static boolean hopWorld(@OriginalArg(0) int arg0, @OriginalArg(2) String arg1) { if (Static446.aSignlink6.aBoolean781) { Static344.aClass229_1 = new Class229(); Static344.aClass229_1.worldId = arg0; @@ -29,9 +29,9 @@ public static boolean method5817(@OriginalArg(0) int arg0, @OriginalArg(2) Strin Static344.aClass229_1.anInt5854 = Static344.aClass229_1.worldId + 40000; Static344.aClass229_1.anInt5853 = Static344.aClass229_1.worldId + 50000; } - for (@Pc(45) int local45 = 0; local45 < Static343.aClass297_Sub1Array2.length; local45++) { - if (Static343.aClass297_Sub1Array2[local45].anInt7569 == arg0) { - Static715.anInt10805 = Static343.aClass297_Sub1Array2[local45].anInt7563; + for (@Pc(45) int local45 = 0; local45 < Static343.sorted.length; local45++) { + if (Static343.sorted[local45].id == arg0) { + Static715.anInt10805 = Static343.sorted[local45].flags; } } return true; @@ -44,7 +44,7 @@ public static boolean method5817(@OriginalArg(0) int arg0, @OriginalArg(2) Strin if (Static150.aString26 != null) { local88 = "/p=" + Static150.aString26; } - @Pc(152) String local152 = "http://" + arg1 + local73 + "/l=" + Static51.clientLanguageId + "/a=" + Static323.anInt5121 + local88 + "/j" + (Static98.aBoolean191 ? "1" : "0") + ",o" + (Static464.aBoolean533 ? "1" : "0") + ",a2"; + @Pc(152) String local152 = "http://" + arg1 + local73 + "/l=" + Static51.clientLanguageId + "/a=" + Static323.affiliate + local88 + "/j" + (Static98.aBoolean191 ? "1" : "0") + ",o" + (Static464.aBoolean533 ? "1" : "0") + ",a2"; try { Static295.aClient1.getAppletContext().showDocument(new URL(local152), "_self"); return true; @@ -63,7 +63,7 @@ public static void method5818() throws Exception_Sub1 { } @OriginalMember(owner = "client!nja", name = "a", descriptor = "(Ljava/lang/String;II)V") - public static void method5819(@OriginalArg(0) String arg0, @OriginalArg(2) int arg1) { + public static void setRank(@OriginalArg(0) String arg0, @OriginalArg(2) int arg1) { @Pc(10) Connection local10 = Connection.getActiveConnection(); @Pc(16) OutboundPacket local16 = OutboundPacket.create(ClientProt.aClientProt80, local10.random); local16.buffer.p1(Static231.method3379(arg0) + 1); diff --git a/client/src/main/java/Static431.java b/client/src/main/java/Static431.java index dfd8cf9..9846c4b 100644 --- a/client/src/main/java/Static431.java +++ b/client/src/main/java/Static431.java @@ -9,11 +9,11 @@ public final class Static431 { @OriginalMember(owner = "client!nk", name = "a", descriptor = "(IIIIIIIIIIII)V") public static void method5822(@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, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) int arg10) { - if (!Static571.method7566(arg7)) { + if (!Static571.load(arg7)) { return; } if (Static148.aComponentArrayArray1[arg7] == null) { - Static84.method1669(Static453.aComponentArrayArray2[arg7], -1, arg10, arg2, arg5, arg0, arg6, arg1, arg8, arg3, arg9, arg4); + Static84.method1669(Static453.components[arg7], -1, arg10, arg2, arg5, arg0, arg6, arg1, arg8, arg3, arg9, arg4); } else { Static84.method1669(Static148.aComponentArrayArray1[arg7], -1, arg10, arg2, arg5, arg0, arg6, arg1, arg8, arg3, arg9, arg4); } @@ -21,17 +21,17 @@ public static void method5822(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 @OriginalMember(owner = "client!nk", name = "a", descriptor = "(Lclient!cka;ILclient!eo;B)V") public static void method5827(@OriginalArg(0) SeqType arg0, @OriginalArg(1) int arg1, @OriginalArg(2) ParticleNode_Sub2 arg2) { - if (Static33.anInt779 >= 50 || (arg0 == null || arg0.anIntArrayArray38 == null || arg0.anIntArrayArray38.length <= arg1 || arg0.anIntArrayArray38[arg1] == null)) { + if (Static33.anInt779 >= 50 || (arg0 == null || arg0.soundeffect == null || arg0.soundeffect.length <= arg1 || arg0.soundeffect[arg1] == null)) { return; } - @Pc(51) int local51 = arg0.anIntArrayArray38[arg1][0]; + @Pc(51) int local51 = arg0.soundeffect[arg1][0]; @Pc(55) int local55 = local51 >> 8; @Pc(61) int local61 = local51 >> 5 & 0x7; @Pc(80) int local80; - if (arg0.anIntArrayArray38[arg1].length > 1) { - local80 = (int) (Math.random() * (double) arg0.anIntArrayArray38[arg1].length); + if (arg0.soundeffect[arg1].length > 1) { + local80 = (int) (Math.random() * (double) arg0.soundeffect[arg1].length); if (local80 > 0) { - local55 = arg0.anIntArrayArray38[arg1][local80]; + local55 = arg0.soundeffect[arg1][local80]; } } @Pc(93) int local93 = local51 & 0x1F; @@ -41,17 +41,17 @@ public static void method5827(@OriginalArg(0) SeqType arg0, @OriginalArg(1) int } @Pc(134) int local134 = arg0.anIntArray156 == null ? 255 : arg0.anIntArray156[arg1]; if (local93 == 0) { - if (arg2 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2) { + if (arg2 == Static556.self) { if (!arg0.aBoolean141) { - Static161.method2586(local80, 0, local55, local61, local134); + Static161.play(local80, 0, local55, local61, local134); return; } Static186.method2818(local55, local61, local80, 0, local134, false); } } else if (Static400.aClass2_Sub34_28.aPreference_Sub25_1.method7208() != 0) { - @Pc(184) int local184 = arg2.anInt10690 - 256 >> 9; - @Pc(191) int local191 = arg2.anInt10694 - 256 >> 9; - @Pc(212) int local212 = arg2 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 ? 0 : local93 + (local191 << 8) + (local184 << 16) + (arg2.aByte144 << 24); + @Pc(184) int local184 = arg2.xFine - 256 >> 9; + @Pc(191) int local191 = arg2.zFine - 256 >> 9; + @Pc(212) int local212 = arg2 == Static556.self ? 0 : local93 + (local191 << 8) + (local184 << 16) + (arg2.plane << 24); Static409.aClass104Array1[Static33.anInt779++] = new Class104((byte) (arg0.aBoolean141 ? 2 : 1), local55, local61, 0, local134, local212, local80, arg2); } } diff --git a/client/src/main/java/Static434.java b/client/src/main/java/Static434.java index 97812e7..e1c2e2c 100644 --- a/client/src/main/java/Static434.java +++ b/client/src/main/java/Static434.java @@ -9,7 +9,7 @@ public final class Static434 { public static int anInt6565; @OriginalMember(owner = "client!nla", name = "T", descriptor = "Ljava/awt/Canvas;") - public static Canvas aCanvas7; + public static Canvas canvas; @OriginalMember(owner = "client!nla", name = "V", descriptor = "I") public static int anInt6579; diff --git a/client/src/main/java/Static435.java b/client/src/main/java/Static435.java index 8738b25..4d41732 100644 --- a/client/src/main/java/Static435.java +++ b/client/src/main/java/Static435.java @@ -15,7 +15,7 @@ public final class Static435 { @OriginalMember(owner = "client!nm", name = "b", descriptor = "(II)V") public static void method5862(@OriginalArg(1) int arg0) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(12, (long) arg0); - local9.method205(); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(12, (long) arg0); + local9.pushClient(); } } diff --git a/client/src/main/java/Static436.java b/client/src/main/java/Static436.java index c319134..671e3dd 100644 --- a/client/src/main/java/Static436.java +++ b/client/src/main/java/Static436.java @@ -10,7 +10,7 @@ public final class Static436 { public static final ClientProt aClientProt44 = new ClientProt(22, 2); @OriginalMember(owner = "client!no", name = "c", descriptor = "I") - public static int anInt3849 = 0; + public static int size = 0; @OriginalMember(owner = "client!no", name = "a", descriptor = "Lclient!ss;") public static final ClientProt aClientProt45 = new ClientProt(32, -1); diff --git a/client/src/main/java/Static437.java b/client/src/main/java/Static437.java index 3759f3d..76c03eb 100644 --- a/client/src/main/java/Static437.java +++ b/client/src/main/java/Static437.java @@ -59,23 +59,23 @@ public static void method5915(@OriginalArg(1) PacketBit arg0) { @Pc(149) Field local149; @Pc(177) int local177; if (local130 == 0) { - local149 = (Field) local10.aPrivilegedRequestArray1[local105].anObject13; + local149 = (Field) local10.aPrivilegedRequestArray1[local105].result; local177 = local149.getInt((Object) null); arg0.p1(0); arg0.p4(local177); } else if (local130 == 1) { - local149 = (Field) local10.aPrivilegedRequestArray1[local105].anObject13; + local149 = (Field) local10.aPrivilegedRequestArray1[local105].result; local149.setInt((Object) null, local10.anIntArray827[local105]); arg0.p1(0); } else if (local130 == 2) { - local149 = (Field) local10.aPrivilegedRequestArray1[local105].anObject13; + local149 = (Field) local10.aPrivilegedRequestArray1[local105].result; local177 = local149.getModifiers(); arg0.p1(0); arg0.p4(local177); } @Pc(225) Method local225; if (local130 == 3) { - local225 = (Method) local10.aPrivilegedRequestArray2[local105].anObject13; + local225 = (Method) local10.aPrivilegedRequestArray2[local105].result; @Pc(250) byte[][] local250 = local10.aByteArrayArrayArray18[local105]; @Pc(254) Object[] local254 = new Object[local250.length]; for (@Pc(256) int local256 = 0; local256 < local250.length; local256++) { @@ -95,7 +95,7 @@ public static void method5915(@OriginalArg(1) PacketBit arg0) { arg0.p1(4); } } else if (local130 == 4) { - local225 = (Method) local10.aPrivilegedRequestArray2[local105].anObject13; + local225 = (Method) local10.aPrivilegedRequestArray2[local105].result; local177 = local225.getModifiers(); arg0.p1(0); arg0.p4(local177); diff --git a/client/src/main/java/Static44.java b/client/src/main/java/Static44.java index b2004e7..925cf13 100644 --- a/client/src/main/java/Static44.java +++ b/client/src/main/java/Static44.java @@ -18,8 +18,8 @@ public static void method1073(@OriginalArg(1) Component arg0) { local27 = Static380.anInt5979; local24 = Static680.anInt10289; } else { - local24 = local7.anInt3802; - local27 = local7.anInt3746; + local24 = local7.width; + local27 = local7.height; } Static507.method6743(false, local27, local24, arg0); Static470.method6383(arg0, local24, local27, -8525); diff --git a/client/src/main/java/Static440.java b/client/src/main/java/Static440.java index 21de4da..7d2207e 100644 --- a/client/src/main/java/Static440.java +++ b/client/src/main/java/Static440.java @@ -14,7 +14,7 @@ public final class Static440 { public static final int[] anIntArray529 = new int[2]; @OriginalMember(owner = "client!nt", name = "a", descriptor = "(IIJ)Lclient!aj;") - public static SecondaryLinkable_Sub2 method5963(@OriginalArg(1) int arg0, @OriginalArg(2) long arg1) { + public static SecondaryLinkable_Sub2 create(@OriginalArg(1) int arg0, @OriginalArg(2) long arg1) { @Pc(21) SecondaryLinkable_Sub2 local21 = (SecondaryLinkable_Sub2) Static658.aHashTable43.get(arg1 | (long) arg0 << 56); if (local21 == null) { local21 = new SecondaryLinkable_Sub2(arg0, arg1); diff --git a/client/src/main/java/Static441.java b/client/src/main/java/Static441.java index 847d301..20d3504 100644 --- a/client/src/main/java/Static441.java +++ b/client/src/main/java/Static441.java @@ -47,11 +47,11 @@ public static void method5966(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 @OriginalMember(owner = "client!nu", name = "a", descriptor = "(ILclient!cg;)V") public static void method5967(@OriginalArg(1) PathingEntity arg0) { - @Pc(9) int local9 = arg0.anInt10759 - Static333.anInt5455; + @Pc(9) int local9 = arg0.anInt10759 - Static333.loop; @Pc(20) int local20 = arg0.anInt10750 * 512 + arg0.method9302((byte) 99) * 256; @Pc(32) int local32 = arg0.anInt10753 * 512 + arg0.method9302((byte) 58) * 256; - arg0.anInt10694 += (local32 - arg0.anInt10694) / local9; - arg0.anInt10690 += (local20 - arg0.anInt10690) / local9; + arg0.zFine += (local32 - arg0.zFine) / local9; + arg0.xFine += (local20 - arg0.xFine) / local9; arg0.anInt10763 = 0; if (arg0.anInt10754 == 0) { arg0.method9305(8192); diff --git a/client/src/main/java/Static443.java b/client/src/main/java/Static443.java index 89a5896..6de2b8f 100644 --- a/client/src/main/java/Static443.java +++ b/client/src/main/java/Static443.java @@ -6,7 +6,7 @@ public final class Static443 { @OriginalMember(owner = "client!nw", name = "a", descriptor = "(Z)V") public static void method5981() { - if (Static377.anInt5930 == -1) { + if (Static377.topLevelInterface == -1) { return; } @Pc(13) int local13 = Static189.aMouse1.method8853(); @@ -22,7 +22,7 @@ public static void method5981() { local44 = Static130.method2283(); local46 = Static422.method5771(); } - Static431.method5822(local46 + Static380.anInt5979, local46, local46, local22, local22 + local46, local44 + Static680.anInt10289, local44, Static377.anInt5930, local13, local44 + local13, local44); + Static431.method5822(local46 + Static380.anInt5979, local46, local46, local22, local22 + local46, local44 + Static680.anInt10289, local44, Static377.topLevelInterface, local13, local44 + local13, local44); if (Static210.aComponent4 != null) { Static509.method6759(local13 + local44, local22 - -local46); } @@ -30,12 +30,12 @@ public static void method5981() { @OriginalMember(owner = "client!nw", name = "a", descriptor = "(Lclient!hda;II)Ljava/lang/String;") public static String method5982(@OriginalArg(0) Component arg0, @OriginalArg(1) int arg1) { - if (!Static84.method1661(arg0).method6221(arg1) && arg0.anObjectArray15 == null) { + if (!Static84.getServerActiveProperties(arg0).isButtonEnabled(arg1) && arg0.onOptionClick == null) { return null; - } else if (arg0.aStringArray17 == null || arg1 >= arg0.aStringArray17.length || arg0.aStringArray17[arg1] == null || arg0.aStringArray17[arg1].trim().length() == 0) { + } else if (arg0.ops == null || arg1 >= arg0.ops.length || arg0.ops[arg1] == null || arg0.ops[arg1].trim().length() == 0) { return Static103.aBoolean195 ? "Hidden-" + arg1 : null; } else { - return arg0.aStringArray17[arg1]; + return arg0.ops[arg1]; } } } diff --git a/client/src/main/java/Static444.java b/client/src/main/java/Static444.java index 0803b6e..be6c1f4 100644 --- a/client/src/main/java/Static444.java +++ b/client/src/main/java/Static444.java @@ -18,14 +18,14 @@ public static void method5987(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1 Static262.aJs556 = arg2; Static666.aJs5118 = arg0; Static607.aJs5113 = arg3; - Static453.aComponentArrayArray2 = new Component[Static666.aJs5118.capacity()][]; + Static453.components = new Component[Static666.aJs5118.capacity()][]; Static132.aBooleanArray5 = new boolean[Static666.aJs5118.capacity()]; } @OriginalMember(owner = "client!o", name = "a", descriptor = "(B)V") public static void method5988() { - @Pc(13) SecondaryLinkable_Sub2 local13 = Static440.method5963(15, 0L); - local13.method205(); + @Pc(13) SecondaryLinkable_Sub2 local13 = Static440.create(15, 0L); + local13.pushClient(); } @OriginalMember(owner = "client!o", name = "a", descriptor = "(BI)Lclient!vaa;") diff --git a/client/src/main/java/Static449.java b/client/src/main/java/Static449.java index 00f77a4..550a62a 100644 --- a/client/src/main/java/Static449.java +++ b/client/src/main/java/Static449.java @@ -28,22 +28,22 @@ public static void method6114(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 @OriginalMember(owner = "client!od", name = "a", descriptor = "(BZZLclient!aha;)V") public static void method6115(@OriginalArg(1) boolean arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) SubInterface arg2) { - @Pc(6) int local6 = arg2.anInt147; + @Pc(6) int local6 = arg2.interfaceId; @Pc(10) int local10 = (int) arg2.id; arg2.unlink(); if (arg1) { Static347.method5094(local6); } Static193.method2897(local6); - @Pc(27) Component local27 = Static145.method2412(local10); + @Pc(27) Component local27 = Static145.getComponent(local10); if (local27 != null) { - Static178.method2729(local27); + Static178.redraw(local27); } Static94.method1840(); - if (!arg0 && Static377.anInt5930 != -1) { - Static145.method2411(1, Static377.anInt5930); + if (!arg0 && Static377.topLevelInterface != -1) { + Static145.method2411(1, Static377.topLevelInterface); } - @Pc(55) Class331 local55 = new Class331(Static548.aHashTable40); + @Pc(55) Class331 local55 = new Class331(Static548.openInterfaces); for (@Pc(60) SubInterface local60 = (SubInterface) local55.method7613(); local60 != null; local60 = (SubInterface) local55.method7610()) { if (!local60.isLinked()) { local60 = (SubInterface) local55.method7613(); diff --git a/client/src/main/java/Static450.java b/client/src/main/java/Static450.java index 38b3985..d545794 100644 --- a/client/src/main/java/Static450.java +++ b/client/src/main/java/Static450.java @@ -15,7 +15,7 @@ public final class Static450 { @OriginalMember(owner = "client!oda", name = "a", descriptor = "(BII)V") public static void method6127(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.method5963(7, (long) arg1); + @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.create(7, (long) arg1); local16.method202(); local16.anInt197 = arg0; } diff --git a/client/src/main/java/Static453.java b/client/src/main/java/Static453.java index e34d067..389ba00 100644 --- a/client/src/main/java/Static453.java +++ b/client/src/main/java/Static453.java @@ -5,7 +5,7 @@ public final class Static453 { @OriginalMember(owner = "client!of", name = "z", descriptor = "[[Lclient!hda;") - public static Component[][] aComponentArrayArray2; + public static Component[][] components; @OriginalMember(owner = "client!of", name = "a", descriptor = "(Lclient!eo;III)V") public static void method6209(@OriginalArg(0) ParticleNode_Sub2 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { diff --git a/client/src/main/java/Static456.java b/client/src/main/java/Static456.java index 7c6ec83..14c2acc 100644 --- a/client/src/main/java/Static456.java +++ b/client/src/main/java/Static456.java @@ -16,43 +16,43 @@ public final class Static456 { @OriginalMember(owner = "client!oh", name = "a", descriptor = "(IZ)V") public static void method6228(@OriginalArg(1) boolean arg0) { if (arg0) { - if (Static377.anInt5930 != -1) { - Static347.method5094(Static377.anInt5930); + if (Static377.topLevelInterface != -1) { + Static347.method5094(Static377.topLevelInterface); } - for (@Pc(21) SubInterface local21 = (SubInterface) Static548.aHashTable40.head(); local21 != null; local21 = (SubInterface) Static548.aHashTable40.next()) { + for (@Pc(21) SubInterface local21 = (SubInterface) Static548.openInterfaces.head(); local21 != null; local21 = (SubInterface) Static548.openInterfaces.next()) { if (!local21.isLinked()) { - local21 = (SubInterface) Static548.aHashTable40.head(); + local21 = (SubInterface) Static548.openInterfaces.head(); if (local21 == null) { break; } } Static449.method6115(false, true, local21); } - Static377.anInt5930 = -1; - Static548.aHashTable40 = new HashTable(8); + Static377.topLevelInterface = -1; + Static548.openInterfaces = new HashTable(8); Static656.method6692(); - Static377.anInt5930 = Static65.aClass3_1.anInt88; + Static377.topLevelInterface = Static65.aClass3_1.anInt88; Static640.method8435(false); Static469.method6362(); - Static472.method6414(Static377.anInt5930); + Static472.method6414(Static377.topLevelInterface); } Static300.method4389(); Static461.aBoolean529 = false; Static242.method3502(); Static442.anInt6699 = -1; Static115.method2136(ParticleNode_Sub2_Sub4_Sub1.lb); - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 = new Player(); - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 = Static501.anInt7568 * 512 / 2; - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 = Static720.anInt10859 * 512 / 2; - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray879[0] = Static720.anInt10859 / 2; + Static556.self = new Player(); + Static556.self.zFine = Static501.anInt7568 * 512 / 2; + Static556.self.xFine = Static720.anInt10859 * 512 / 2; + Static556.self.anIntArray879[0] = Static720.anInt10859 / 2; Static110.anInt2186 = 0; Static170.anInt2864 = 0; - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray878[0] = Static501.anInt7568 / 2; - if (Static511.anInt7645 == 2) { + Static556.self.anIntArray878[0] = Static501.anInt7568 / 2; + if (Static511.cameraType == 2) { Static110.anInt2186 = Static709.anInt10667 << 9; Static170.anInt2864 = Static121.anInt2333 << 9; } else { - Static583.method7659(); + Static583.updateLoginScreenCamera(); } Static218.method3187(); } diff --git a/client/src/main/java/Static46.java b/client/src/main/java/Static46.java index 3db14f9..a806a85 100644 --- a/client/src/main/java/Static46.java +++ b/client/src/main/java/Static46.java @@ -8,10 +8,10 @@ public final class Static46 { public static int anInt1001; @OriginalMember(owner = "client!bja", name = "a", descriptor = "(BZI)I") - public static int method1082(@OriginalArg(2) int arg0) { + public static int getFreeSpace(@OriginalArg(2) int arg0) { @Pc(13) Linkable_Sub22 local13 = Static556.method7303(arg0, false); if (local13 == null) { - return Static503.aInvTypeList1.method7657(arg0).size; + return Static503.aInvTypeList1.get(arg0).size; } @Pc(24) int local24 = 0; for (@Pc(33) int local33 = 0; local33 < local13.anIntArray278.length; local33++) { @@ -19,7 +19,7 @@ public static int method1082(@OriginalArg(2) int arg0) { local24++; } } - return local24 + Static503.aInvTypeList1.method7657(arg0).size - local13.anIntArray278.length; + return local24 + Static503.aInvTypeList1.get(arg0).size - local13.anIntArray278.length; } @OriginalMember(owner = "client!bja", name = "a", descriptor = "(I)V") diff --git a/client/src/main/java/Static466.java b/client/src/main/java/Static466.java index 0bede5b..cc0fc36 100644 --- a/client/src/main/java/Static466.java +++ b/client/src/main/java/Static466.java @@ -12,11 +12,11 @@ public static void method6322(@OriginalArg(0) PathingEntity arg0) { if (arg0 instanceof Npc) { @Pc(5) Npc local5 = (Npc) arg0; if (local5.aNpcType1 != null) { - Static651.method8517(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 != local5.aByte144, local5); + Static651.method8517(Static556.self.plane != local5.plane, local5); } } else if (arg0 instanceof Player) { @Pc(33) Player local33 = (Player) arg0; - Static414.method5696(local33.aByte144 != Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144, local33); + Static414.method5696(local33.plane != Static556.self.plane, local33); } } diff --git a/client/src/main/java/Static468.java b/client/src/main/java/Static468.java index f7f2bc6..292c394 100644 --- a/client/src/main/java/Static468.java +++ b/client/src/main/java/Static468.java @@ -9,9 +9,9 @@ public final class Static468 { @OriginalMember(owner = "client!op", name = "a", descriptor = "(ZIII)V") public static void method7641(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - @Pc(8) int local8 = arg2 + Static691.anInt10367; - @Pc(12) int local12 = Static116.anInt2270 + arg1; - if (Static334.aClass291ArrayArrayArray1 == null || arg2 < 0 || arg1 < 0 || arg2 >= Static720.anInt10859 || Static501.anInt7568 <= arg1 || Static400.aClass2_Sub34_28.aPreference_Sub19_2.method5960() == 0 && arg0 != Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144) { + @Pc(8) int local8 = arg2 + Static691.originX; + @Pc(12) int local12 = Static116.originZ + arg1; + if (Static334.aClass291ArrayArrayArray1 == null || arg2 < 0 || arg1 < 0 || arg2 >= Static720.anInt10859 || Static501.anInt7568 <= arg1 || Static400.aClass2_Sub34_28.aPreference_Sub19_2.method5960() == 0 && arg0 != Static556.self.plane) { return; } @Pc(67) long local67 = (long) (local12 << 14 | arg0 << 28 | local8); @@ -54,12 +54,12 @@ public static void method7641(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1 } } @Pc(209) int local209 = Static102.method2025(arg0, -29754, (arg1 << 9) + 256, (arg2 << 9) - -256); - local103.aByte144 = (byte) arg0; + local103.plane = (byte) arg0; local103.anInt10691 = local209; local103.aByte143 = (byte) arg0; - local103.anInt10694 = arg1 << 9; + local103.zFine = arg1 << 9; local103.anInt8885 = 0; - local103.anInt10690 = arg2 << 9; + local103.xFine = arg2 << 9; if (Static441.method5968(arg1, arg2)) { local103.aByte143++; } @@ -120,7 +120,7 @@ public static void method7645(@OriginalArg(0) Class152 arg0, @OriginalArg(1) Mod if (arg0.method9111() && arg2.method9111()) { @Pc(12) SeqType local12 = arg0.aSeqType4; @Pc(15) SeqType local15 = arg2.aSeqType4; - arg1.method7477(arg2.anInt10478, arg0.aClass257_8.anInt6448, arg0.aClass257_8.aClass2_Sub2_Sub18_2, arg2.aClass257_8.anInt6450, arg0.aClass257_8.anInt6450, arg2.aClass257_8.aClass2_Sub2_Sub18_2, arg0.aClass257_8.aClass2_Sub2_Sub18_1, arg0.anInt10478, local12.aBoolean140 | local15.aBoolean140, local15.anIntArray157[arg2.anInt10489], arg2.aClass257_8.aClass2_Sub2_Sub18_1, local12.aBooleanArray3, local12.anIntArray157[arg0.anInt10489], arg2.aClass257_8.anInt6448); + arg1.method7477(arg2.anInt10478, arg0.aClass257_8.anInt6448, arg0.aClass257_8.aClass2_Sub2_Sub18_2, arg2.aClass257_8.anInt6450, arg0.aClass257_8.anInt6450, arg2.aClass257_8.aClass2_Sub2_Sub18_2, arg0.aClass257_8.aClass2_Sub2_Sub18_1, arg0.anInt10478, local12.rotateNormals | local15.rotateNormals, local15.frameDelay[arg2.anInt10489], arg2.aClass257_8.aClass2_Sub2_Sub18_1, local12.framegroup, local12.frameDelay[arg0.anInt10489], arg2.aClass257_8.anInt6448); } } diff --git a/client/src/main/java/Static470.java b/client/src/main/java/Static470.java index 455c618..61ade59 100644 --- a/client/src/main/java/Static470.java +++ b/client/src/main/java/Static470.java @@ -24,49 +24,49 @@ public final class Static470 { @OriginalMember(owner = "client!or", name = "a", descriptor = "(Lclient!hda;III)V") public static void method6383(@OriginalArg(0) Component arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - if (arg0.aByte64 == 0) { - arg0.anInt3784 = arg0.anInt3808; - } else if (arg0.aByte64 == 1) { - arg0.anInt3784 = arg0.anInt3808 + (arg2 - arg0.anInt3746) / 2; - } else if (arg0.aByte64 == 2) { - arg0.anInt3784 = arg2 - arg0.anInt3746 - arg0.anInt3808; - } else if (arg0.aByte64 == 3) { - arg0.anInt3784 = arg0.anInt3808 * arg2 >> 14; - } else if (arg0.aByte64 == 4) { - arg0.anInt3784 = (arg2 - arg0.anInt3746) / 2 + (arg2 * arg0.anInt3808 >> 14); + if (arg0.xMode == 0) { + arg0.y = arg0.baseY; + } else if (arg0.xMode == 1) { + arg0.y = arg0.baseY + (arg2 - arg0.height) / 2; + } else if (arg0.xMode == 2) { + arg0.y = arg2 - arg0.height - arg0.baseY; + } else if (arg0.xMode == 3) { + arg0.y = arg0.baseY * arg2 >> 14; + } else if (arg0.xMode == 4) { + arg0.y = (arg2 - arg0.height) / 2 + (arg2 * arg0.baseY >> 14); } else { - arg0.anInt3784 = arg2 - (arg0.anInt3808 * arg2 >> 14) - arg0.anInt3746; + arg0.y = arg2 - (arg0.baseY * arg2 >> 14) - arg0.height; } - if (arg0.aByte61 == 0) { - arg0.anInt3735 = arg0.anInt3826; - } else if (arg0.aByte61 == 1) { - arg0.anInt3735 = arg0.anInt3826 + (arg1 - arg0.anInt3802) / 2; - } else if (arg0.aByte61 == 2) { - arg0.anInt3735 = arg1 - arg0.anInt3802 - arg0.anInt3826; - } else if (arg0.aByte61 == 3) { - arg0.anInt3735 = arg0.anInt3826 * arg1 >> 14; - } else if (arg0.aByte61 == 4) { - arg0.anInt3735 = (arg1 - arg0.anInt3802) / 2 + (arg1 * arg0.anInt3826 >> 14); + if (arg0.yMode == 0) { + arg0.x = arg0.baseX; + } else if (arg0.yMode == 1) { + arg0.x = arg0.baseX + (arg1 - arg0.width) / 2; + } else if (arg0.yMode == 2) { + arg0.x = arg1 - arg0.width - arg0.baseX; + } else if (arg0.yMode == 3) { + arg0.x = arg0.baseX * arg1 >> 14; + } else if (arg0.yMode == 4) { + arg0.x = (arg1 - arg0.width) / 2 + (arg1 * arg0.baseX >> 14); } else { - arg0.anInt3735 = arg1 - (arg1 * arg0.anInt3826 >> 14) - arg0.anInt3802; + arg0.x = arg1 - (arg1 * arg0.baseX >> 14) - arg0.width; } if (!Static103.aBoolean195) { return; } - if (Static84.method1661(arg0).anInt6909 == 0 && arg0.anInt3820 != 0) { + if (Static84.getServerActiveProperties(arg0).events == 0 && arg0.type != 0) { return; } - if (arg0.anInt3735 < 0) { - arg0.anInt3735 = 0; - } else if (arg1 < arg0.anInt3802 + arg0.anInt3735) { - arg0.anInt3735 = arg1 - arg0.anInt3802; + if (arg0.x < 0) { + arg0.x = 0; + } else if (arg1 < arg0.width + arg0.x) { + arg0.x = arg1 - arg0.width; } - if (arg0.anInt3784 < 0) { - arg0.anInt3784 = 0; + if (arg0.y < 0) { + arg0.y = 0; return; } - if (arg0.anInt3784 + arg0.anInt3746 > arg2) { - arg0.anInt3784 = arg2 - arg0.anInt3746; + if (arg0.y + arg0.height > arg2) { + arg0.y = arg2 - arg0.height; return; } } @@ -77,9 +77,9 @@ public static void method6384() { return; } @Pc(14) Component local14 = Static15.method186(Static77.anInt1614, Static450.anInt6819); - if (local14 != null && local14.anObjectArray16 != null) { + if (local14 != null && local14.onUseWith != null) { @Pc(25) Linkable_Sub42 local25 = new Linkable_Sub42(); - local25.anObjectArray36 = local14.anObjectArray16; + local25.anObjectArray36 = local14.onUseWith; local25.aComponent14 = local14; Static472.method6420(local25); } @@ -87,7 +87,7 @@ public static void method6384() { Static156.aBoolean223 = false; Static162.anInt2799 = -1; if (local14 != null) { - Static178.method2729(local14); + Static178.redraw(local14); } } @@ -103,7 +103,7 @@ public static void method6386() { @OriginalMember(owner = "client!or", name = "a", descriptor = "(Z)Z") public static boolean method6387() { if (Static283.gameState == 3) { - return Static135.anInt8223 == 0 && Static6.anInt95 == 0; + return Static135.anInt8223 == 0 && Static6.step == 0; } else { return false; } diff --git a/client/src/main/java/Static471.java b/client/src/main/java/Static471.java index 5b3a4d5..4e3f1e6 100644 --- a/client/src/main/java/Static471.java +++ b/client/src/main/java/Static471.java @@ -14,10 +14,10 @@ public final class Static471 { public static void method6408(@OriginalArg(2) int arg0, @OriginalArg(3) int arg1) { @Pc(11) int local11 = arg1 << 3; @Pc(15) int local15 = arg0 << 3; - if (Static511.anInt7645 == 2) { + if (Static511.cameraType == 2) { Static598.anInt8832 = local11; Static81.anInt1644 = 0; - Static323.anInt5119 = local15; + Static323.cameraYaw = local15; } Static479.aFloat123 = (float) local11; Static171.aFloat64 = (float) local15; diff --git a/client/src/main/java/Static472.java b/client/src/main/java/Static472.java index 93ac811..92c0d16 100644 --- a/client/src/main/java/Static472.java +++ b/client/src/main/java/Static472.java @@ -13,7 +13,7 @@ public final class Static472 { private static int[] anIntArray580; @OriginalMember(owner = "client!ou", name = "m", descriptor = "Lclient!hda;") - private static Component aComponent11; + private static Component staticActiveComponent2; @OriginalMember(owner = "client!ou", name = "i", descriptor = "[J") private static long[] aLongArray15; @@ -28,16 +28,16 @@ public final class Static472 { private static Class164 aClass164_7; @OriginalMember(owner = "client!ou", name = "k", descriptor = "Lclient!hda;") - private static Component aComponent12; + private static Component staticActiveComponent1; @OriginalMember(owner = "client!ou", name = "B", descriptor = "[J") private static final long[] aLongArray14 = new long[1000]; @OriginalMember(owner = "client!ou", name = "e", descriptor = "[I") - private static final int[] anIntArray578 = new int[1000]; + private static final int[] intStack = new int[1000]; @OriginalMember(owner = "client!ou", name = "D", descriptor = "I") - private static int anInt7139 = 0; + private static int ssp = 0; @OriginalMember(owner = "client!ou", name = "t", descriptor = "[Lclient!gf;") private static final GoSubFrame[] aGoSubFrameArray1 = new GoSubFrame[50]; @@ -49,10 +49,10 @@ public final class Static472 { private static final int[] anIntArray579 = new int[3]; @OriginalMember(owner = "client!ou", name = "n", descriptor = "I") - private static int anInt7142 = 0; + private static int isp = 0; @OriginalMember(owner = "client!ou", name = "b", descriptor = "[Ljava/lang/String;") - private static final String[] aStringArray37 = new String[1000]; + private static final String[] stringStack = new String[1000]; @OriginalMember(owner = "client!ou", name = "w", descriptor = "[[I") private static final int[][] anIntArrayArray177 = new int[5][5000]; @@ -107,10 +107,10 @@ private static long method6413(@OriginalArg(0) int arg0) { @OriginalMember(owner = "client!ou", name = "d", descriptor = "(I)V") public static void method6414(@OriginalArg(0) int arg0) { - if (arg0 == -1 || !Static571.method7566(arg0)) { + if (arg0 == -1 || !Static571.load(arg0)) { return; } - @Pc(14) Component[] local14 = Static453.aComponentArrayArray2[arg0]; + @Pc(14) Component[] local14 = Static453.components[arg0]; for (@Pc(16) int local16 = 0; local16 < local14.length; local16++) { @Pc(21) Component local21 = local14[local16]; if (local21.anObjectArray13 != null) { @@ -128,11 +128,11 @@ private static void method6415(@OriginalArg(0) Component arg0) { return; } @Pc(71) Component[] local71; - if (arg0.anInt3741 == -1) { - @Pc(119) int local119 = arg0.anInt3812 >>> 16; + if (arg0.createdComponentId == -1) { + @Pc(119) int local119 = arg0.id >>> 16; @Pc(123) Component[] local123 = Static148.aComponentArrayArray1[local119]; if (local123 == null) { - local71 = Static453.aComponentArrayArray2[local119]; + local71 = Static453.components[local119]; @Pc(132) int local132 = local71.length; local123 = Static148.aComponentArrayArray1[local119] = new Component[local132]; Static734.method7691(local71, 0, local123, 0, local71.length); @@ -147,15 +147,15 @@ private static void method6415(@OriginalArg(0) Component arg0) { local123[local123.length - 1] = arg0; return; } - @Pc(12) Component local12 = Static145.method2412(arg0.anInt3743); + @Pc(12) Component local12 = Static145.getComponent(arg0.overlayer); if (local12 == null) { return; } - if (local12.aComponentArray1 == local12.aComponentArray2) { - local12.aComponentArray1 = new Component[local12.aComponentArray2.length]; + if (local12.aComponentArray1 == local12.createdComponents) { + local12.aComponentArray1 = new Component[local12.createdComponents.length]; local12.aComponentArray1[local12.aComponentArray1.length - 1] = arg0; - Static734.method7691(local12.aComponentArray2, 0, local12.aComponentArray1, 0, arg0.anInt3741); - Static734.method7691(local12.aComponentArray2, arg0.anInt3741 + 1, local12.aComponentArray1, arg0.anInt3741, local12.aComponentArray2.length - arg0.anInt3741 - 1); + Static734.method7691(local12.createdComponents, 0, local12.aComponentArray1, 0, arg0.createdComponentId); + Static734.method7691(local12.createdComponents, arg0.createdComponentId + 1, local12.aComponentArray1, arg0.createdComponentId, local12.createdComponents.length - arg0.createdComponentId - 1); return; } @Pc(68) int local68 = 0; @@ -183,124 +183,124 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean @Pc(248) Component local248; if (arg0 < 300) { if (arg0 == 150) { - anInt7142 -= 3; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local27 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local27 = intStack[isp + 2]; if (local21 == 0) { throw new RuntimeException(); } - local38 = Static145.method2412(local15); - if (local38.aComponentArray2 == null) { - local38.aComponentArray2 = new Component[local27 + 1]; - local38.aComponentArray1 = local38.aComponentArray2; + local38 = Static145.getComponent(local15); + if (local38.createdComponents == null) { + local38.createdComponents = new Component[local27 + 1]; + local38.aComponentArray1 = local38.createdComponents; } - if (local38.aComponentArray2.length <= local27) { + if (local38.createdComponents.length <= local27) { @Pc(70) Component[] local70; - if (local38.aComponentArray2 == local38.aComponentArray1) { + if (local38.createdComponents == local38.aComponentArray1) { local70 = new Component[local27 + 1]; - for (local72 = 0; local72 < local38.aComponentArray2.length; local72++) { - local70[local72] = local38.aComponentArray2[local72]; + for (local72 = 0; local72 < local38.createdComponents.length; local72++) { + local70[local72] = local38.createdComponents[local72]; } - local38.aComponentArray2 = local38.aComponentArray1 = local70; + local38.createdComponents = local38.aComponentArray1 = local70; } else { local70 = new Component[local27 + 1]; @Pc(104) Component[] local104 = new Component[local27 + 1]; - for (@Pc(106) int local106 = 0; local106 < local38.aComponentArray2.length; local106++) { - local70[local106] = local38.aComponentArray2[local106]; + for (@Pc(106) int local106 = 0; local106 < local38.createdComponents.length; local106++) { + local70[local106] = local38.createdComponents[local106]; local104[local106] = local38.aComponentArray1[local106]; } - local38.aComponentArray2 = local70; + local38.createdComponents = local70; local38.aComponentArray1 = local104; } } - if (local27 > 0 && local38.aComponentArray2[local27 - 1] == null) { + if (local27 > 0 && local38.createdComponents[local27 - 1] == null) { throw new RuntimeException("Gap at:" + (local27 - 1)); } @Pc(166) Component local166 = new Component(); - local166.anInt3820 = local21; - local166.anInt3743 = local166.anInt3812 = local38.anInt3812; - local166.anInt3741 = local27; - local38.aComponentArray2[local27] = local166; - if (local38.aComponentArray1 != local38.aComponentArray2) { + local166.type = local21; + local166.overlayer = local166.id = local38.id; + local166.createdComponentId = local27; + local38.createdComponents[local27] = local166; + if (local38.aComponentArray1 != local38.createdComponents) { local38.aComponentArray1[local27] = local166; } if (arg1) { - aComponent12 = local166; + staticActiveComponent1 = local166; } else { - aComponent11 = local166; + staticActiveComponent2 = local166; } - Static178.method2729(local38); + Static178.redraw(local38); return; } if (arg0 == 151) { - local220 = arg1 ? aComponent12 : aComponent11; - if (local220.anInt3741 == -1) { + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; + if (local220.createdComponentId == -1) { if (arg1) { throw new RuntimeException("Tried to .cc_delete static .active-component!"); } throw new RuntimeException("Tried to cc_delete static active-component!"); } - local248 = Static145.method2412(local220.anInt3812); - local248.aComponentArray2[local220.anInt3741] = null; - Static178.method2729(local248); + local248 = Static145.getComponent(local220.id); + local248.createdComponents[local220.createdComponentId] = null; + Static178.redraw(local248); return; } if (arg0 == 152) { - local220 = Static145.method2412(anIntArray578[--anInt7142]); - local220.aComponentArray2 = null; + local220 = Static145.getComponent(intStack[--isp]); + local220.createdComponents = null; local220.aComponentArray1 = null; - Static178.method2729(local220); + Static178.redraw(local220); return; } if (arg0 == 200) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; local303 = Static15.method186(local21, local15); if (local303 != null && local21 != -1) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; if (arg1) { - aComponent12 = local303; + staticActiveComponent1 = local303; return; } - aComponent11 = local303; + staticActiveComponent2 = local303; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 201) { - local15 = anIntArray578[--anInt7142]; - local248 = Static145.method2412(local15); + local15 = intStack[--isp]; + local248 = Static145.getComponent(local15); if (local248 != null) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; if (arg1) { - aComponent12 = local248; + staticActiveComponent1 = local248; return; } - aComponent11 = local248; + staticActiveComponent2 = local248; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 202 || arg0 == 204) { if (arg0 == 202) { - local21 = anIntArray578[--anInt7142]; - local220 = Static145.method2412(local21); + local21 = intStack[--isp]; + local220 = Static145.getComponent(local21); } else { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; } method6415(local220); return; } if (arg0 == 203 || arg0 == 205) { if (arg0 == 203) { - local21 = anIntArray578[--anInt7142]; - local220 = Static145.method2412(local21); + local21 = intStack[--isp]; + local220 = Static145.getComponent(local21); } else { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; } method6417(local220); return; @@ -310,52 +310,52 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean @Pc(575) boolean local575; if (arg0 < 500) { if (arg0 == 403) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 == null) { + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + if (Static556.self.aPlayerAppearance1 == null) { return; } - for (local27 = 0; local27 < Static698.anIntArray831.length; local27++) { - if (Static698.anIntArray831[local27] == local15) { - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1.method4548(local21, Static68.aIdkTypeList3, local27); + for (local27 = 0; local27 < Static698.MALE_FEATURES.length; local27++) { + if (Static698.MALE_FEATURES[local27] == local15) { + Static556.self.aPlayerAppearance1.setIdentikit(local21, Static68.aIdkTypeList3, local27); return; } } - for (local506 = 0; local506 < Static540.anIntArray594.length; local506++) { - if (Static540.anIntArray594[local506] == local15) { - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1.method4548(local21, Static68.aIdkTypeList3, local506); + for (local506 = 0; local506 < Static540.FEMALE_FEATURES.length; local506++) { + if (Static540.FEMALE_FEATURES[local506] == local15) { + Static556.self.aPlayerAppearance1.setIdentikit(local21, Static68.aIdkTypeList3, local506); return; } } return; } if (arg0 == 404) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 == null) { + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + if (Static556.self.aPlayerAppearance1 == null) { return; } - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1.method4549(local15, local21); + Static556.self.aPlayerAppearance1.setColor(local15, local21); return; } if (arg0 == 410) { - local575 = anIntArray578[--anInt7142] != 0; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 == null) { + local575 = intStack[--isp] != 0; + if (Static556.self.aPlayerAppearance1 == null) { return; } - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1.method4547(local575); + Static556.self.aPlayerAppearance1.setGender(local575); return; } if (arg0 == 411) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 == null) { + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + if (Static556.self.aPlayerAppearance1 == null) { return; } - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1.method4551(local21, local15, ObjTypeList.objTypes); + Static556.self.aPlayerAppearance1.method4551(local21, local15, ObjTypeList.objTypes); return; } } else if ((arg0 < 1000 || arg0 >= 1100) && (arg0 < 2000 || arg0 >= 2100)) { @@ -364,103 +364,103 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean if (arg0 >= 1100 && arg0 < 1200 || !(arg0 < 2100 || arg0 >= 2200)) { if (arg0 >= 2000) { arg0 -= 1000; - local220 = Static145.method2412(anIntArray578[--anInt7142]); + local220 = Static145.getComponent(intStack[--isp]); } else { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; } if (arg0 == 1100) { - anInt7142 -= 2; - local220.anInt3809 = anIntArray578[anInt7142]; - if (local220.anInt3809 > local220.anInt3769 - local220.anInt3802) { - local220.anInt3809 = local220.anInt3769 - local220.anInt3802; + isp -= 2; + local220.scrollX = intStack[isp]; + if (local220.scrollX > local220.scrollMaxH - local220.width) { + local220.scrollX = local220.scrollMaxH - local220.width; } - if (local220.anInt3809 < 0) { - local220.anInt3809 = 0; + if (local220.scrollX < 0) { + local220.scrollX = 0; } - local220.anInt3768 = anIntArray578[anInt7142 + 1]; - if (local220.anInt3768 > local220.anInt3742 - local220.anInt3746) { - local220.anInt3768 = local220.anInt3742 - local220.anInt3746; + local220.scrollY = intStack[isp + 1]; + if (local220.scrollY > local220.scrollMaxV - local220.height) { + local220.scrollY = local220.scrollMaxV - local220.height; } - if (local220.anInt3768 < 0) { - local220.anInt3768 = 0; + if (local220.scrollY < 0) { + local220.scrollY = 0; } - Static178.method2729(local220); - if (local220.anInt3741 == -1) { - Static435.method5862(local220.anInt3812); + Static178.redraw(local220); + if (local220.createdComponentId == -1) { + Static435.method5862(local220.id); } return; } if (arg0 == 1101) { - local220.anInt3779 = anIntArray578[--anInt7142]; - Static178.method2729(local220); - if (local220.anInt3741 == -1) { - Static633.method9425(local220.anInt3812); + local220.color = intStack[--isp]; + Static178.redraw(local220); + if (local220.createdComponentId == -1) { + Static633.method9425(local220.id); } return; } if (arg0 == 1102) { - local220.aBoolean294 = anIntArray578[--anInt7142] == 1; - Static178.method2729(local220); + local220.filled = intStack[--isp] == 1; + Static178.redraw(local220); return; } if (arg0 == 1103) { - local220.anInt3780 = anIntArray578[--anInt7142]; - Static178.method2729(local220); + local220.alpha = intStack[--isp]; + Static178.redraw(local220); return; } if (arg0 == 1104) { - local220.anInt3778 = anIntArray578[--anInt7142]; - Static178.method2729(local220); + local220.lineWidth = intStack[--isp]; + Static178.redraw(local220); return; } if (arg0 == 1105) { - local21 = anIntArray578[--anInt7142]; - if (local220.anInt3810 != local21) { - local220.anInt3810 = local21; - Static178.method2729(local220); + local21 = intStack[--isp]; + if (local220.spriteId != local21) { + local220.spriteId = local21; + Static178.redraw(local220); } - if (local220.anInt3741 == -1) { - Static236.method3450(local220.anInt3812); + if (local220.createdComponentId == -1) { + Static236.method3450(local220.id); } return; } if (arg0 == 1106) { - local220.anInt3765 = anIntArray578[--anInt7142]; - Static178.method2729(local220); + local220.angle2d = intStack[--isp]; + Static178.redraw(local220); return; } if (arg0 == 1107) { - local220.aBoolean301 = anIntArray578[--anInt7142] == 1; - Static178.method2729(local220); + local220.aBoolean301 = intStack[--isp] == 1; + Static178.redraw(local220); return; } if (arg0 == 1108) { - local220.anInt3823 = 1; - local220.anInt3831 = anIntArray578[--anInt7142]; - Static178.method2729(local220); - if (local220.anInt3741 == -1) { - Static96.method8819(local220.anInt3812); + local220.modelType = 1; + local220.modelId = intStack[--isp]; + Static178.redraw(local220); + if (local220.createdComponentId == -1) { + Static96.method8819(local220.id); } return; } if (arg0 == 1109) { - anInt7142 -= 6; - local220.anInt3736 = anIntArray578[anInt7142]; - local220.anInt3804 = anIntArray578[anInt7142 + 1]; - local220.anInt3807 = anIntArray578[anInt7142 + 2]; - local220.anInt3811 = anIntArray578[anInt7142 + 3]; - local220.anInt3737 = anIntArray578[anInt7142 + 4]; - local220.anInt3793 = anIntArray578[anInt7142 + 5]; - Static178.method2729(local220); - if (local220.anInt3741 == -1) { - Static77.method1558(local220.anInt3812); - Static580.method7651(local220.anInt3812); + isp -= 6; + local220.modelXOffset = intStack[isp]; + local220.modelZOffset = intStack[isp + 1]; + local220.modelXAngle = intStack[isp + 2]; + local220.modelYAngle = intStack[isp + 3]; + local220.modelYOffset = intStack[isp + 4]; + local220.modelZoom = intStack[isp + 5]; + Static178.redraw(local220); + if (local220.createdComponentId == -1) { + Static77.setComponentModelAngleClient(local220.id); + Static580.setComponentModelOffsetClient(local220.id); } return; } if (arg0 == 1110) { - local21 = anIntArray578[--anInt7142]; - if (local21 != local220.anInt3789) { + local21 = intStack[--isp]; + if (local21 != local220.modelSeqId) { if (local21 == -1) { local220.aClass152_6 = null; } else { @@ -469,117 +469,117 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } local220.aClass152_6.method9113(true, local21); } - local220.anInt3789 = local21; - Static178.method2729(local220); + local220.modelSeqId = local21; + Static178.redraw(local220); } - if (local220.anInt3741 == -1) { - Static62.method1423(local220.anInt3812); + if (local220.createdComponentId == -1) { + Static62.method1423(local220.id); } return; } if (arg0 == 1111) { - local220.aBoolean285 = anIntArray578[--anInt7142] == 1; - Static178.method2729(local220); + local220.modelOrtho = intStack[--isp] == 1; + Static178.redraw(local220); return; } if (arg0 == 1112) { - local1394 = aStringArray37[--anInt7139]; - if (!local1394.equals(local220.aString44)) { - local220.aString44 = local1394; - Static178.method2729(local220); + local1394 = stringStack[--ssp]; + if (!local1394.equals(local220.text)) { + local220.text = local1394; + Static178.redraw(local220); } - if (local220.anInt3741 == -1) { - Static611.method8227(local220.anInt3812); + if (local220.createdComponentId == -1) { + Static611.method8227(local220.id); } return; } if (arg0 == 1113) { - local220.anInt3781 = anIntArray578[--anInt7142]; - Static178.method2729(local220); - if (local220.anInt3741 == -1) { - Static273.method3959(local220.anInt3812); + local220.font = intStack[--isp]; + Static178.redraw(local220); + if (local220.createdComponentId == -1) { + Static273.method3959(local220.id); } return; } if (arg0 == 1114) { - anInt7142 -= 3; - local220.anInt3818 = anIntArray578[anInt7142]; - local220.anInt3814 = anIntArray578[anInt7142 + 1]; - local220.anInt3748 = anIntArray578[anInt7142 + 2]; - Static178.method2729(local220); + isp -= 3; + local220.halign = intStack[isp]; + local220.valign = intStack[isp + 1]; + local220.vpadding = intStack[isp + 2]; + Static178.redraw(local220); return; } if (arg0 == 1115) { - local220.aBoolean286 = anIntArray578[--anInt7142] == 1; - Static178.method2729(local220); + local220.shadowed = intStack[--isp] == 1; + Static178.redraw(local220); return; } if (arg0 == 1116) { - local220.anInt3773 = anIntArray578[--anInt7142]; - Static178.method2729(local220); + local220.outlineThickness = intStack[--isp]; + Static178.redraw(local220); return; } if (arg0 == 1117) { - local220.anInt3798 = anIntArray578[--anInt7142]; - Static178.method2729(local220); + local220.shadowColor = intStack[--isp]; + Static178.redraw(local220); return; } if (arg0 == 1118) { - local220.aBoolean291 = anIntArray578[--anInt7142] == 1; - Static178.method2729(local220); + local220.vFlip = intStack[--isp] == 1; + Static178.redraw(local220); return; } if (arg0 == 1119) { - local220.aBoolean293 = anIntArray578[--anInt7142] == 1; - Static178.method2729(local220); + local220.hFlip = intStack[--isp] == 1; + Static178.redraw(local220); return; } if (arg0 == 1120) { - anInt7142 -= 2; - local220.anInt3769 = anIntArray578[anInt7142]; - local220.anInt3742 = anIntArray578[anInt7142 + 1]; - Static178.method2729(local220); - if (local220.anInt3820 == 0) { + isp -= 2; + local220.scrollMaxH = intStack[isp]; + local220.scrollMaxV = intStack[isp + 1]; + Static178.redraw(local220); + if (local220.type == 0) { Static134.method8956(local220, false); } return; } if (arg0 == 1122) { - local220.aBoolean292 = anIntArray578[--anInt7142] == 1; - Static178.method2729(local220); + local220.aBoolean292 = intStack[--isp] == 1; + Static178.redraw(local220); return; } if (arg0 == 1123) { - local220.anInt3793 = anIntArray578[--anInt7142]; - Static178.method2729(local220); - if (local220.anInt3741 == -1) { - Static77.method1558(local220.anInt3812); + local220.modelZoom = intStack[--isp]; + Static178.redraw(local220); + if (local220.createdComponentId == -1) { + Static77.setComponentModelAngleClient(local220.id); } return; } if (arg0 == 1124) { - local21 = anIntArray578[--anInt7142]; + local21 = intStack[--isp]; local220.aBoolean287 = local21 == 1; - Static178.method2729(local220); + Static178.redraw(local220); return; } if (arg0 == 1125) { - anInt7142 -= 2; - local220.anInt3755 = anIntArray578[anInt7142]; - local220.anInt3799 = anIntArray578[anInt7142 + 1]; - Static178.method2729(local220); + isp -= 2; + local220.anInt3755 = intStack[isp]; + local220.anInt3799 = intStack[isp + 1]; + Static178.redraw(local220); return; } if (arg0 == 1126) { - local220.anInt3788 = anIntArray578[--anInt7142]; - Static178.method2729(local220); + local220.anInt3788 = intStack[--isp]; + Static178.redraw(local220); return; } @Pc(1756) ParamType local1756; if (arg0 == 1127) { - anInt7142 -= 2; - local21 = anIntArray578[anInt7142]; - local27 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local21 = intStack[isp]; + local27 = intStack[isp + 1]; local1756 = Static386.aParamTypeList2.method1161(local21); if (local27 != local1756.anInt7509) { local220.method3385(local21, local27); @@ -589,8 +589,8 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 1128) { - local21 = anIntArray578[--anInt7142]; - local1791 = aStringArray37[--anInt7139]; + local21 = intStack[--isp]; + local1791 = stringStack[--ssp]; local1756 = Static386.aParamTypeList2.method1161(local21); if (!local1756.aString89.equals(local1791)) { local220.method3396(local1791, local21); @@ -600,14 +600,14 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 1129 || arg0 == 1130) { - local21 = anIntArray578[--anInt7142]; - if ((local220.anInt3820 == 5 || arg0 != 1129) && (local220.anInt3820 == 4 || arg0 != 1130)) { + local21 = intStack[--isp]; + if ((local220.type == 5 || arg0 != 1129) && (local220.type == 4 || arg0 != 1130)) { if (local220.anInt3745 != local21) { local220.anInt3745 = local21; - Static178.method2729(local220); + Static178.redraw(local220); } - if (local220.anInt3741 == -1) { - Static80.method1583(local220.anInt3812); + if (local220.createdComponentId == -1) { + Static80.method1583(local220.id); } return; } @@ -616,47 +616,47 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean @Pc(1899) short local1899; @Pc(1892) short local1892; if (arg0 == 1131) { - anInt7142 -= 3; - local21 = anIntArray578[anInt7142]; - local1892 = (short) anIntArray578[anInt7142 + 1]; - local1899 = (short) anIntArray578[anInt7142 + 2]; + isp -= 3; + local21 = intStack[isp]; + local1892 = (short) intStack[isp + 1]; + local1899 = (short) intStack[isp + 2]; if (local21 >= 0 && local21 < 5) { local220.method3406(local1899, local21, local1892); - Static178.method2729(local220); - if (local220.anInt3741 == -1) { - Static321.method4619(local220.anInt3812, local21); + Static178.redraw(local220); + if (local220.createdComponentId == -1) { + Static321.method4619(local220.id, local21); } return; } return; } if (arg0 == 1132) { - anInt7142 -= 3; - local21 = anIntArray578[anInt7142]; - local1892 = (short) anIntArray578[anInt7142 + 1]; - local1899 = (short) anIntArray578[anInt7142 + 2]; + isp -= 3; + local21 = intStack[isp]; + local1892 = (short) intStack[isp + 1]; + local1899 = (short) intStack[isp + 2]; if (local21 >= 0 && local21 < 5) { local220.method3388(local1892, local21, local1899); - Static178.method2729(local220); - if (local220.anInt3741 == -1) { - Static693.method9013(local220.anInt3812, local21); + Static178.redraw(local220); + if (local220.createdComponentId == -1) { + Static693.method9013(local220.id, local21); } return; } return; } if (arg0 == 1133) { - local220.aBoolean299 = anIntArray578[--anInt7142] == 1; - Static178.method2729(local220); - if (local220.anInt3741 == -1) { - Static682.method8926(local220.anInt3812); + local220.aBoolean299 = intStack[--isp] == 1; + Static178.redraw(local220); + if (local220.createdComponentId == -1) { + Static682.method8926(local220.id); } return; } if (arg0 == 1134) { - anInt7142 -= 2; - local21 = anIntArray578[anInt7142]; - local27 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local21 = intStack[isp]; + local27 = intStack[isp + 1]; local1756 = Static386.aParamTypeList2.method1161(local21); if (local27 != local1756.anInt7509) { local220.method3385(local21, local27); @@ -666,50 +666,50 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 1135) { - local220.aBoolean295 = anIntArray578[--anInt7142] == 1; - Static178.method2729(local220); - if (local220.anInt3741 == -1) { - Static71.method1523(local220.anInt3812); + local220.aBoolean295 = intStack[--isp] == 1; + Static178.redraw(local220); + if (local220.createdComponentId == -1) { + Static71.method1523(local220.id); } return; } } else if (arg0 >= 1200 && arg0 < 1300 || arg0 >= 2200 && arg0 < 2300) { if (arg0 >= 2000) { arg0 -= 1000; - local220 = Static145.method2412(anIntArray578[--anInt7142]); + local220 = Static145.getComponent(intStack[--isp]); } else { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; } - Static178.method2729(local220); + Static178.redraw(local220); if (arg0 == 1200 || arg0 == 1205 || arg0 == 1208 || arg0 == 1209 || arg0 == 1212 || arg0 == 1213) { - anInt7142 -= 2; - local21 = anIntArray578[anInt7142]; - local27 = anIntArray578[anInt7142 + 1]; - if (local220.anInt3741 == -1) { - Static329.method1631(local220.anInt3812); - Static77.method1558(local220.anInt3812); - Static580.method7651(local220.anInt3812); + isp -= 2; + local21 = intStack[isp]; + local27 = intStack[isp + 1]; + if (local220.createdComponentId == -1) { + Static329.setComponentObjClient(local220.id); + Static77.setComponentModelAngleClient(local220.id); + Static580.setComponentModelOffsetClient(local220.id); } if (local21 == -1) { - local220.anInt3823 = 1; - local220.anInt3831 = -1; - local220.anInt3760 = -1; + local220.modelType = 1; + local220.modelId = -1; + local220.objId = -1; return; } - local220.anInt3760 = local21; - local220.anInt3817 = local27; + local220.objId = local21; + local220.objCount = local27; if (arg0 == 1208 || arg0 == 1209) { local220.aBoolean288 = true; } else { local220.aBoolean288 = false; } @Pc(2236) ObjType local2236 = ObjTypeList.objTypes.method2486(local21); - local220.anInt3807 = local2236.anInt10107; - local220.anInt3811 = local2236.anInt10096; - local220.anInt3737 = local2236.anInt10094; - local220.anInt3736 = local2236.anInt10126; - local220.anInt3804 = local2236.anInt10099; - local220.anInt3793 = local2236.anInt10098; + local220.modelXAngle = local2236.xAngle2D; + local220.modelYAngle = local2236.yAngle2D; + local220.modelYOffset = local2236.anInt10094; + local220.modelXOffset = local2236.anInt10126; + local220.modelZOffset = local2236.anInt10099; + local220.modelZoom = local2236.zoom2d; if (arg0 == 1205 || arg0 == 1209) { local220.anInt3757 = 0; } else if (arg0 == 1212 || arg0 == 1213) { @@ -718,87 +718,87 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean local220.anInt3757 = 2; } if (local220.anInt3800 > 0) { - local220.anInt3793 = local220.anInt3793 * 32 / local220.anInt3800; + local220.modelZoom = local220.modelZoom * 32 / local220.anInt3800; return; } - if (local220.anInt3744 > 0) { - local220.anInt3793 = local220.anInt3793 * 32 / local220.anInt3744; + if (local220.baseWidth > 0) { + local220.modelZoom = local220.modelZoom * 32 / local220.baseWidth; } return; } if (arg0 == 1201) { - local220.anInt3823 = 2; - local220.anInt3831 = anIntArray578[--anInt7142]; - if (local220.anInt3741 == -1) { - Static96.method8819(local220.anInt3812); + local220.modelType = 2; + local220.modelId = intStack[--isp]; + if (local220.createdComponentId == -1) { + Static96.method8819(local220.id); } return; } if (arg0 == 1202) { - local220.anInt3823 = 3; - local220.anInt3831 = -1; - if (local220.anInt3741 == -1) { - Static96.method8819(local220.anInt3812); + local220.modelType = 3; + local220.modelId = -1; + if (local220.createdComponentId == -1) { + Static96.method8819(local220.id); } return; } if (arg0 == 1203) { - local220.anInt3823 = 6; - local220.anInt3831 = anIntArray578[--anInt7142]; - if (local220.anInt3741 == -1) { - Static96.method8819(local220.anInt3812); + local220.modelType = 6; + local220.modelId = intStack[--isp]; + if (local220.createdComponentId == -1) { + Static96.method8819(local220.id); } return; } if (arg0 == 1204) { - local220.anInt3823 = 5; - local220.anInt3831 = anIntArray578[--anInt7142]; - if (local220.anInt3741 == -1) { - Static96.method8819(local220.anInt3812); + local220.modelType = 5; + local220.modelId = intStack[--isp]; + if (local220.createdComponentId == -1) { + Static96.method8819(local220.id); } return; } if (arg0 == 1206) { - anInt7142 -= 4; - local220.anInt3824 = anIntArray578[anInt7142]; - local220.anInt3763 = anIntArray578[anInt7142 + 1]; - local220.anInt3796 = anIntArray578[anInt7142 + 2]; - local220.anInt3782 = anIntArray578[anInt7142 + 3]; - Static178.method2729(local220); + isp -= 4; + local220.anInt3824 = intStack[isp]; + local220.anInt3763 = intStack[isp + 1]; + local220.anInt3796 = intStack[isp + 2]; + local220.anInt3782 = intStack[isp + 3]; + Static178.redraw(local220); return; } if (arg0 == 1207) { - anInt7142 -= 2; - local220.anInt3815 = anIntArray578[anInt7142]; - local220.anInt3786 = anIntArray578[anInt7142 + 1]; - Static178.method2729(local220); + isp -= 2; + local220.anInt3815 = intStack[isp]; + local220.anInt3786 = intStack[isp + 1]; + Static178.redraw(local220); return; } if (arg0 == 1210) { - anInt7142 -= 4; - local220.anInt3831 = anIntArray578[anInt7142]; - local220.anInt3738 = anIntArray578[anInt7142 + 1]; - if (anIntArray578[anInt7142 + 2] == 1) { - local220.anInt3823 = 9; + isp -= 4; + local220.modelId = intStack[isp]; + local220.anInt3738 = intStack[isp + 1]; + if (intStack[isp + 2] == 1) { + local220.modelType = 9; } else { - local220.anInt3823 = 8; + local220.modelType = 8; } - if (anIntArray578[anInt7142 + 3] == 1) { + if (intStack[isp + 3] == 1) { local220.aBoolean288 = true; } else { local220.aBoolean288 = false; } - if (local220.anInt3741 == -1) { - Static96.method8819(local220.anInt3812); + if (local220.createdComponentId == -1) { + Static96.method8819(local220.id); } return; } if (arg0 == 1211) { - local220.anInt3823 = 5; - local220.anInt3831 = Static312.anInt5000; + local220.modelType = 5; + local220.modelId = Static312.anInt5000; local220.anInt3738 = 0; - if (local220.anInt3741 == -1) { - Static96.method8819(local220.anInt3812); + if (local220.createdComponentId == -1) { + Static96.method8819(local220.id); } return; } @@ -807,23 +807,23 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean if (arg0 >= 1300 && arg0 < 1400 || arg0 >= 2300 && arg0 < 2400) { if (arg0 >= 2000) { arg0 -= 1000; - local220 = Static145.method2412(anIntArray578[--anInt7142]); + local220 = Static145.getComponent(intStack[--isp]); } else { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; } if (arg0 == 1300) { - local21 = anIntArray578[--anInt7142] - 1; + local21 = intStack[--isp] - 1; if (local21 >= 0 && local21 <= 9) { - local220.method3391(aStringArray37[--anInt7139], local21); + local220.method3391(stringStack[--ssp], local21); return; } - anInt7139--; + ssp--; return; } if (arg0 == 1301) { - anInt7142 -= 2; - local21 = anIntArray578[anInt7142]; - local27 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local21 = intStack[isp]; + local27 = intStack[isp + 1]; if (local21 == -1 && local27 == -1) { local220.aComponent6 = null; return; @@ -832,68 +832,68 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 1302) { - local21 = anIntArray578[--anInt7142]; + local21 = intStack[--isp]; if (local21 != Static351.anInt5719 && local21 != Static137.anInt2510 && local21 != Static237.anInt6524) { return; } - local220.anInt3830 = local21; + local220.dragRenderBehavior = local21; return; } if (arg0 == 1303) { - local220.anInt3754 = anIntArray578[--anInt7142]; + local220.dragDeadzone = intStack[--isp]; return; } if (arg0 == 1304) { - local220.anInt3797 = anIntArray578[--anInt7142]; + local220.dragDeadtime = intStack[--isp]; return; } if (arg0 == 1305) { - local220.aString41 = aStringArray37[--anInt7139]; + local220.optionBase = stringStack[--ssp]; return; } if (arg0 == 1306) { - local220.aString43 = aStringArray37[--anInt7139]; + local220.optionCircumfix = stringStack[--ssp]; return; } if (arg0 == 1307) { - local220.aStringArray17 = null; + local220.ops = null; return; } if (arg0 == 1308) { - local220.anInt3819 = anIntArray578[--anInt7142]; - local220.anInt3749 = anIntArray578[--anInt7142]; + local220.anInt3819 = intStack[--isp]; + local220.anInt3749 = intStack[--isp]; return; } if (arg0 == 1309) { - local21 = anIntArray578[--anInt7142]; - local27 = anIntArray578[--anInt7142]; + local21 = intStack[--isp]; + local27 = intStack[--isp]; if (local27 >= 1 && local27 <= 10) { local220.method3397(local27 - 1, local21); } return; } if (arg0 == 1310) { - local220.aString42 = aStringArray37[--anInt7139]; + local220.aString42 = stringStack[--ssp]; return; } if (arg0 == 1311) { - local220.anInt3776 = anIntArray578[--anInt7142]; + local220.anInt3776 = intStack[--isp]; return; } if (arg0 == 1312 || arg0 == 1313) { if (arg0 == 1312) { - anInt7142 -= 3; - local21 = anIntArray578[anInt7142] - 1; - local27 = anIntArray578[anInt7142 + 1]; - local506 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local21 = intStack[isp] - 1; + local27 = intStack[isp + 1]; + local506 = intStack[isp + 2]; if (local21 < 0 || local21 > 9) { throw new RuntimeException("IOR13121313"); } } else { - anInt7142 -= 2; + isp -= 2; local21 = 10; - local27 = anIntArray578[anInt7142]; - local506 = anIntArray578[anInt7142 + 1]; + local27 = intStack[isp]; + local506 = intStack[isp + 1]; } if (local220.aByteArray37 == null) { if (local27 == 0) { @@ -919,28 +919,28 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 1314) { - local220.anInt3783 = anIntArray578[--anInt7142]; + local220.anInt3783 = intStack[--isp]; return; } } else if (arg0 >= 1400 && arg0 < 1500 || arg0 >= 2400 && arg0 < 2500) { if (arg0 >= 2000) { arg0 -= 1000; - local220 = Static145.method2412(anIntArray578[--anInt7142]); + local220 = Static145.getComponent(intStack[--isp]); } else { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; } if (arg0 == 1499) { local220.method3399(); return; } - local1394 = aStringArray37[--anInt7139]; + local1394 = stringStack[--ssp]; @Pc(3077) int[] local3077 = null; if (local1394.length() > 0 && local1394.charAt(local1394.length() - 1) == 'Y') { - local506 = anIntArray578[--anInt7142]; + local506 = intStack[--isp]; if (local506 > 0) { local3077 = new int[local506]; while (local506-- > 0) { - local3077[local506] = anIntArray578[--anInt7142]; + local3077[local506] = intStack[--isp]; } } local1394 = local1394.substring(0, local1394.length() - 1); @@ -948,82 +948,82 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean @Pc(3131) Object[] local3131 = new Object[local1394.length() + 1]; for (local2978 = local3131.length - 1; local2978 >= 1; local2978--) { if (local1394.charAt(local2978 - 1) == 's') { - local3131[local2978] = aStringArray37[--anInt7139]; + local3131[local2978] = stringStack[--ssp]; } else if (local1394.charAt(local2978 - 1) == '§') { local3131[local2978] = Long.valueOf(aLongArray14[--anInt7152]); } else { - local3131[local2978] = Integer.valueOf(anIntArray578[--anInt7142]); + local3131[local2978] = Integer.valueOf(intStack[--isp]); } } - local72 = anIntArray578[--anInt7142]; + local72 = intStack[--isp]; if (local72 == -1) { local3131 = null; } else { local3131[0] = Integer.valueOf(local72); } if (arg0 == 1400) { - local220.anObjectArray17 = local3131; + local220.onClickRepeat = local3131; } else if (arg0 == 1401) { - local220.anObjectArray32 = local3131; + local220.onHold = local3131; } else if (arg0 == 1402) { - local220.anObjectArray1 = local3131; + local220.onRelease = local3131; } else if (arg0 == 1403) { - local220.anObjectArray4 = local3131; + local220.onMouseOver = local3131; } else if (arg0 == 1404) { - local220.anObjectArray26 = local3131; + local220.onMouseLeave = local3131; } else if (arg0 == 1405) { - local220.anObjectArray30 = local3131; + local220.onDragStart = local3131; } else if (arg0 == 1406) { - local220.anObjectArray16 = local3131; + local220.onUseWith = local3131; } else if (arg0 == 1407) { - local220.anObjectArray25 = local3131; - local220.anIntArray300 = local3077; + local220.onVarpTransmit = local3131; + local220.varpTriggers = local3077; } else if (arg0 == 1408) { - local220.anObjectArray3 = local3131; + local220.onTimer = local3131; } else if (arg0 == 1409) { - local220.anObjectArray15 = local3131; + local220.onOptionClick = local3131; } else if (arg0 == 1410) { - local220.anObjectArray5 = local3131; + local220.onDragRelease = local3131; } else if (arg0 == 1411) { - local220.anObjectArray24 = local3131; + local220.onDrag = local3131; } else if (arg0 == 1412) { - local220.anObjectArray28 = local3131; + local220.onMouseRepeat = local3131; } else if (arg0 == 1414) { - local220.anObjectArray8 = local3131; - local220.anIntArray299 = local3077; + local220.onInvTransmit = local3131; + local220.inventoryTriggers = local3077; } else if (arg0 == 1415) { - local220.anObjectArray21 = local3131; - local220.anIntArray295 = local3077; + local220.onStatTransmit = local3131; + local220.statTriggers = local3077; } else if (arg0 == 1416) { - local220.anObjectArray14 = local3131; + local220.onUse = local3131; } else if (arg0 == 1417) { - local220.anObjectArray11 = local3131; + local220.onScroll = local3131; } else if (arg0 == 1418) { - local220.anObjectArray7 = local3131; + local220.onMsg = local3131; } else if (arg0 == 1419) { - local220.anObjectArray22 = local3131; + local220.onKey = local3131; } else if (arg0 == 1420) { - local220.anObjectArray29 = local3131; + local220.onFriendTransmit = local3131; } else if (arg0 == 1421) { - local220.anObjectArray27 = local3131; + local220.onClanTransmit = local3131; } else if (arg0 == 1422) { - local220.anObjectArray34 = local3131; + local220.onMiscTransmit = local3131; } else if (arg0 == 1423) { - local220.anObjectArray20 = local3131; + local220.onDialogAbort = local3131; } else if (arg0 == 1424) { - local220.anObjectArray6 = local3131; + local220.onWidgetsOpenClose = local3131; } else if (arg0 == 1425) { - local220.anObjectArray9 = local3131; + local220.onStockTransmit = local3131; } else if (arg0 == 1426) { - local220.anObjectArray31 = local3131; + local220.onMinimapUnlock = local3131; } else if (arg0 == 1427) { - local220.anObjectArray19 = local3131; + local220.onResize = local3131; } else if (arg0 == 1428) { - local220.anObjectArray2 = local3131; - local220.anIntArray298 = local3077; + local220.onVarcTransmit = local3131; + local220.varcTriggers = local3077; } else if (arg0 == 1429) { - local220.anObjectArray18 = local3131; - local220.anIntArray296 = local3077; + local220.onVarcstrTransmit = local3131; + local220.varcstrTriggers = local3077; } else if (arg0 == 1430) { local220.anObjectArray10 = local3131; } else if (arg0 == 1431) { @@ -1036,280 +1036,280 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean local220.aBoolean297 = true; return; } else if (arg0 < 1600) { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; if (arg0 == 1500) { - anIntArray578[anInt7142++] = local220.anInt3735; + intStack[isp++] = local220.x; return; } if (arg0 == 1501) { - anIntArray578[anInt7142++] = local220.anInt3784; + intStack[isp++] = local220.y; return; } if (arg0 == 1502) { - anIntArray578[anInt7142++] = local220.anInt3802; + intStack[isp++] = local220.width; return; } if (arg0 == 1503) { - anIntArray578[anInt7142++] = local220.anInt3746; + intStack[isp++] = local220.height; return; } if (arg0 == 1504) { - anIntArray578[anInt7142++] = local220.aBoolean284 ? 1 : 0; + intStack[isp++] = local220.hidden ? 1 : 0; return; } if (arg0 == 1505) { - anIntArray578[anInt7142++] = local220.anInt3743; + intStack[isp++] = local220.overlayer; return; } if (arg0 == 1506) { local248 = Static556.method7299(local220); - anIntArray578[anInt7142++] = local248 == null ? -1 : local248.anInt3812; + intStack[isp++] = local248 == null ? -1 : local248.id; return; } if (arg0 == 1507) { - anIntArray578[anInt7142++] = local220.anInt3779; + intStack[isp++] = local220.color; return; } } else { @Pc(3848) ParamType local3848; if (arg0 < 1700) { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; if (arg0 == 1600) { - anIntArray578[anInt7142++] = local220.anInt3809; + intStack[isp++] = local220.scrollX; return; } if (arg0 == 1601) { - anIntArray578[anInt7142++] = local220.anInt3768; + intStack[isp++] = local220.scrollY; return; } if (arg0 == 1602) { - aStringArray37[anInt7139++] = local220.aString44; + stringStack[ssp++] = local220.text; return; } if (arg0 == 1603) { - anIntArray578[anInt7142++] = local220.anInt3769; + intStack[isp++] = local220.scrollMaxH; return; } if (arg0 == 1604) { - anIntArray578[anInt7142++] = local220.anInt3742; + intStack[isp++] = local220.scrollMaxV; return; } if (arg0 == 1605) { - anIntArray578[anInt7142++] = local220.anInt3793; + intStack[isp++] = local220.modelZoom; return; } if (arg0 == 1606) { - anIntArray578[anInt7142++] = local220.anInt3807; + intStack[isp++] = local220.modelXAngle; return; } if (arg0 == 1607) { - anIntArray578[anInt7142++] = local220.anInt3737; + intStack[isp++] = local220.modelYOffset; return; } if (arg0 == 1608) { - anIntArray578[anInt7142++] = local220.anInt3811; + intStack[isp++] = local220.modelYAngle; return; } if (arg0 == 1609) { - anIntArray578[anInt7142++] = local220.anInt3780; + intStack[isp++] = local220.alpha; return; } if (arg0 == 1610) { - anIntArray578[anInt7142++] = local220.anInt3736; + intStack[isp++] = local220.modelXOffset; return; } if (arg0 == 1611) { - anIntArray578[anInt7142++] = local220.anInt3804; + intStack[isp++] = local220.modelZOffset; return; } if (arg0 == 1612) { - anIntArray578[anInt7142++] = local220.anInt3810; + intStack[isp++] = local220.spriteId; return; } if (arg0 == 1613) { - local21 = anIntArray578[--anInt7142]; + local21 = intStack[--isp]; local3848 = Static386.aParamTypeList2.method1161(local21); if (local3848.method6672()) { - aStringArray37[anInt7139++] = local220.method3389(local3848.aString89, local21); + stringStack[ssp++] = local220.method3389(local3848.aString89, local21); return; } - anIntArray578[anInt7142++] = local220.method3404(local3848.anInt7509, local21); + intStack[isp++] = local220.method3404(local3848.anInt7509, local21); return; } if (arg0 == 1614) { - anIntArray578[anInt7142++] = local220.anInt3765; + intStack[isp++] = local220.angle2d; return; } if (arg0 == 2614) { - anIntArray578[anInt7142++] = local220.anInt3823 == 1 ? local220.anInt3831 : -1; + intStack[isp++] = local220.modelType == 1 ? local220.modelId : -1; return; } if (arg0 == 1618) { - anIntArray578[anInt7142++] = local220.anInt3781; + intStack[isp++] = local220.font; return; } } else if (arg0 < 1800) { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; if (arg0 == 1700) { - anIntArray578[anInt7142++] = local220.anInt3760; + intStack[isp++] = local220.objId; return; } if (arg0 == 1701) { - if (local220.anInt3760 != -1) { - anIntArray578[anInt7142++] = local220.anInt3817; + if (local220.objId != -1) { + intStack[isp++] = local220.objCount; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 1702) { - anIntArray578[anInt7142++] = local220.anInt3741; + intStack[isp++] = local220.createdComponentId; return; } } else if (arg0 < 1900) { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; if (arg0 == 1800) { - anIntArray578[anInt7142++] = Static84.method1661(local220).method6216(); + intStack[isp++] = Static84.getServerActiveProperties(local220).getTargetMask(); return; } if (arg0 == 1801) { - local21 = anIntArray578[--anInt7142]; + local21 = intStack[--isp]; local21--; - if (local220.aStringArray17 != null && local21 < local220.aStringArray17.length && local220.aStringArray17[local21] != null) { - aStringArray37[anInt7139++] = local220.aStringArray17[local21]; + if (local220.ops != null && local21 < local220.ops.length && local220.ops[local21] != null) { + stringStack[ssp++] = local220.ops[local21]; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 1802) { - if (local220.aString41 == null) { - aStringArray37[anInt7139++] = ""; + if (local220.optionBase == null) { + stringStack[ssp++] = ""; return; } - aStringArray37[anInt7139++] = local220.aString41; + stringStack[ssp++] = local220.optionBase; return; } } else if (arg0 < 2000 || arg0 >= 2900 && arg0 < 3000) { if (arg0 >= 2000) { - local220 = Static145.method2412(anIntArray578[--anInt7142]); + local220 = Static145.getComponent(intStack[--isp]); arg0 -= 1000; } else { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; } if (anInt7153 >= 10) { throw new RuntimeException("C29xx-1"); } if (arg0 == 1927) { - if (local220.anObjectArray19 == null) { + if (local220.onResize == null) { return; } @Pc(4169) Linkable_Sub42 local4169 = new Linkable_Sub42(); local4169.aComponent14 = local220; - local4169.anObjectArray36 = local220.anObjectArray19; + local4169.anObjectArray36 = local220.onResize; local4169.anInt7220 = anInt7153 + 1; - Static521.aLinkedList44.addTail(local4169); + Static521.lowPriorityRequests.addTail(local4169); return; } } else if (arg0 < 2600) { - local220 = Static145.method2412(anIntArray578[--anInt7142]); + local220 = Static145.getComponent(intStack[--isp]); if (arg0 == 2500) { - anIntArray578[anInt7142++] = local220.anInt3735; + intStack[isp++] = local220.x; return; } if (arg0 == 2501) { - anIntArray578[anInt7142++] = local220.anInt3784; + intStack[isp++] = local220.y; return; } if (arg0 == 2502) { - anIntArray578[anInt7142++] = local220.anInt3802; + intStack[isp++] = local220.width; return; } if (arg0 == 2503) { - anIntArray578[anInt7142++] = local220.anInt3746; + intStack[isp++] = local220.height; return; } if (arg0 == 2504) { - anIntArray578[anInt7142++] = local220.aBoolean284 ? 1 : 0; + intStack[isp++] = local220.hidden ? 1 : 0; return; } if (arg0 == 2505) { - anIntArray578[anInt7142++] = local220.anInt3743; + intStack[isp++] = local220.overlayer; return; } if (arg0 == 2506) { local248 = Static556.method7299(local220); - anIntArray578[anInt7142++] = local248 == null ? -1 : local248.anInt3812; + intStack[isp++] = local248 == null ? -1 : local248.id; return; } if (arg0 == 2507) { - anIntArray578[anInt7142++] = local220.anInt3779; + intStack[isp++] = local220.color; return; } } else if (arg0 < 2700) { - local220 = Static145.method2412(anIntArray578[--anInt7142]); + local220 = Static145.getComponent(intStack[--isp]); if (arg0 == 2600) { - anIntArray578[anInt7142++] = local220.anInt3809; + intStack[isp++] = local220.scrollX; return; } if (arg0 == 2601) { - anIntArray578[anInt7142++] = local220.anInt3768; + intStack[isp++] = local220.scrollY; return; } if (arg0 == 2602) { - aStringArray37[anInt7139++] = local220.aString44; + stringStack[ssp++] = local220.text; return; } if (arg0 == 2603) { - anIntArray578[anInt7142++] = local220.anInt3769; + intStack[isp++] = local220.scrollMaxH; return; } if (arg0 == 2604) { - anIntArray578[anInt7142++] = local220.anInt3742; + intStack[isp++] = local220.scrollMaxV; return; } if (arg0 == 2605) { - anIntArray578[anInt7142++] = local220.anInt3793; + intStack[isp++] = local220.modelZoom; return; } if (arg0 == 2606) { - anIntArray578[anInt7142++] = local220.anInt3807; + intStack[isp++] = local220.modelXAngle; return; } if (arg0 == 2607) { - anIntArray578[anInt7142++] = local220.anInt3737; + intStack[isp++] = local220.modelYOffset; return; } if (arg0 == 2608) { - anIntArray578[anInt7142++] = local220.anInt3811; + intStack[isp++] = local220.modelYAngle; return; } if (arg0 == 2609) { - anIntArray578[anInt7142++] = local220.anInt3780; + intStack[isp++] = local220.alpha; return; } if (arg0 == 2610) { - anIntArray578[anInt7142++] = local220.anInt3736; + intStack[isp++] = local220.modelXOffset; return; } if (arg0 == 2611) { - anIntArray578[anInt7142++] = local220.anInt3804; + intStack[isp++] = local220.modelZOffset; return; } if (arg0 == 2612) { - anIntArray578[anInt7142++] = local220.anInt3810; + intStack[isp++] = local220.spriteId; return; } if (arg0 == 2613) { - anIntArray578[anInt7142++] = local220.anInt3765; + intStack[isp++] = local220.angle2d; return; } if (arg0 == 2614) { - anIntArray578[anInt7142++] = local220.anInt3823 == 1 ? local220.anInt3831 : -1; + intStack[isp++] = local220.modelType == 1 ? local220.modelId : -1; return; } if (arg0 == 2617) { - anIntArray578[anInt7142++] = local220.anInt3781; + intStack[isp++] = local220.font; return; } } else { @@ -1317,79 +1317,79 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean @Pc(4653) SubInterface local4653; if (arg0 < 2800) { if (arg0 == 2700) { - local220 = Static145.method2412(anIntArray578[--anInt7142]); - anIntArray578[anInt7142++] = local220.anInt3760; + local220 = Static145.getComponent(intStack[--isp]); + intStack[isp++] = local220.objId; return; } if (arg0 == 2701) { - local220 = Static145.method2412(anIntArray578[--anInt7142]); - if (local220.anInt3760 != -1) { - anIntArray578[anInt7142++] = local220.anInt3817; + local220 = Static145.getComponent(intStack[--isp]); + if (local220.objId != -1) { + intStack[isp++] = local220.objCount; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 2702) { - local15 = anIntArray578[--anInt7142]; - local4653 = (SubInterface) Static548.aHashTable40.get((long) local15); + local15 = intStack[--isp]; + local4653 = (SubInterface) Static548.openInterfaces.get((long) local15); if (local4653 != null) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 2703) { - local220 = Static145.method2412(anIntArray578[--anInt7142]); - if (local220.aComponentArray2 == null) { - anIntArray578[anInt7142++] = 0; + local220 = Static145.getComponent(intStack[--isp]); + if (local220.createdComponents == null) { + intStack[isp++] = 0; return; } - local21 = local220.aComponentArray2.length; - for (local27 = 0; local27 < local220.aComponentArray2.length; local27++) { - if (local220.aComponentArray2[local27] == null) { + local21 = local220.createdComponents.length; + for (local27 = 0; local27 < local220.createdComponents.length; local27++) { + if (local220.createdComponents[local27] == null) { local21 = local27; break; } } - anIntArray578[anInt7142++] = local21; + intStack[isp++] = local21; return; } if (arg0 == 2704 || arg0 == 2705) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local4760 = (SubInterface) Static548.aHashTable40.get((long) local15); - if (local4760 != null && local4760.anInt147 == local21) { - anIntArray578[anInt7142++] = 1; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local4760 = (SubInterface) Static548.openInterfaces.get((long) local15); + if (local4760 != null && local4760.interfaceId == local21) { + intStack[isp++] = 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } } else if (arg0 < 2900) { - local220 = Static145.method2412(anIntArray578[--anInt7142]); + local220 = Static145.getComponent(intStack[--isp]); if (arg0 == 2800) { - anIntArray578[anInt7142++] = Static84.method1661(local220).method6216(); + intStack[isp++] = Static84.getServerActiveProperties(local220).getTargetMask(); return; } if (arg0 == 2801) { - local21 = anIntArray578[--anInt7142]; + local21 = intStack[--isp]; local21--; - if (local220.aStringArray17 != null && local21 < local220.aStringArray17.length && local220.aStringArray17[local21] != null) { - aStringArray37[anInt7139++] = local220.aStringArray17[local21]; + if (local220.ops != null && local21 < local220.ops.length && local220.ops[local21] != null) { + stringStack[ssp++] = local220.ops[local21]; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 2802) { - if (local220.aString41 == null) { - aStringArray37[anInt7139++] = ""; + if (local220.optionBase == null) { + stringStack[ssp++] = ""; return; } - aStringArray37[anInt7139++] = local220.aString41; + stringStack[ssp++] = local220.optionBase; return; } } else { @@ -1397,124 +1397,124 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean @Pc(4911) String local4911; if (arg0 < 3200) { if (arg0 == 3100) { - local4911 = aStringArray37[--anInt7139]; - Static695.method9265(local4911); + local4911 = stringStack[--ssp]; + Static695.add(local4911); return; } if (arg0 == 3101) { - anInt7142 -= 2; - Static550.method7260(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2, anIntArray578[anInt7142 + 1], anIntArray578[anInt7142]); + isp -= 2; + Static550.animate(Static556.self, intStack[isp + 1], intStack[isp]); return; } if (arg0 == 3103) { - Static77.method1557(); + Static77.closeWidget(); return; } if (arg0 == 3104) { - local4911 = aStringArray37[--anInt7139]; + local4911 = stringStack[--ssp]; local21 = 0; if (Static467.method6350(local4911)) { local21 = Static647.method8473(local4911); } - @Pc(4974) OutboundPacket local4974 = OutboundPacket.create(Static330.aClientProt66, Connection.gameConnection.random); + @Pc(4974) OutboundPacket local4974 = OutboundPacket.create(Static330.RESUME_P_COUNTDIALOG, Connection.gameConnection.random); local4974.buffer.p4(local21); Connection.gameConnection.queue(local4974); return; } if (arg0 == 3105) { - local4911 = aStringArray37[--anInt7139]; - local5005 = OutboundPacket.create(Static276.aClientProt56, Connection.gameConnection.random); + local4911 = stringStack[--ssp]; + local5005 = OutboundPacket.create(Static276.RESUME_P_NAMEDIALOG, Connection.gameConnection.random); local5005.buffer.p1(local4911.length() + 1); local5005.buffer.pjstr(local4911); Connection.gameConnection.queue(local5005); return; } if (arg0 == 3106) { - local4911 = aStringArray37[--anInt7139]; - local5005 = OutboundPacket.create(Static137.aClientProt28, Connection.gameConnection.random); + local4911 = stringStack[--ssp]; + local5005 = OutboundPacket.create(Static137.RESUME_P_STRINGDIALOG, Connection.gameConnection.random); local5005.buffer.p1(local4911.length() + 1); local5005.buffer.pjstr(local4911); Connection.gameConnection.queue(local5005); return; } if (arg0 == 3107) { - local15 = anIntArray578[--anInt7142]; - local1394 = aStringArray37[--anInt7139]; - Static242.method3504(local1394, local15); + local15 = intStack[--isp]; + local1394 = stringStack[--ssp]; + Static242.clickPlayerOption(local1394, local15); return; } if (arg0 == 3108) { - anInt7142 -= 3; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local27 = anIntArray578[anInt7142 + 2]; - local38 = Static145.method2412(local27); + isp -= 3; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local27 = intStack[isp + 2]; + local38 = Static145.getComponent(local27); Static597.method7824(local21, local38, local15); return; } if (arg0 == 3109) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local303 = arg1 ? aComponent12 : aComponent11; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local303 = arg1 ? staticActiveComponent1 : staticActiveComponent2; Static597.method7824(local21, local303, local15); return; } if (arg0 == 3110) { - local15 = anIntArray578[--anInt7142]; + local15 = intStack[--isp]; local5005 = OutboundPacket.create(Static209.aClientProt37, Connection.gameConnection.random); local5005.buffer.p2(local15); Connection.gameConnection.queue(local5005); return; } if (arg0 == 3111) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local4760 = (SubInterface) Static548.aHashTable40.get((long) local15); + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local4760 = (SubInterface) Static548.openInterfaces.get((long) local15); if (local4760 != null) { - Static449.method6115(true, local4760.anInt147 != local21, local4760); + Static449.method6115(true, local4760.interfaceId != local21, local4760); } Static163.method8850(3, local21, local15, true); return; } if (arg0 == 3112) { - anInt7142--; - local15 = anIntArray578[anInt7142]; - local4653 = (SubInterface) Static548.aHashTable40.get((long) local15); + isp--; + local15 = intStack[isp]; + local4653 = (SubInterface) Static548.openInterfaces.get((long) local15); if (local4653 != null && local4653.anInt146 == 3) { Static449.method6115(true, true, local4653); } return; } if (arg0 == 3113) { - Static57.method1231(aStringArray37[--anInt7139]); + Static57.method1231(stringStack[--ssp]); return; } if (arg0 == 3114) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local1791 = aStringArray37[--anInt7139]; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local1791 = stringStack[--ssp]; Static44.method1072(local1791, "", local21, "", "", local15); return; } if (arg0 == 3115) { - anInt7142 -= 11; + isp -= 11; @Pc(5320) Class403[] local5320 = Static33.method882(); @Pc(5323) Class103[] local5323 = Static313.method4544(); - Static124.method2216(anIntArray578[anInt7142 + 7], anIntArray578[anInt7142 + 2], anIntArray578[anInt7142 + 9], anIntArray578[anInt7142 + 4], local5323[anIntArray578[anInt7142 + 1]], anIntArray578[anInt7142 + 5], anIntArray578[anInt7142 + 8], anIntArray578[anInt7142 + 6], anIntArray578[anInt7142 + 3], local5320[anIntArray578[anInt7142]], anIntArray578[anInt7142 + 10]); + Static124.method2216(intStack[isp + 7], intStack[isp + 2], intStack[isp + 9], intStack[isp + 4], local5323[intStack[isp + 1]], intStack[isp + 5], intStack[isp + 8], intStack[isp + 6], intStack[isp + 3], local5320[intStack[isp]], intStack[isp + 10]); return; } if (arg0 == 3116) { - local15 = anIntArray578[--anInt7142]; + local15 = intStack[--isp]; local5005 = OutboundPacket.create(Static436.aClientProt44, Connection.gameConnection.random); local5005.buffer.p2(local15); Connection.gameConnection.queue(local5005); return; } if (arg0 == 3117) { - local4911 = aStringArray37[--anInt7139]; + local4911 = stringStack[--ssp]; local5005 = OutboundPacket.create(Static357.aClientProt82, Connection.gameConnection.random); local5005.buffer.p1(local4911.length() + 1); local5005.buffer.pjstr(local4911); @@ -1523,303 +1523,303 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } } else if (arg0 < 3300) { if (arg0 == 3200) { - anInt7142 -= 3; - Static161.method2586(256, anIntArray578[anInt7142 + 2], anIntArray578[anInt7142], anIntArray578[anInt7142 + 1], 255); + isp -= 3; + Static161.play(256, intStack[isp + 2], intStack[isp], intStack[isp + 1], 255); return; } if (arg0 == 3201) { - Static63.method1427(255, anIntArray578[--anInt7142], 50); + Static63.playSong(255, intStack[--isp], 50); return; } if (arg0 == 3202) { - anInt7142 -= 2; - Static482.method6481(255, anIntArray578[anInt7142], anIntArray578[anInt7142 + 1]); + isp -= 2; + Static482.playJingle(255, intStack[isp], intStack[isp + 1]); return; } if (arg0 == 3203) { - anInt7142 -= 4; - Static161.method2586(256, anIntArray578[anInt7142 + 2], anIntArray578[anInt7142], anIntArray578[anInt7142 + 1], anIntArray578[anInt7142 + 3]); + isp -= 4; + Static161.play(256, intStack[isp + 2], intStack[isp], intStack[isp + 1], intStack[isp + 3]); return; } if (arg0 == 3204) { - anInt7142 -= 3; - Static63.method1427(anIntArray578[anInt7142 + 1], anIntArray578[anInt7142], anIntArray578[anInt7142 + 2]); + isp -= 3; + Static63.playSong(intStack[isp + 1], intStack[isp], intStack[isp + 2]); return; } if (arg0 == 3205) { - anInt7142 -= 3; - Static482.method6481(anIntArray578[anInt7142 + 2], anIntArray578[anInt7142], anIntArray578[anInt7142 + 1]); + isp -= 3; + Static482.playJingle(intStack[isp + 2], intStack[isp], intStack[isp + 1]); return; } if (arg0 == 3206) { - anInt7142 -= 4; - Static186.method2818(anIntArray578[anInt7142], anIntArray578[anInt7142 + 1], 256, anIntArray578[anInt7142 + 2], anIntArray578[anInt7142 + 3], false); + isp -= 4; + Static186.method2818(intStack[isp], intStack[isp + 1], 256, intStack[isp + 2], intStack[isp + 3], false); return; } if (arg0 == 3207) { - anInt7142 -= 4; - Static186.method2818(anIntArray578[anInt7142], anIntArray578[anInt7142 + 1], 256, anIntArray578[anInt7142 + 2], anIntArray578[anInt7142 + 3], true); + isp -= 4; + Static186.method2818(intStack[isp], intStack[isp + 1], 256, intStack[isp + 2], intStack[isp + 3], true); return; } if (arg0 == 3208) { - anInt7142 -= 5; - Static161.method2586(anIntArray578[anInt7142 + 4], anIntArray578[anInt7142 + 2], anIntArray578[anInt7142], anIntArray578[anInt7142 + 1], anIntArray578[anInt7142 + 3]); + isp -= 5; + Static161.play(intStack[isp + 4], intStack[isp + 2], intStack[isp], intStack[isp + 1], intStack[isp + 3]); return; } if (arg0 == 3209) { - anInt7142 -= 5; - Static186.method2818(anIntArray578[anInt7142], anIntArray578[anInt7142 + 1], anIntArray578[anInt7142 + 4], anIntArray578[anInt7142 + 2], anIntArray578[anInt7142 + 3], false); + isp -= 5; + Static186.method2818(intStack[isp], intStack[isp + 1], intStack[isp + 4], intStack[isp + 2], intStack[isp + 3], false); return; } } else if (arg0 < 3400) { if (arg0 == 3300) { - anIntArray578[anInt7142++] = Static333.anInt5455; + intStack[isp++] = Static333.loop; return; } if (arg0 == 3301) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static597.method7822(local15, local21, false); + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = Static597.getItemType(local15, local21, false); return; } if (arg0 == 3302) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static536.method7169(local21, false, local15); + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = Static536.getItemCount(local21, false, local15); return; } if (arg0 == 3303) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static67.method6099(local21, local15, false); + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = Static67.getSlotTotal(local21, local15, false); return; } if (arg0 == 3304) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static503.aInvTypeList1.method7657(local15).size; + local15 = intStack[--isp]; + intStack[isp++] = Static503.aInvTypeList1.get(local15).size; return; } if (arg0 == 3305) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static581.anIntArray688[local15]; + local15 = intStack[--isp]; + intStack[isp++] = Static581.boostedLevels[local15]; return; } if (arg0 == 3306) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static498.anIntArray604[local15]; + local15 = intStack[--isp]; + intStack[isp++] = Static498.baseLevels[local15]; return; } if (arg0 == 3307) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static237.anIntArray518[local15]; + local15 = intStack[--isp]; + intStack[isp++] = Static237.experience[local15]; return; } if (arg0 == 3308) { - @Pc(5929) byte local5929 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144; - local21 = (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 >> 9) + Static691.anInt10367; - local27 = (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 >> 9) + Static116.anInt2270; - anIntArray578[anInt7142++] = (local5929 << 28) + (local21 << 14) + local27; + @Pc(5929) byte local5929 = Static556.self.plane; + local21 = (Static556.self.xFine >> 9) + Static691.originX; + local27 = (Static556.self.zFine >> 9) + Static116.originZ; + intStack[isp++] = (local5929 << 28) + (local21 << 14) + local27; return; } if (arg0 == 3309) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = local15 >> 14 & 0x3FFF; + local15 = intStack[--isp]; + intStack[isp++] = local15 >> 14 & 0x3FFF; return; } if (arg0 == 3310) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = local15 >> 28; + local15 = intStack[--isp]; + intStack[isp++] = local15 >> 28; return; } if (arg0 == 3311) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = local15 & 0x3FFF; + local15 = intStack[--isp]; + intStack[isp++] = local15 & 0x3FFF; return; } if (arg0 == 3312) { - anIntArray578[anInt7142++] = Static174.aBoolean249 ? 1 : 0; + intStack[isp++] = Static174.mapMembers ? 1 : 0; return; } if (arg0 == 3313) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static597.method7822(local15, local21, true); + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = Static597.getItemType(local15, local21, true); return; } if (arg0 == 3314) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static536.method7169(local21, true, local15); + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = Static536.getItemCount(local21, true, local15); return; } if (arg0 == 3315) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static67.method6099(local21, local15, true); + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = Static67.getSlotTotal(local21, local15, true); return; } if (arg0 == 3316) { - if (Static608.anInt9290 >= 2) { - anIntArray578[anInt7142++] = Static608.anInt9290; + if (Static608.staffModLevel >= 2) { + intStack[isp++] = Static608.staffModLevel; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3317) { - anIntArray578[anInt7142++] = Static249.anInt4008; + intStack[isp++] = Static249.rebootTimer; return; } if (arg0 == 3318) { - anIntArray578[anInt7142++] = Static344.aClass229_1.worldId; + intStack[isp++] = Static344.aClass229_1.worldId; return; } if (arg0 == 3321) { - anIntArray578[anInt7142++] = Static703.anInt10571; + intStack[isp++] = Static703.runEnergy; return; } if (arg0 == 3322) { - anIntArray578[anInt7142++] = Static494.anInt7404; + intStack[isp++] = Static494.weight; return; } if (arg0 == 3323) { - if (Static38.anInt928 >= 5 && Static38.anInt928 <= 9) { - anIntArray578[anInt7142++] = 1; + if (Static38.blackmarks >= 5 && Static38.blackmarks <= 9) { + intStack[isp++] = 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3324) { - if (Static38.anInt928 >= 5 && Static38.anInt928 <= 9) { - anIntArray578[anInt7142++] = Static38.anInt928; + if (Static38.blackmarks >= 5 && Static38.blackmarks <= 9) { + intStack[isp++] = Static38.blackmarks; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3325) { - anIntArray578[anInt7142++] = Static126.aBoolean200 ? 1 : 0; + intStack[isp++] = Static126.playerMember ? 1 : 0; return; } if (arg0 == 3326) { - anIntArray578[anInt7142++] = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.combatLevel2; + intStack[isp++] = Static556.self.combatLevel2; return; } if (arg0 == 3327) { - anIntArray578[anInt7142++] = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 != null && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1.aBoolean385 ? 1 : 0; + intStack[isp++] = Static556.self.aPlayerAppearance1 != null && Static556.self.aPlayerAppearance1.gender ? 1 : 0; return; } if (arg0 == 3329) { - anIntArray578[anInt7142++] = Static617.aBoolean724 ? 1 : 0; + intStack[isp++] = Static617.mapQuickChat ? 1 : 0; return; } if (arg0 == 3330) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static46.method1082(local15); + local15 = intStack[--isp]; + intStack[isp++] = Static46.getFreeSpace(local15); return; } if (arg0 == 3331) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static390.method5494(false, local21, local15); + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = Static390.getTotalParam(false, local21, local15); return; } if (arg0 == 3332) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static390.method5494(true, local21, local15); + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = Static390.getTotalParam(true, local21, local15); return; } if (arg0 == 3333) { - anIntArray578[anInt7142++] = Static696.method9034(); + intStack[isp++] = Static696.method9034(); return; } if (arg0 == 3335) { - anIntArray578[anInt7142++] = Static51.clientLanguageId; + intStack[isp++] = Static51.clientLanguageId; return; } if (arg0 == 3336) { - anInt7142 -= 4; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local27 = anIntArray578[anInt7142 + 2]; - local506 = anIntArray578[anInt7142 + 3]; + isp -= 4; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local27 = intStack[isp + 2]; + local506 = intStack[isp + 3]; local15 += local21 << 14; local15 += local27 << 28; local15 += local506; - anIntArray578[anInt7142++] = local15; + intStack[isp++] = local15; return; } if (arg0 == 3337) { - anIntArray578[anInt7142++] = Static323.anInt5121; + intStack[isp++] = Static323.affiliate; return; } if (arg0 == 3338) { - anIntArray578[anInt7142++] = Static65.method1470(); + intStack[isp++] = Static65.method1470(); return; } if (arg0 == 3339) { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3340) { - anIntArray578[anInt7142++] = Static91.aBoolean750 ? 1 : 0; + intStack[isp++] = Static91.aBoolean750 ? 1 : 0; return; } if (arg0 == 3341) { - anIntArray578[anInt7142++] = Static29.aBoolean61 ? 1 : 0; + intStack[isp++] = Static29.aBoolean61 ? 1 : 0; return; } if (arg0 == 3342) { - anIntArray578[anInt7142++] = Static189.aMouse1.method8853(); + intStack[isp++] = Static189.aMouse1.method8853(); return; } if (arg0 == 3343) { - anIntArray578[anInt7142++] = Static189.aMouse1.method8854(); + intStack[isp++] = Static189.aMouse1.method8854(); return; } if (arg0 == 3344) { - aStringArray37[anInt7139++] = Static130.method2281(); + stringStack[ssp++] = Static130.method2281(); return; } if (arg0 == 3345) { - aStringArray37[anInt7139++] = Static690.method8998(); + stringStack[ssp++] = Static690.method8998(); return; } if (arg0 == 3346) { - anIntArray578[anInt7142++] = Static338.method4995(); + intStack[isp++] = Static338.method4995(); return; } if (arg0 == 3347) { - anIntArray578[anInt7142++] = Static470.anInt7112; + intStack[isp++] = Static470.anInt7112; return; } if (arg0 == 3349) { - anIntArray578[anInt7142++] = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aClass126_7.method2673(16383) >> 3; + intStack[isp++] = Static556.self.aClass126_7.method2673(16383) >> 3; return; } if (arg0 == 3350) { - local4911 = aStringArray37[--anInt7139]; + local4911 = stringStack[--ssp]; if (Static416.aString71 != null && Static416.aString71.equalsIgnoreCase(local4911)) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3351) { - anIntArray578[anInt7142++] = Static189.aMouse1.method8842() ? 1 : 0; - anIntArray578[anInt7142++] = Static189.aMouse1.method8847() ? 1 : 0; - anIntArray578[anInt7142++] = Static189.aMouse1.method8843() ? 1 : 0; + intStack[isp++] = Static189.aMouse1.method8842() ? 1 : 0; + intStack[isp++] = Static189.aMouse1.method8847() ? 1 : 0; + intStack[isp++] = Static189.aMouse1.method8843() ? 1 : 0; return; } } else { @@ -1827,76 +1827,76 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean if (arg0 < 3500) { @Pc(6822) EnumType local6822; if (arg0 == 3400) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local6822 = Static619.aEnumTypeList2.method8925(local15); - aStringArray37[anInt7139++] = local6822.method1229(local21); + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local6822 = Static619.aEnumTypeList2.get(local15); + stringStack[ssp++] = local6822.getString(local21); return; } @Pc(6868) EnumType local6868; if (arg0 == 3408) { - anInt7142 -= 4; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local27 = anIntArray578[anInt7142 + 2]; - local506 = anIntArray578[anInt7142 + 3]; - local6868 = Static619.aEnumTypeList2.method8925(local27); - if (local6868.aChar2 == local15 && local6868.aChar1 == local21) { + isp -= 4; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local27 = intStack[isp + 2]; + local506 = intStack[isp + 3]; + local6868 = Static619.aEnumTypeList2.get(local27); + if (local6868.aChar2 == local15 && local6868.valueType == local21) { if (local21 == 115) { - aStringArray37[anInt7139++] = local6868.method1229(local506); + stringStack[ssp++] = local6868.getString(local506); return; } - anIntArray578[anInt7142++] = local6868.method1227(local506); + intStack[isp++] = local6868.getInt(local506); return; } throw new RuntimeException("C3408-1 " + local27 + "-" + local506); } @Pc(6963) EnumType local6963; if (arg0 == 3409) { - anInt7142 -= 3; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local27 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local27 = intStack[isp + 2]; if (local21 == -1) { throw new RuntimeException("C3409-2"); } - local6963 = Static619.aEnumTypeList2.method8925(local21); - if (local6963.aChar1 != local15) { + local6963 = Static619.aEnumTypeList2.get(local21); + if (local6963.valueType != local15) { throw new RuntimeException("C3409-1"); } - anIntArray578[anInt7142++] = local6963.method1233(local27) ? 1 : 0; + intStack[isp++] = local6963.containsValue(local27) ? 1 : 0; return; } if (arg0 == 3410) { - local15 = anIntArray578[--anInt7142]; - local1394 = aStringArray37[--anInt7139]; + local15 = intStack[--isp]; + local1394 = stringStack[--ssp]; if (local15 == -1) { throw new RuntimeException("C3410-2"); } - local6822 = Static619.aEnumTypeList2.method8925(local15); - if (local6822.aChar1 != 's') { + local6822 = Static619.aEnumTypeList2.get(local15); + if (local6822.valueType != 's') { throw new RuntimeException("C3410-1"); } - anIntArray578[anInt7142++] = local6822.method1221(local1394) ? 1 : 0; + intStack[isp++] = local6822.containsValue(local1394) ? 1 : 0; return; } if (arg0 == 3411) { - local15 = anIntArray578[--anInt7142]; - @Pc(7072) EnumType local7072 = Static619.aEnumTypeList2.method8925(local15); - anIntArray578[anInt7142++] = local7072.method1228(); + local15 = intStack[--isp]; + @Pc(7072) EnumType local7072 = Static619.aEnumTypeList2.get(local15); + intStack[isp++] = local7072.size(); return; } if (arg0 == 3412) { - anInt7142 -= 3; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local27 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local27 = intStack[isp + 2]; if (local21 == -1) { throw new RuntimeException(); } - local6963 = Static619.aEnumTypeList2.method8925(local21); - if (local6963.aChar1 != local15) { + local6963 = Static619.aEnumTypeList2.get(local21); + if (local6963.valueType != local15) { throw new RuntimeException(); } @Pc(7133) Linkable_Sub40 local7133 = local6963.method1223(local27); @@ -1904,17 +1904,17 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean if (local7133 != null) { local72 = local7133.anIntArray531.length; } - anIntArray578[anInt7142++] = local72; + intStack[isp++] = local72; return; } if (arg0 == 3413) { - local15 = anIntArray578[--anInt7142]; - local1394 = aStringArray37[--anInt7139]; + local15 = intStack[--isp]; + local1394 = stringStack[--ssp]; if (local15 == -1) { throw new RuntimeException(); } - local6822 = Static619.aEnumTypeList2.method8925(local15); - if (local6822.aChar1 != 's') { + local6822 = Static619.aEnumTypeList2.get(local15); + if (local6822.valueType != 's') { throw new RuntimeException(); } @Pc(7196) Linkable_Sub26 local7196 = local6822.method1237(local1394); @@ -1922,843 +1922,843 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean if (local7196 != null) { local2978 = local7196.anIntArray318.length; } - anIntArray578[anInt7142++] = local2978; + intStack[isp++] = local2978; return; } if (arg0 == 3414) { - anInt7142 -= 5; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local27 = anIntArray578[anInt7142 + 2]; - local506 = anIntArray578[anInt7142 + 3]; - local2978 = anIntArray578[anInt7142 + 4]; + isp -= 5; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local27 = intStack[isp + 2]; + local506 = intStack[isp + 3]; + local2978 = intStack[isp + 4]; if (local27 == -1) { throw new RuntimeException(); } - @Pc(7261) EnumType local7261 = Static619.aEnumTypeList2.method8925(local27); + @Pc(7261) EnumType local7261 = Static619.aEnumTypeList2.get(local27); if (local7261.aChar2 != local21) { throw new RuntimeException(); } - if (local7261.aChar1 != local15) { + if (local7261.valueType != local15) { throw new RuntimeException(); } @Pc(7284) Linkable_Sub40 local7284 = local7261.method1223(local506); if (local2978 >= 0 && local7284 != null && local7284.anIntArray531.length > local2978) { - anIntArray578[anInt7142++] = local7284.anIntArray531[local2978]; + intStack[isp++] = local7284.anIntArray531[local2978]; return; } throw new RuntimeException(); } if (arg0 == 3415) { - anInt7142 -= 3; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local27 = anIntArray578[anInt7142 + 2]; - local7345 = aStringArray37[--anInt7139]; + isp -= 3; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local27 = intStack[isp + 2]; + local7345 = stringStack[--ssp]; if (local21 == -1) { throw new RuntimeException(); } - local6868 = Static619.aEnumTypeList2.method8925(local21); + local6868 = Static619.aEnumTypeList2.get(local21); if (local6868.aChar2 != local15) { throw new RuntimeException(); } - if (local6868.aChar1 != 's') { + if (local6868.valueType != 's') { throw new RuntimeException(); } @Pc(7381) Linkable_Sub26 local7381 = local6868.method1237(local7345); if (local27 >= 0 && local7381 != null && local7381.anIntArray318.length > local27) { - anIntArray578[anInt7142++] = local7381.anIntArray318[local27]; + intStack[isp++] = local7381.anIntArray318[local27]; return; } throw new RuntimeException(); } } else if (arg0 < 3700) { if (arg0 == 3600) { - if (Static251.anInt4036 == 0) { - anIntArray578[anInt7142++] = -2; + if (Static251.state == 0) { + intStack[isp++] = -2; return; } - if (Static251.anInt4036 == 1) { - anIntArray578[anInt7142++] = -1; + if (Static251.state == 1) { + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = Static327.anInt5392; + intStack[isp++] = Static327.size; return; } if (arg0 == 3601) { - local15 = anIntArray578[--anInt7142]; - if (Static251.anInt4036 == 2 && local15 < Static327.anInt5392) { - aStringArray37[anInt7139++] = Static330.aStringArray25[local15]; + local15 = intStack[--isp]; + if (Static251.state == 2 && local15 < Static327.size) { + stringStack[ssp++] = Static330.aStringArray25[local15]; if (Static572.aStringArray42[local15] != null) { - aStringArray37[anInt7139++] = Static572.aStringArray42[local15]; + stringStack[ssp++] = Static572.aStringArray42[local15]; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } - aStringArray37[anInt7139++] = ""; - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 3602) { - local15 = anIntArray578[--anInt7142]; - if (Static251.anInt4036 == 2 && local15 < Static327.anInt5392) { - anIntArray578[anInt7142++] = Static371.anIntArray455[local15]; + local15 = intStack[--isp]; + if (Static251.state == 2 && local15 < Static327.size) { + intStack[isp++] = Static371.worlds[local15]; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3603) { - local15 = anIntArray578[--anInt7142]; - if (Static251.anInt4036 == 2 && local15 < Static327.anInt5392) { - anIntArray578[anInt7142++] = Static715.anIntArray881[local15]; + local15 = intStack[--isp]; + if (Static251.state == 2 && local15 < Static327.size) { + intStack[isp++] = Static715.ranks[local15]; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3604) { - local4911 = aStringArray37[--anInt7139]; - local21 = anIntArray578[--anInt7142]; - Static430.method5819(local4911, local21); + local4911 = stringStack[--ssp]; + local21 = intStack[--isp]; + Static430.setRank(local4911, local21); return; } if (arg0 == 3605) { - local4911 = aStringArray37[--anInt7139]; - Static706.method9225(local4911); + local4911 = stringStack[--ssp]; + Static706.add(local4911); return; } if (arg0 == 3606) { - local4911 = aStringArray37[--anInt7139]; - Static545.method7242(local4911); + local4911 = stringStack[--ssp]; + Static545.remove(local4911); return; } if (arg0 == 3607) { - local4911 = aStringArray37[--anInt7139]; - Static231.method3382(false, local4911); + local4911 = stringStack[--ssp]; + Static231.add(false, local4911); return; } if (arg0 == 3608) { - local4911 = aStringArray37[--anInt7139]; - Static726.method9463(local4911); + local4911 = stringStack[--ssp]; + Static726.remove(local4911); return; } if (arg0 == 3609) { - local4911 = aStringArray37[--anInt7139]; + local4911 = stringStack[--ssp]; if (local4911.startsWith("") || local4911.startsWith("")) { local4911 = local4911.substring(7); } - anIntArray578[anInt7142++] = Static362.method5241(0, local4911) ? 1 : 0; + intStack[isp++] = Static362.method5241(0, local4911) ? 1 : 0; return; } if (arg0 == 3610) { - local15 = anIntArray578[--anInt7142]; - if (Static251.anInt4036 == 2 && local15 < Static327.anInt5392) { - aStringArray37[anInt7139++] = Static419.aStringArray33[local15]; + local15 = intStack[--isp]; + if (Static251.state == 2 && local15 < Static327.size) { + stringStack[ssp++] = Static419.worldNames[local15]; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 3611) { - if (Static723.aString129 != null) { - aStringArray37[anInt7139++] = Static682.method8923(Static723.aString129); + if (Static723.name != null) { + stringStack[ssp++] = Static682.method8923(Static723.name); return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 3612) { - if (Static723.aString129 != null) { - anIntArray578[anInt7142++] = Static706.anInt10633; + if (Static723.name != null) { + intStack[isp++] = Static706.size; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3613) { - local15 = anIntArray578[--anInt7142]; - if (Static723.aString129 != null && local15 < Static706.anInt10633) { - aStringArray37[anInt7139++] = Static87.aClass241Array1[local15].aString67; + local15 = intStack[--isp]; + if (Static723.name != null && local15 < Static706.size) { + stringStack[ssp++] = Static87.members[local15].aString67; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 3614) { - local15 = anIntArray578[--anInt7142]; - if (Static723.aString129 != null && local15 < Static706.anInt10633) { - anIntArray578[anInt7142++] = Static87.aClass241Array1[local15].anInt6148; + local15 = intStack[--isp]; + if (Static723.name != null && local15 < Static706.size) { + intStack[isp++] = Static87.members[local15].world; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3615) { - local15 = anIntArray578[--anInt7142]; - if (Static723.aString129 != null && local15 < Static706.anInt10633) { - anIntArray578[anInt7142++] = Static87.aClass241Array1[local15].aByte99; + local15 = intStack[--isp]; + if (Static723.name != null && local15 < Static706.size) { + intStack[isp++] = Static87.members[local15].rank; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3616) { - anIntArray578[anInt7142++] = Static673.aByte140; + intStack[isp++] = Static673.minKick; return; } if (arg0 == 3617) { - local4911 = aStringArray37[--anInt7139]; - Static128.method7754(local4911); + local4911 = stringStack[--ssp]; + Static128.kick(local4911); return; } if (arg0 == 3618) { - anIntArray578[anInt7142++] = Static682.aByte142; + intStack[isp++] = Static682.rank; return; } if (arg0 == 3619) { - local4911 = aStringArray37[--anInt7139]; - Static698.method9124(local4911); + local4911 = stringStack[--ssp]; + Static698.join(local4911); return; } if (arg0 == 3620) { - Static396.method5551(); + Static396.leave(); return; } if (arg0 == 3621) { - if (Static251.anInt4036 == 0) { - anIntArray578[anInt7142++] = -1; + if (Static251.state == 0) { + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = Static436.anInt3849; + intStack[isp++] = Static436.size; return; } if (arg0 == 3622) { - local15 = anIntArray578[--anInt7142]; - if (Static251.anInt4036 != 0 && local15 < Static436.anInt3849) { - aStringArray37[anInt7139++] = Static632.aStringArray44[local15]; + local15 = intStack[--isp]; + if (Static251.state != 0 && local15 < Static436.size) { + stringStack[ssp++] = Static632.aStringArray44[local15]; if (Static10.aStringArray1[local15] != null) { - aStringArray37[anInt7139++] = Static10.aStringArray1[local15]; + stringStack[ssp++] = Static10.aStringArray1[local15]; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } - aStringArray37[anInt7139++] = ""; - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 3623) { - local4911 = aStringArray37[--anInt7139]; + local4911 = stringStack[--ssp]; if (local4911.startsWith("") || local4911.startsWith("")) { local4911 = local4911.substring(7); } - anIntArray578[anInt7142++] = Static71.method1524(local4911) ? 1 : 0; + intStack[isp++] = Static71.method1524(local4911) ? 1 : 0; return; } if (arg0 == 3624) { - local15 = anIntArray578[--anInt7142]; - if (Static87.aClass241Array1 != null && local15 < Static706.anInt10633 && Static87.aClass241Array1[local15].aString66.equalsIgnoreCase(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2)) { - anIntArray578[anInt7142++] = 1; + local15 = intStack[--isp]; + if (Static87.members != null && local15 < Static706.size && Static87.members[local15].username.equalsIgnoreCase(Static556.self.username)) { + intStack[isp++] = 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3625) { - if (Static158.aString28 != null) { - aStringArray37[anInt7139++] = Static158.aString28; + if (Static158.owner != null) { + stringStack[ssp++] = Static158.owner; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 3626) { - local15 = anIntArray578[--anInt7142]; - if (Static723.aString129 != null && local15 < Static706.anInt10633) { - aStringArray37[anInt7139++] = Static87.aClass241Array1[local15].aString65; + local15 = intStack[--isp]; + if (Static723.name != null && local15 < Static706.size) { + stringStack[ssp++] = Static87.members[local15].worldName; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 3627) { - local15 = anIntArray578[--anInt7142]; - if (Static251.anInt4036 == 2 && local15 >= 0 && local15 < Static327.anInt5392) { - anIntArray578[anInt7142++] = Static623.aBooleanArray30[local15] ? 1 : 0; + local15 = intStack[--isp]; + if (Static251.state == 2 && local15 >= 0 && local15 < Static327.size) { + intStack[isp++] = Static623.aBooleanArray30[local15] ? 1 : 0; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3628) { - local4911 = aStringArray37[--anInt7139]; + local4911 = stringStack[--ssp]; if (local4911.startsWith("") || local4911.startsWith("")) { local4911 = local4911.substring(7); } - anIntArray578[anInt7142++] = Static664.method8658(local4911); + intStack[isp++] = Static664.method8658(local4911); return; } if (arg0 == 3629) { - anIntArray578[anInt7142++] = Static584.anInt8634; + intStack[isp++] = Static584.country; return; } if (arg0 == 3630) { - local4911 = aStringArray37[--anInt7139]; - Static231.method3382(true, local4911); + local4911 = stringStack[--ssp]; + Static231.add(true, local4911); return; } if (arg0 == 3631) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static65.aBooleanArray2[local15] ? 1 : 0; + local15 = intStack[--isp]; + intStack[isp++] = Static65.aBooleanArray2[local15] ? 1 : 0; return; } if (arg0 == 3632) { - local15 = anIntArray578[--anInt7142]; - if (Static723.aString129 != null && local15 < Static706.anInt10633) { - aStringArray37[anInt7139++] = Static87.aClass241Array1[local15].aString66; + local15 = intStack[--isp]; + if (Static723.name != null && local15 < Static706.size) { + stringStack[ssp++] = Static87.members[local15].username; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 3633) { - local15 = anIntArray578[--anInt7142]; - if (Static251.anInt4036 != 0 && local15 < Static436.anInt3849) { - aStringArray37[anInt7139++] = Static446.aStringArray35[local15]; + local15 = intStack[--isp]; + if (Static251.state != 0 && local15 < Static436.size) { + stringStack[ssp++] = Static446.aStringArray35[local15]; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 3634) { - local15 = anIntArray578[--anInt7142]; - if (Static251.anInt4036 == 2 && local15 < Static327.anInt5392) { - anIntArray578[anInt7142++] = Static429.aBooleanArray21[local15] ? 1 : 0; + local15 = intStack[--isp]; + if (Static251.state == 2 && local15 < Static327.size) { + intStack[isp++] = Static429.aBooleanArray21[local15] ? 1 : 0; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } } else if (arg0 < 3800) { if (arg0 == 3700) { if (Static91.aClass164_9 != null) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; aClass164_7 = Static91.aClass164_9; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3701) { if (Static128.aClass164_8 != null) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; aClass164_7 = Static128.aClass164_8; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3702) { - aStringArray37[anInt7139++] = aClass164_7.aString45; + stringStack[ssp++] = aClass164_7.aString45; return; } if (arg0 == 3703) { - anIntArray578[anInt7142++] = aClass164_7.aBoolean307 ? 1 : 0; + intStack[isp++] = aClass164_7.aBoolean307 ? 1 : 0; return; } if (arg0 == 3704) { - anIntArray578[anInt7142++] = aClass164_7.aByte68; + intStack[isp++] = aClass164_7.aByte68; return; } if (arg0 == 3705) { - anIntArray578[anInt7142++] = aClass164_7.aByte67; + intStack[isp++] = aClass164_7.aByte67; return; } if (arg0 == 3706) { - anIntArray578[anInt7142++] = aClass164_7.aByte66; + intStack[isp++] = aClass164_7.aByte66; return; } if (arg0 == 3707) { - anIntArray578[anInt7142++] = aClass164_7.aByte65; + intStack[isp++] = aClass164_7.aByte65; return; } if (arg0 == 3709) { - anIntArray578[anInt7142++] = aClass164_7.anInt3939; + intStack[isp++] = aClass164_7.anInt3939; return; } if (arg0 == 3710) { - local15 = anIntArray578[--anInt7142]; - aStringArray37[anInt7139++] = aClass164_7.aStringArray18[local15]; + local15 = intStack[--isp]; + stringStack[ssp++] = aClass164_7.aStringArray18[local15]; return; } if (arg0 == 3711) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = aClass164_7.aByteArray40[local15]; + local15 = intStack[--isp]; + intStack[isp++] = aClass164_7.aByteArray40[local15]; return; } if (arg0 == 3712) { - anIntArray578[anInt7142++] = aClass164_7.anInt3941; + intStack[isp++] = aClass164_7.anInt3941; return; } if (arg0 == 3713) { - local15 = anIntArray578[--anInt7142]; - aStringArray37[anInt7139++] = aClass164_7.aStringArray19[local15]; + local15 = intStack[--isp]; + stringStack[ssp++] = aClass164_7.aStringArray19[local15]; return; } if (arg0 == 3714) { - anInt7142 -= 3; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local27 = anIntArray578[anInt7142 + 2]; - anIntArray578[anInt7142++] = aClass164_7.method3497(local21, local27, local15); + isp -= 3; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local27 = intStack[isp + 2]; + intStack[isp++] = aClass164_7.method3497(local21, local27, local15); return; } if (arg0 == 3715) { - anIntArray578[anInt7142++] = aClass164_7.anInt3956; + intStack[isp++] = aClass164_7.anInt3956; return; } if (arg0 == 3716) { - anIntArray578[anInt7142++] = aClass164_7.anInt3947; + intStack[isp++] = aClass164_7.anInt3947; return; } if (arg0 == 3717) { - anIntArray578[anInt7142++] = aClass164_7.method3479(aStringArray37[--anInt7139]); + intStack[isp++] = aClass164_7.method3479(stringStack[--ssp]); return; } if (arg0 == 3718) { - anIntArray578[anInt7142 - 1] = aClass164_7.method3487()[anIntArray578[anInt7142 - 1]]; + intStack[isp - 1] = aClass164_7.method3487()[intStack[isp - 1]]; return; } if (arg0 == 3719) { - Static180.method2775(anIntArray578[--anInt7142]); + Static180.method2775(intStack[--isp]); return; } if (arg0 == 3720) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = aClass164_7.anIntArray308[local15]; + local15 = intStack[--isp]; + intStack[isp++] = aClass164_7.anIntArray308[local15]; return; } if (arg0 == 3750) { if (Static674.aClass2_Sub47_3 != null) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; aClass2_Sub47_2 = Static674.aClass2_Sub47_3; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3751) { if (Static45.aClass2_Sub47_1 != null) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; aClass2_Sub47_2 = Static45.aClass2_Sub47_1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 3752) { - aStringArray37[anInt7139++] = aClass2_Sub47_2.aString101; + stringStack[ssp++] = aClass2_Sub47_2.aString101; return; } if (arg0 == 3753) { - anIntArray578[anInt7142++] = aClass2_Sub47_2.aByte127; + intStack[isp++] = aClass2_Sub47_2.aByte127; return; } if (arg0 == 3754) { - anIntArray578[anInt7142++] = aClass2_Sub47_2.aByte128; + intStack[isp++] = aClass2_Sub47_2.aByte128; return; } if (arg0 == 3755) { - anIntArray578[anInt7142++] = aClass2_Sub47_2.anInt8286; + intStack[isp++] = aClass2_Sub47_2.anInt8286; return; } if (arg0 == 3756) { - local15 = anIntArray578[--anInt7142]; - aStringArray37[anInt7139++] = aClass2_Sub47_2.aClass34Array1[local15].aString2; + local15 = intStack[--isp]; + stringStack[ssp++] = aClass2_Sub47_2.aClass34Array1[local15].aString2; return; } if (arg0 == 3757) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = aClass2_Sub47_2.aClass34Array1[local15].aByte9; + local15 = intStack[--isp]; + intStack[isp++] = aClass2_Sub47_2.aClass34Array1[local15].aByte9; return; } if (arg0 == 3758) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = aClass2_Sub47_2.aClass34Array1[local15].anInt783; + local15 = intStack[--isp]; + intStack[isp++] = aClass2_Sub47_2.aClass34Array1[local15].anInt783; return; } if (arg0 == 3759) { - local15 = anIntArray578[--anInt7142]; + local15 = intStack[--isp]; Static525.method7886(aClass2_Sub47_2 == Static45.aClass2_Sub47_1, local15); return; } if (arg0 == 3760) { - anIntArray578[anInt7142++] = aClass2_Sub47_2.method7278(aStringArray37[--anInt7139]); + intStack[isp++] = aClass2_Sub47_2.method7278(stringStack[--ssp]); return; } if (arg0 == 3761) { - anIntArray578[anInt7142 - 1] = aClass2_Sub47_2.method7272()[anIntArray578[anInt7142 - 1]]; + intStack[isp - 1] = aClass2_Sub47_2.method7272()[intStack[isp - 1]]; return; } if (arg0 == 3790) { - anIntArray578[anInt7142++] = Static279.anObjectArray35 == null ? 0 : 1; + intStack[isp++] = Static279.anObjectArray35 == null ? 0 : 1; return; } } else if (arg0 < 4000) { if (arg0 == 3903) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static105.aClass171Array1[local15].method3547(); + local15 = intStack[--isp]; + intStack[isp++] = Static105.aClass171Array1[local15].method3547(); return; } if (arg0 == 3904) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static105.aClass171Array1[local15].anInt4033; + local15 = intStack[--isp]; + intStack[isp++] = Static105.aClass171Array1[local15].anInt4033; return; } if (arg0 == 3905) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static105.aClass171Array1[local15].anInt4040; + local15 = intStack[--isp]; + intStack[isp++] = Static105.aClass171Array1[local15].anInt4040; return; } if (arg0 == 3906) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static105.aClass171Array1[local15].anInt4034; + local15 = intStack[--isp]; + intStack[isp++] = Static105.aClass171Array1[local15].anInt4034; return; } if (arg0 == 3907) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static105.aClass171Array1[local15].anInt4035; + local15 = intStack[--isp]; + intStack[isp++] = Static105.aClass171Array1[local15].anInt4035; return; } if (arg0 == 3908) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static105.aClass171Array1[local15].anInt4032; + local15 = intStack[--isp]; + intStack[isp++] = Static105.aClass171Array1[local15].anInt4032; return; } if (arg0 == 3910) { - local15 = anIntArray578[--anInt7142]; + local15 = intStack[--isp]; local21 = Static105.aClass171Array1[local15].method3548(); - anIntArray578[anInt7142++] = local21 == 0 ? 1 : 0; + intStack[isp++] = local21 == 0 ? 1 : 0; return; } if (arg0 == 3911) { - local15 = anIntArray578[--anInt7142]; + local15 = intStack[--isp]; local21 = Static105.aClass171Array1[local15].method3548(); - anIntArray578[anInt7142++] = local21 == 2 ? 1 : 0; + intStack[isp++] = local21 == 2 ? 1 : 0; return; } if (arg0 == 3912) { - local15 = anIntArray578[--anInt7142]; + local15 = intStack[--isp]; local21 = Static105.aClass171Array1[local15].method3548(); - anIntArray578[anInt7142++] = local21 == 5 ? 1 : 0; + intStack[isp++] = local21 == 5 ? 1 : 0; return; } if (arg0 == 3913) { - local15 = anIntArray578[--anInt7142]; + local15 = intStack[--isp]; local21 = Static105.aClass171Array1[local15].method3548(); - anIntArray578[anInt7142++] = local21 == 1 ? 1 : 0; + intStack[isp++] = local21 == 1 ? 1 : 0; return; } } else { @Pc(9705) long local9705; if (arg0 < 4100) { if (arg0 == 4000) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local15 + local21; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = local15 + local21; return; } if (arg0 == 4001) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local15 - local21; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = local15 - local21; return; } if (arg0 == 4002) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local15 * local21; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = local15 * local21; return; } if (arg0 == 4003) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local15 / local21; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = local15 / local21; return; } if (arg0 == 4004) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = (int) (Math.random() * (double) local15); + local15 = intStack[--isp]; + intStack[isp++] = (int) (Math.random() * (double) local15); return; } if (arg0 == 4005) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = (int) (Math.random() * (double) (local15 + 1)); + local15 = intStack[--isp]; + intStack[isp++] = (int) (Math.random() * (double) (local15 + 1)); return; } if (arg0 == 4006) { - anInt7142 -= 5; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - local27 = anIntArray578[anInt7142 + 2]; - local506 = anIntArray578[anInt7142 + 3]; - local2978 = anIntArray578[anInt7142 + 4]; - anIntArray578[anInt7142++] = local15 + (local21 - local15) * (local2978 - local27) / (local506 - local27); + isp -= 5; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + local27 = intStack[isp + 2]; + local506 = intStack[isp + 3]; + local2978 = intStack[isp + 4]; + intStack[isp++] = local15 + (local21 - local15) * (local2978 - local27) / (local506 - local27); return; } @Pc(9712) long local9712; if (arg0 == 4007) { - anInt7142 -= 2; - local9705 = (long) anIntArray578[anInt7142]; - local9712 = (long) anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = (int) (local9705 + local9705 * local9712 / 100L); + isp -= 2; + local9705 = (long) intStack[isp]; + local9712 = (long) intStack[isp + 1]; + intStack[isp++] = (int) (local9705 + local9705 * local9712 / 100L); return; } if (arg0 == 4008) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local15 | 0x1 << local21; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = local15 | 0x1 << local21; return; } if (arg0 == 4009) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local15 & -(0x1 << local21) - 1; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = local15 & -(0x1 << local21) - 1; return; } if (arg0 == 4010) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = (local15 & 0x1 << local21) == 0 ? 0 : 1; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = (local15 & 0x1 << local21) == 0 ? 0 : 1; return; } if (arg0 == 4011) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local15 % local21; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = local15 % local21; return; } if (arg0 == 4012) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; if (local15 == 0) { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } - anIntArray578[anInt7142++] = (int) Math.pow((double) local15, (double) local21); + intStack[isp++] = (int) Math.pow((double) local15, (double) local21); return; } if (arg0 == 4013) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; if (local15 == 0) { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (local21 == 0) { - anIntArray578[anInt7142++] = Integer.MAX_VALUE; + intStack[isp++] = Integer.MAX_VALUE; return; } - anIntArray578[anInt7142++] = (int) Math.pow((double) local15, 1.0D / (double) local21); + intStack[isp++] = (int) Math.pow((double) local15, 1.0D / (double) local21); return; } if (arg0 == 4014) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local15 & local21; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = local15 & local21; return; } if (arg0 == 4015) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local15 | local21; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = local15 | local21; return; } if (arg0 == 4016) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local15 < local21 ? local15 : local21; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = local15 < local21 ? local15 : local21; return; } if (arg0 == 4017) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local15 > local21 ? local15 : local21; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; + intStack[isp++] = local15 > local21 ? local15 : local21; return; } if (arg0 == 4018) { - anInt7142 -= 3; - local9705 = (long) anIntArray578[anInt7142]; - local9712 = (long) anIntArray578[anInt7142 + 1]; - @Pc(10099) long local10099 = (long) anIntArray578[anInt7142 + 2]; - anIntArray578[anInt7142++] = (int) (local9705 * local10099 / local9712); + isp -= 3; + local9705 = (long) intStack[isp]; + local9712 = (long) intStack[isp + 1]; + @Pc(10099) long local10099 = (long) intStack[isp + 2]; + intStack[isp++] = (int) (local9705 * local10099 / local9712); return; } if (arg0 == 4019) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; if (local15 > 700 || local21 > 700) { - anIntArray578[anInt7142++] = 256; + intStack[isp++] = 256; } @Pc(10162) double local10162 = (Math.random() * (double) (local21 + local15) + 800.0D - (double) local15) / 100.0D; - anIntArray578[anInt7142++] = (int) (Math.pow(2.0D, local10162) + 0.5D); + intStack[isp++] = (int) (Math.pow(2.0D, local10162) + 0.5D); return; } if (arg0 == 4020) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static323.anIntArray389[Static105.method2043(local15) & 0xFFFF]; + local15 = intStack[--isp]; + intStack[isp++] = Static323.anIntArray389[Static105.method2043(local15) & 0xFFFF]; return; } } else if (arg0 < 4200) { if (arg0 == 4100) { - local4911 = aStringArray37[--anInt7139]; - local21 = anIntArray578[--anInt7142]; - aStringArray37[anInt7139++] = local4911 + local21; + local4911 = stringStack[--ssp]; + local21 = intStack[--isp]; + stringStack[ssp++] = local4911 + local21; return; } if (arg0 == 4101) { - anInt7139 -= 2; - local4911 = aStringArray37[anInt7139]; - local1394 = aStringArray37[anInt7139 + 1]; - aStringArray37[anInt7139++] = local4911 + local1394; + ssp -= 2; + local4911 = stringStack[ssp]; + local1394 = stringStack[ssp + 1]; + stringStack[ssp++] = local4911 + local1394; return; } if (arg0 == 4102) { - local4911 = aStringArray37[--anInt7139]; - local21 = anIntArray578[--anInt7142]; - aStringArray37[anInt7139++] = local4911 + Static593.method7780(true, local21); + local4911 = stringStack[--ssp]; + local21 = intStack[--isp]; + stringStack[ssp++] = local4911 + Static593.method7780(true, local21); return; } if (arg0 == 4103) { - local4911 = aStringArray37[--anInt7139]; - aStringArray37[anInt7139++] = local4911.toLowerCase(); + local4911 = stringStack[--ssp]; + stringStack[ssp++] = local4911.toLowerCase(); return; } if (arg0 == 4104) { - aStringArray37[anInt7139++] = Static522.method6994(Static51.clientLanguageId, Static38.method1003(anIntArray578[--anInt7142])); + stringStack[ssp++] = Static522.method6994(Static51.clientLanguageId, Static38.method1003(intStack[--isp])); return; } if (arg0 == 4105) { - anInt7139 -= 2; - local4911 = aStringArray37[anInt7139]; - local1394 = aStringArray37[anInt7139 + 1]; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 != null && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1.aBoolean385) { - aStringArray37[anInt7139++] = local1394; + ssp -= 2; + local4911 = stringStack[ssp]; + local1394 = stringStack[ssp + 1]; + if (Static556.self.aPlayerAppearance1 != null && Static556.self.aPlayerAppearance1.gender) { + stringStack[ssp++] = local1394; return; } - aStringArray37[anInt7139++] = local4911; + stringStack[ssp++] = local4911; return; } if (arg0 == 4106) { - local15 = anIntArray578[--anInt7142]; - aStringArray37[anInt7139++] = Integer.toString(local15); + local15 = intStack[--isp]; + stringStack[ssp++] = Integer.toString(local15); return; } if (arg0 == 4107) { - anInt7139 -= 2; - anIntArray578[anInt7142++] = Static540.method6538(aStringArray37[anInt7139 + 1], Static51.clientLanguageId, aStringArray37[anInt7139]); + ssp -= 2; + intStack[isp++] = Static540.method6538(stringStack[ssp + 1], Static51.clientLanguageId, stringStack[ssp]); return; } @Pc(10482) Class381 local10482; if (arg0 == 4108) { - local4911 = aStringArray37[--anInt7139]; - anInt7142 -= 2; - local21 = anIntArray578[anInt7142]; - local27 = anIntArray578[anInt7142 + 1]; + local4911 = stringStack[--ssp]; + isp -= 2; + local21 = intStack[isp]; + local27 = intStack[isp + 1]; local10482 = Static74.method1535(local27, client.fontMetrics); - anIntArray578[anInt7142++] = local10482.method8739(local4911, Static679.aSoftwareIndexedSpriteArray14, local21); + intStack[isp++] = local10482.method8739(local4911, Static679.aSoftwareIndexedSpriteArray14, local21); return; } if (arg0 == 4109) { - local4911 = aStringArray37[--anInt7139]; - anInt7142 -= 2; - local21 = anIntArray578[anInt7142]; - local27 = anIntArray578[anInt7142 + 1]; + local4911 = stringStack[--ssp]; + isp -= 2; + local21 = intStack[isp]; + local27 = intStack[isp + 1]; local10482 = Static74.method1535(local27, client.fontMetrics); - anIntArray578[anInt7142++] = local10482.method8741(Static679.aSoftwareIndexedSpriteArray14, local4911, local21); + intStack[isp++] = local10482.method8741(Static679.aSoftwareIndexedSpriteArray14, local4911, local21); return; } if (arg0 == 4110) { - anInt7139 -= 2; - local4911 = aStringArray37[anInt7139]; - local1394 = aStringArray37[anInt7139 + 1]; - if (anIntArray578[--anInt7142] == 1) { - aStringArray37[anInt7139++] = local4911; + ssp -= 2; + local4911 = stringStack[ssp]; + local1394 = stringStack[ssp + 1]; + if (intStack[--isp] == 1) { + stringStack[ssp++] = local4911; return; } - aStringArray37[anInt7139++] = local1394; + stringStack[ssp++] = local1394; return; } if (arg0 == 4111) { - local4911 = aStringArray37[--anInt7139]; - aStringArray37[anInt7139++] = Static130.method2280(local4911); + local4911 = stringStack[--ssp]; + stringStack[ssp++] = Static130.method2280(local4911); return; } if (arg0 == 4112) { - local4911 = aStringArray37[--anInt7139]; - local21 = anIntArray578[--anInt7142]; + local4911 = stringStack[--ssp]; + local21 = intStack[--isp]; if (local21 == -1) { throw new RuntimeException("null char"); } - aStringArray37[anInt7139++] = local4911 + (char) local21; + stringStack[ssp++] = local4911 + (char) local21; return; } if (arg0 == 4113) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = method6423((char) local15); + local15 = intStack[--isp]; + intStack[isp++] = method6423((char) local15); return; } if (arg0 == 4114) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static596.method7815((char) local15) ? 1 : 0; + local15 = intStack[--isp]; + intStack[isp++] = Static596.method7815((char) local15) ? 1 : 0; return; } if (arg0 == 4115) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static245.method8628((char) local15) ? 1 : 0; + local15 = intStack[--isp]; + intStack[isp++] = Static245.method8628((char) local15) ? 1 : 0; return; } if (arg0 == 4116) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static277.method4043((char) local15) ? 1 : 0; + local15 = intStack[--isp]; + intStack[isp++] = Static277.method4043((char) local15) ? 1 : 0; return; } if (arg0 == 4117) { - local4911 = aStringArray37[--anInt7139]; + local4911 = stringStack[--ssp]; if (local4911 != null) { - anIntArray578[anInt7142++] = local4911.length(); + intStack[isp++] = local4911.length(); return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 4118) { - local4911 = aStringArray37[--anInt7139]; - anInt7142 -= 2; - local21 = anIntArray578[anInt7142]; - local27 = anIntArray578[anInt7142 + 1]; - aStringArray37[anInt7139++] = local4911.substring(local21, local27); + local4911 = stringStack[--ssp]; + isp -= 2; + local21 = intStack[isp]; + local27 = intStack[isp + 1]; + stringStack[ssp++] = local4911.substring(local21, local27); return; } if (arg0 == 4119) { - local4911 = aStringArray37[--anInt7139]; + local4911 = stringStack[--ssp]; @Pc(10848) StringBuffer local10848 = new StringBuffer(local4911.length()); @Pc(10850) boolean local10850 = false; for (local506 = 0; local506 < local4911.length(); local506++) { @@ -2771,165 +2771,165 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean local10848.append(local10857); } } - aStringArray37[anInt7139++] = local10848.toString(); + stringStack[ssp++] = local10848.toString(); return; } if (arg0 == 4120) { - local4911 = aStringArray37[--anInt7139]; - anInt7142 -= 2; - local21 = anIntArray578[anInt7142]; - local27 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = local4911.indexOf(local21, local27); + local4911 = stringStack[--ssp]; + isp -= 2; + local21 = intStack[isp]; + local27 = intStack[isp + 1]; + intStack[isp++] = local4911.indexOf(local21, local27); return; } if (arg0 == 4121) { - anInt7139 -= 2; - local4911 = aStringArray37[anInt7139]; - local1394 = aStringArray37[anInt7139 + 1]; - local27 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = local4911.indexOf(local1394, local27); + ssp -= 2; + local4911 = stringStack[ssp]; + local1394 = stringStack[ssp + 1]; + local27 = intStack[--isp]; + intStack[isp++] = local4911.indexOf(local1394, local27); return; } if (arg0 == 4122) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Character.toLowerCase((char) local15); + local15 = intStack[--isp]; + intStack[isp++] = Character.toLowerCase((char) local15); return; } if (arg0 == 4123) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Character.toUpperCase((char) local15); + local15 = intStack[--isp]; + intStack[isp++] = Character.toUpperCase((char) local15); return; } if (arg0 == 4124) { - local575 = anIntArray578[--anInt7142] != 0; - local21 = anIntArray578[--anInt7142]; - aStringArray37[anInt7139++] = Static573.method7571(Static51.clientLanguageId, local575, (long) local21, 0); + local575 = intStack[--isp] != 0; + local21 = intStack[--isp]; + stringStack[ssp++] = Static573.method7571(Static51.clientLanguageId, local575, (long) local21, 0); return; } if (arg0 == 4125) { - local4911 = aStringArray37[--anInt7139]; - local21 = anIntArray578[--anInt7142]; + local4911 = stringStack[--ssp]; + local21 = intStack[--isp]; @Pc(11077) Class381 local11077 = Static74.method1535(local21, client.fontMetrics); - anIntArray578[anInt7142++] = local11077.method8742(Static679.aSoftwareIndexedSpriteArray14, local4911); + intStack[isp++] = local11077.method8742(Static679.aSoftwareIndexedSpriteArray14, local4911); return; } if (arg0 == 4126) { - aStringArray37[anInt7139++] = Static647.method8474((long) anIntArray578[--anInt7142] * 60000L, Static51.clientLanguageId) + " UTC"; + stringStack[ssp++] = Static647.method8474((long) intStack[--isp] * 60000L, Static51.clientLanguageId) + " UTC"; return; } if (arg0 == 4127) { local9705 = aLongArray14[--anInt7152]; - aStringArray37[anInt7139++] = local9705 == -1L ? "" : Long.toString(local9705, 36).toUpperCase(); + stringStack[ssp++] = local9705 == -1L ? "" : Long.toString(local9705, 36).toUpperCase(); return; } } else if (arg0 < 4300) { if (arg0 == 4200) { - local15 = anIntArray578[--anInt7142]; - aStringArray37[anInt7139++] = ObjTypeList.objTypes.method2486(local15).aString118; + local15 = intStack[--isp]; + stringStack[ssp++] = ObjTypeList.objTypes.method2486(local15).aString118; return; } @Pc(11206) ObjType local11206; if (arg0 == 4201) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; local11206 = ObjTypeList.objTypes.method2486(local15); if (local21 >= 1 && local21 <= 5 && local11206.aStringArray46[local21 - 1] != null) { - aStringArray37[anInt7139++] = local11206.aStringArray46[local21 - 1]; + stringStack[ssp++] = local11206.aStringArray46[local21 - 1]; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 4202) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; local11206 = ObjTypeList.objTypes.method2486(local15); if (local21 >= 1 && local21 <= 5 && local11206.aStringArray45[local21 - 1] != null) { - aStringArray37[anInt7139++] = local11206.aStringArray45[local21 - 1]; + stringStack[ssp++] = local11206.aStringArray45[local21 - 1]; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 4203) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = ObjTypeList.objTypes.method2486(local15).anInt10142; + local15 = intStack[--isp]; + intStack[isp++] = ObjTypeList.objTypes.method2486(local15).anInt10142; return; } if (arg0 == 4204) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = ObjTypeList.objTypes.method2486(local15).anInt10115 == 1 ? 1 : 0; + local15 = intStack[--isp]; + intStack[isp++] = ObjTypeList.objTypes.method2486(local15).anInt10115 == 1 ? 1 : 0; return; } @Pc(11380) ObjType local11380; if (arg0 == 4205) { - local15 = anIntArray578[--anInt7142]; + local15 = intStack[--isp]; local11380 = ObjTypeList.objTypes.method2486(local15); if (local11380.anInt10087 == -1 && local11380.anInt10110 >= 0) { - anIntArray578[anInt7142++] = local11380.anInt10110; + intStack[isp++] = local11380.anInt10110; return; } - anIntArray578[anInt7142++] = local15; + intStack[isp++] = local15; return; } if (arg0 == 4206) { - local15 = anIntArray578[--anInt7142]; + local15 = intStack[--isp]; local11380 = ObjTypeList.objTypes.method2486(local15); if (local11380.anInt10087 >= 0 && local11380.anInt10110 >= 0) { - anIntArray578[anInt7142++] = local11380.anInt10110; + intStack[isp++] = local11380.anInt10110; return; } - anIntArray578[anInt7142++] = local15; + intStack[isp++] = local15; return; } if (arg0 == 4207) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = ObjTypeList.objTypes.method2486(local15).aBoolean770 ? 1 : 0; + local15 = intStack[--isp]; + intStack[isp++] = ObjTypeList.objTypes.method2486(local15).aBoolean770 ? 1 : 0; return; } if (arg0 == 4208) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; local3848 = Static386.aParamTypeList2.method1161(local21); if (local3848.method6672()) { - aStringArray37[anInt7139++] = ObjTypeList.objTypes.method2486(local15).method8800(local3848.aString89, local21); + stringStack[ssp++] = ObjTypeList.objTypes.method2486(local15).method8800(local3848.aString89, local21); return; } - anIntArray578[anInt7142++] = ObjTypeList.objTypes.method2486(local15).method8794(local21, local3848.anInt7509); + intStack[isp++] = ObjTypeList.objTypes.method2486(local15).method8794(local21, local3848.anInt7509); return; } if (arg0 == 4209) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1] - 1; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1] - 1; local11206 = ObjTypeList.objTypes.method2486(local15); if (local11206.anInt10122 == local21) { - anIntArray578[anInt7142++] = local11206.anInt10089; + intStack[isp++] = local11206.anInt10089; return; } if (local11206.anInt10093 == local21) { - anIntArray578[anInt7142++] = local11206.anInt10091; + intStack[isp++] = local11206.anInt10091; return; } - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; return; } if (arg0 == 4210) { - local4911 = aStringArray37[--anInt7139]; - local21 = anIntArray578[--anInt7142]; + local4911 = stringStack[--ssp]; + local21 = intStack[--isp]; Static331.method4924(local21 == 1, local4911); - anIntArray578[anInt7142++] = Static606.anInt8947; + intStack[isp++] = Static606.anInt8947; return; } if (arg0 == 4211) { if (Static256.aShortArray63 != null && Static143.anInt4054 < Static606.anInt8947) { - anIntArray578[anInt7142++] = Static256.aShortArray63[Static143.anInt4054++] & 0xFFFF; + intStack[isp++] = Static256.aShortArray63[Static143.anInt4054++] & 0xFFFF; return; } - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; return; } if (arg0 == 4212) { @@ -2937,73 +2937,73 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 4213) { - local15 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = ObjTypeList.objTypes.method2486(local15).anInt10103; + local15 = intStack[--isp]; + intStack[isp++] = ObjTypeList.objTypes.method2486(local15).anInt10103; return; } if (arg0 == 4214) { - local4911 = aStringArray37[--anInt7139]; - anInt7142 -= 3; - local21 = anIntArray578[anInt7142]; - local27 = anIntArray578[anInt7142 + 1]; - local506 = anIntArray578[anInt7142 + 2]; + local4911 = stringStack[--ssp]; + isp -= 3; + local21 = intStack[isp]; + local27 = intStack[isp + 1]; + local506 = intStack[isp + 2]; Static263.method3855(local21 == 1, local506, local27, local4911); - anIntArray578[anInt7142++] = Static606.anInt8947; + intStack[isp++] = Static606.anInt8947; return; } if (arg0 == 4215) { - anInt7139 -= 2; - anInt7142 -= 2; - local4911 = aStringArray37[anInt7139]; - local21 = anIntArray578[anInt7142]; - local27 = anIntArray578[anInt7142 + 1]; - local7345 = aStringArray37[anInt7139 + 1]; + ssp -= 2; + isp -= 2; + local4911 = stringStack[ssp]; + local21 = intStack[isp]; + local27 = intStack[isp + 1]; + local7345 = stringStack[ssp + 1]; Static715.method9347(local4911, local27, local7345, 8, local21 == 1); - anIntArray578[anInt7142++] = Static606.anInt8947; + intStack[isp++] = Static606.anInt8947; return; } } else if (arg0 < 4400) { if (arg0 == 4300) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; local3848 = Static386.aParamTypeList2.method1161(local21); if (local3848.method6672()) { - aStringArray37[anInt7139++] = Static690.aNpcTypeList2.method7092(local15).method5991(local3848.aString89, local21); + stringStack[ssp++] = Static690.aNpcTypeList2.method7092(local15).method5991(local3848.aString89, local21); return; } - anIntArray578[anInt7142++] = Static690.aNpcTypeList2.method7092(local15).method5995(local21, local3848.anInt7509); + intStack[isp++] = Static690.aNpcTypeList2.method7092(local15).method5995(local21, local3848.anInt7509); return; } } else if (arg0 < 4500) { if (arg0 == 4400) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; local3848 = Static386.aParamTypeList2.method1161(local21); if (local3848.method6672()) { - aStringArray37[anInt7139++] = Static354.aLocTypeList4.get(local15).getParam(local3848.aString89, local21); + stringStack[ssp++] = Static354.aLocTypeList4.get(local15).getParam(local3848.aString89, local21); return; } - anIntArray578[anInt7142++] = Static354.aLocTypeList4.get(local15).getParam(local3848.anInt7509, local21); + intStack[isp++] = Static354.aLocTypeList4.get(local15).getParam(local3848.anInt7509, local21); return; } } else if (arg0 < 4600) { if (arg0 == 4500) { - anInt7142 -= 2; - local15 = anIntArray578[anInt7142]; - local21 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local15 = intStack[isp]; + local21 = intStack[isp + 1]; local3848 = Static386.aParamTypeList2.method1161(local21); if (local3848.method6672()) { - aStringArray37[anInt7139++] = Static652.aStructTypeList1.method5038(local15).method91(local21, local3848.aString89); + stringStack[ssp++] = Static652.aStructTypeList1.method5038(local15).method91(local21, local3848.aString89); return; } - anIntArray578[anInt7142++] = Static652.aStructTypeList1.method5038(local15).method89(local3848.anInt7509, local21); + intStack[isp++] = Static652.aStructTypeList1.method5038(local15).method89(local3848.anInt7509, local21); return; } } else if (arg0 < 4700) { if (arg0 == 4600) { - local15 = anIntArray578[--anInt7142]; + local15 = intStack[--isp]; @Pc(12037) BasType local12037 = Static574.aBasTypeList2.method7118(local15); if (local12037.anIntArray587 != null && local12037.anIntArray587.length > 0) { local27 = 0; @@ -3014,19 +3014,19 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean local506 = local12037.anIntArray589[local2978]; } } - anIntArray578[anInt7142++] = local12037.anIntArray587[local27]; + intStack[isp++] = local12037.anIntArray587[local27]; return; } - anIntArray578[anInt7142++] = local12037.anInt7232; + intStack[isp++] = local12037.anInt7232; return; } } else if (arg0 < 4800) { if (arg0 == 4700) { - anIntArray578[anInt7142++] = Static587.aBoolean663 ? 1 : 0; + intStack[isp++] = Static587.aBoolean663 ? 1 : 0; return; } if (arg0 == 4701) { - local4911 = aStringArray37[--anInt7139]; + local4911 = stringStack[--ssp]; if (Static283.gameState == 7 && !Static242.method3500()) { if (local4911.length() > 20) { Static486.aByte115 = -4; @@ -3045,7 +3045,7 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 4702) { - anIntArray578[anInt7142++] = Static486.aByte115; + intStack[isp++] = Static486.aByte115; if (Static486.aByte115 != -1) { Static486.aByte115 = -6; } @@ -3061,86 +3061,86 @@ private static void method6416(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } else { if (arg0 >= 2000) { arg0 -= 1000; - local220 = Static145.method2412(anIntArray578[--anInt7142]); + local220 = Static145.getComponent(intStack[--isp]); } else { - local220 = arg1 ? aComponent12 : aComponent11; + local220 = arg1 ? staticActiveComponent1 : staticActiveComponent2; } if (arg0 == 1000) { - anInt7142 -= 4; - local220.anInt3826 = anIntArray578[anInt7142]; - local220.anInt3808 = anIntArray578[anInt7142 + 1]; - local21 = anIntArray578[anInt7142 + 2]; + isp -= 4; + local220.baseX = intStack[isp]; + local220.baseY = intStack[isp + 1]; + local21 = intStack[isp + 2]; if (local21 < 0) { local21 = 0; } else if (local21 > 5) { local21 = 5; } - local27 = anIntArray578[anInt7142 + 3]; + local27 = intStack[isp + 3]; if (local27 < 0) { local27 = 0; } else if (local27 > 5) { local27 = 5; } - local220.aByte61 = (byte) local21; - local220.aByte64 = (byte) local27; - Static178.method2729(local220); + local220.yMode = (byte) local21; + local220.xMode = (byte) local27; + Static178.redraw(local220); Static44.method1073(local220); - if (local220.anInt3741 == -1) { - Static415.method5698(local220.anInt3812); + if (local220.createdComponentId == -1) { + Static415.method5698(local220.id); } return; } if (arg0 == 1001) { - anInt7142 -= 4; - local220.anInt3744 = anIntArray578[anInt7142]; - local220.anInt3762 = anIntArray578[anInt7142 + 1]; + isp -= 4; + local220.baseWidth = intStack[isp]; + local220.baseHeight = intStack[isp + 1]; local220.anInt3800 = 0; local220.anInt3825 = 0; - local21 = anIntArray578[anInt7142 + 2]; + local21 = intStack[isp + 2]; if (local21 < 0) { local21 = 0; } else if (local21 > 4) { local21 = 4; } - local27 = anIntArray578[anInt7142 + 3]; + local27 = intStack[isp + 3]; if (local27 < 0) { local27 = 0; } else if (local27 > 4) { local27 = 4; } - local220.aByte63 = (byte) local21; - local220.aByte62 = (byte) local27; - Static178.method2729(local220); + local220.dynamicWidthValue = (byte) local21; + local220.dynamicHeightValue = (byte) local27; + Static178.redraw(local220); Static44.method1073(local220); - if (local220.anInt3820 == 0) { + if (local220.type == 0) { Static134.method8956(local220, false); } return; } if (arg0 == 1003) { - @Pc(834) boolean local834 = anIntArray578[--anInt7142] == 1; - if (local220.aBoolean284 != local834) { - local220.aBoolean284 = local834; - Static178.method2729(local220); + @Pc(834) boolean local834 = intStack[--isp] == 1; + if (local220.hidden != local834) { + local220.hidden = local834; + Static178.redraw(local220); } - if (local220.anInt3741 == -1) { - Static550.method7265(local220.anInt3812); + if (local220.createdComponentId == -1) { + Static550.method7265(local220.id); } return; } if (arg0 == 1004) { - anInt7142 -= 2; - local220.anInt3795 = anIntArray578[anInt7142]; - local220.anInt3750 = anIntArray578[anInt7142 + 1]; - Static178.method2729(local220); + isp -= 2; + local220.anInt3795 = intStack[isp]; + local220.anInt3750 = intStack[isp + 1]; + Static178.redraw(local220); Static44.method1073(local220); - if (local220.anInt3820 == 0) { + if (local220.type == 0) { Static134.method8956(local220, false); } return; } if (arg0 == 1005) { - local220.aBoolean300 = anIntArray578[--anInt7142] == 1; + local220.aBoolean300 = intStack[--isp] == 1; return; } } @@ -3154,11 +3154,11 @@ private static void method6417(@OriginalArg(0) Component arg0) { return; } @Pc(69) Component[] local69; - if (arg0.anInt3741 == -1) { - @Pc(106) int local106 = arg0.anInt3812 >>> 16; + if (arg0.createdComponentId == -1) { + @Pc(106) int local106 = arg0.id >>> 16; @Pc(110) Component[] local110 = Static148.aComponentArrayArray1[local106]; if (local110 == null) { - local69 = Static453.aComponentArrayArray2[local106]; + local69 = Static453.components[local106]; @Pc(119) int local119 = local69.length; local110 = Static148.aComponentArrayArray1[local106] = new Component[local119]; Static734.method7691(local69, 0, local110, 0, local69.length); @@ -3173,15 +3173,15 @@ private static void method6417(@OriginalArg(0) Component arg0) { local110[0] = arg0; return; } - @Pc(12) Component local12 = Static145.method2412(arg0.anInt3743); + @Pc(12) Component local12 = Static145.getComponent(arg0.overlayer); if (local12 == null) { return; } - if (local12.aComponentArray1 == local12.aComponentArray2) { - local12.aComponentArray1 = new Component[local12.aComponentArray2.length]; + if (local12.aComponentArray1 == local12.createdComponents) { + local12.aComponentArray1 = new Component[local12.createdComponents.length]; local12.aComponentArray1[0] = arg0; - Static734.method7691(local12.aComponentArray2, 0, local12.aComponentArray1, 1, arg0.anInt3741); - Static734.method7691(local12.aComponentArray2, arg0.anInt3741 + 1, local12.aComponentArray1, arg0.anInt3741 + 1, local12.aComponentArray2.length - arg0.anInt3741 - 1); + Static734.method7691(local12.createdComponents, 0, local12.aComponentArray1, 1, arg0.createdComponentId); + Static734.method7691(local12.createdComponents, arg0.createdComponentId + 1, local12.aComponentArray1, arg0.createdComponentId + 1, local12.createdComponents.length - arg0.createdComponentId - 1); return; } @Pc(66) int local66 = 0; @@ -3203,8 +3203,8 @@ public static void method6418() { @OriginalMember(owner = "client!ou", name = "a", descriptor = "(Lclient!fj;I)V") private static void method6419(@OriginalArg(0) ClientScript arg0, @OriginalArg(1) int arg1) { - anInt7142 = 0; - anInt7139 = 0; + isp = 0; + ssp = 0; @Pc(5) int local5 = -1; @Pc(8) int[] local8 = arg0.anIntArray254; @Pc(11) int[] local11 = arg0.anIntArray255; @@ -3238,37 +3238,37 @@ private static void method6419(@OriginalArg(0) ClientScript arg0, @OriginalArg(1 throw new IllegalStateException("Command: " + local34); } } else if (local34 == 0) { - anIntArray578[anInt7142++] = local11[local5]; + intStack[isp++] = local11[local5]; } else { @Pc(96) int local96; if (local34 == 1) { local96 = local11[local5]; - anIntArray578[anInt7142++] = Static34.aClass304_1.anIntArray621[local96]; + intStack[isp++] = Static34.aClass304_1.anIntArray621[local96]; } else if (local34 == 2) { local96 = local11[local5]; - Static34.aClass304_1.method6866(local96, anIntArray578[--anInt7142]); + Static34.aClass304_1.method6866(local96, intStack[--isp]); } else if (local34 == 3) { - aStringArray37[anInt7139++] = arg0.aStringArray14[local5]; + stringStack[ssp++] = arg0.aStringArray14[local5]; } else if (local34 == 6) { local5 += local11[local5]; } else if (local34 == 7) { - anInt7142 -= 2; - if (anIntArray578[anInt7142] != anIntArray578[anInt7142 + 1]) { + isp -= 2; + if (intStack[isp] != intStack[isp + 1]) { local5 += local11[local5]; } } else if (local34 == 8) { - anInt7142 -= 2; - if (anIntArray578[anInt7142] == anIntArray578[anInt7142 + 1]) { + isp -= 2; + if (intStack[isp] == intStack[isp + 1]) { local5 += local11[local5]; } } else if (local34 == 9) { - anInt7142 -= 2; - if (anIntArray578[anInt7142] < anIntArray578[anInt7142 + 1]) { + isp -= 2; + if (intStack[isp] < intStack[isp + 1]) { local5 += local11[local5]; } } else if (local34 == 10) { - anInt7142 -= 2; - if (anIntArray578[anInt7142] > anIntArray578[anInt7142 + 1]) { + isp -= 2; + if (intStack[isp] > intStack[isp + 1]) { local5 += local11[local5]; } } else if (local34 == 21) { @@ -3285,39 +3285,39 @@ private static void method6419(@OriginalArg(0) ClientScript arg0, @OriginalArg(1 aLongArray15 = local270.aLongArray5; } else if (local34 == 25) { local96 = local11[local5]; - anIntArray578[anInt7142++] = Static34.aClass304_1.method6864(local96); + intStack[isp++] = Static34.aClass304_1.method6864(local96); } else if (local34 == 27) { local96 = local11[local5]; - Static34.aClass304_1.method6868(anIntArray578[--anInt7142], local96); + Static34.aClass304_1.method6868(intStack[--isp], local96); } else if (local34 == 31) { - anInt7142 -= 2; - if (anIntArray578[anInt7142] <= anIntArray578[anInt7142 + 1]) { + isp -= 2; + if (intStack[isp] <= intStack[isp + 1]) { local5 += local11[local5]; } } else if (local34 == 32) { - anInt7142 -= 2; - if (anIntArray578[anInt7142] >= anIntArray578[anInt7142 + 1]) { + isp -= 2; + if (intStack[isp] >= intStack[isp + 1]) { local5 += local11[local5]; } } else if (local34 == 33) { - anIntArray578[anInt7142++] = anIntArray580[local11[local5]]; + intStack[isp++] = anIntArray580[local11[local5]]; } else if (local34 == 34) { - anIntArray580[local11[local5]] = anIntArray578[--anInt7142]; + anIntArray580[local11[local5]] = intStack[--isp]; } else if (local34 == 35) { - aStringArray37[anInt7139++] = aStringArray36[local11[local5]]; + stringStack[ssp++] = aStringArray36[local11[local5]]; } else if (local34 == 36) { - aStringArray36[local11[local5]] = aStringArray37[--anInt7139]; + aStringArray36[local11[local5]] = stringStack[--ssp]; } else { @Pc(465) String local465; if (local34 == 37) { local96 = local11[local5]; - anInt7139 -= local96; - local465 = Static142.method2381(local96, anInt7139, aStringArray37); - aStringArray37[anInt7139++] = local465; + ssp -= local96; + local465 = Static142.method2381(local96, ssp, stringStack); + stringStack[ssp++] = local465; } else if (local34 == 38) { - anInt7142--; + isp--; } else if (local34 == 39) { - anInt7139--; + ssp--; } else if (local34 == 40) { local96 = local11[local5]; @Pc(503) ClientScript local503 = Static488.method6525(local96); @@ -3328,16 +3328,16 @@ private static void method6419(@OriginalArg(0) ClientScript arg0, @OriginalArg(1 @Pc(518) String[] local518 = new String[local503.anInt2950]; @Pc(522) long[] local522 = new long[local503.anInt2949]; for (@Pc(524) int local524 = 0; local524 < local503.anInt2951; local524++) { - local514[local524] = anIntArray578[anInt7142 + local524 - local503.anInt2951]; + local514[local524] = intStack[isp + local524 - local503.anInt2951]; } for (@Pc(543) int local543 = 0; local543 < local503.anInt2953; local543++) { - local518[local543] = aStringArray37[anInt7139 + local543 - local503.anInt2953]; + local518[local543] = stringStack[ssp + local543 - local503.anInt2953]; } for (@Pc(562) int local562 = 0; local562 < local503.anInt2954; local562++) { local522[local562] = aLongArray14[anInt7152 + local562 - local503.anInt2954]; } - anInt7142 -= local503.anInt2951; - anInt7139 -= local503.anInt2953; + isp -= local503.anInt2951; + ssp -= local503.anInt2953; anInt7152 -= local503.anInt2954; @Pc(598) GoSubFrame local598 = new GoSubFrame(); local598.aClass2_Sub2_Sub10_1 = arg0; @@ -3357,16 +3357,16 @@ private static void method6419(@OriginalArg(0) ClientScript arg0, @OriginalArg(1 aStringArray36 = local518; aLongArray15 = local522; } else if (local34 == 42) { - anIntArray578[anInt7142++] = Static511.anIntArray614[local11[local5]]; + intStack[isp++] = Static511.anIntArray614[local11[local5]]; } else if (local34 == 43) { local96 = local11[local5]; - Static511.anIntArray614[local96] = anIntArray578[--anInt7142]; + Static511.anIntArray614[local96] = intStack[--isp]; Static135.method7239(local96); Static624.aBoolean727 |= Static118.aBooleanArray4[local96]; } else if (local34 == 44) { local96 = local11[local5] >> 16; local706 = local11[local5] & 0xFFFF; - @Pc(714) int local714 = anIntArray578[--anInt7142]; + @Pc(714) int local714 = intStack[--isp]; if (local714 >= 0 && local714 <= 5000) { anIntArray581[local96] = local714; @Pc(732) byte local732 = -1; @@ -3385,32 +3385,32 @@ private static void method6419(@OriginalArg(0) ClientScript arg0, @OriginalArg(1 throw new RuntimeException(); } else if (local34 == 45) { local96 = local11[local5]; - local706 = anIntArray578[--anInt7142]; + local706 = intStack[--isp]; if (local706 < 0 || local706 >= anIntArray581[local96]) { throw new RuntimeException(); } - anIntArray578[anInt7142++] = anIntArrayArray177[local96][local706]; + intStack[isp++] = anIntArrayArray177[local96][local706]; } else if (local34 == 46) { local96 = local11[local5]; - anInt7142 -= 2; - local706 = anIntArray578[anInt7142]; + isp -= 2; + local706 = intStack[isp]; if (local706 < 0 || local706 >= anIntArray581[local96]) { throw new RuntimeException(); } - anIntArrayArray177[local96][local706] = anIntArray578[anInt7142 + 1]; + anIntArrayArray177[local96][local706] = intStack[isp + 1]; } else if (local34 == 47) { - @Pc(843) String local843 = Static37.aStringArray4[local11[local5]]; + @Pc(843) String local843 = Static37.varcstrs[local11[local5]]; if (local843 == null) { local843 = "null"; } - aStringArray37[anInt7139++] = local843; + stringStack[ssp++] = local843; } else if (local34 == 48) { local96 = local11[local5]; - Static37.aStringArray4[local96] = aStringArray37[--anInt7139]; + Static37.varcstrs[local96] = stringStack[--ssp]; Static85.method9262(local96); } else if (local34 == 51) { - @Pc(889) HashTable local889 = arg0.aHashTableArray1[local11[local5]]; - @Pc(902) IntNode local902 = (IntNode) local889.get((long) anIntArray578[--anInt7142]); + @Pc(889) HashTable local889 = arg0.switchTables[local11[local5]]; + @Pc(902) IntNode local902 = (IntNode) local889.get((long) intStack[--isp]); if (local902 != null) { local5 += local902.value; } @@ -3453,11 +3453,11 @@ private static void method6419(@OriginalArg(0) ClientScript arg0, @OriginalArg(1 local5 += local11[local5]; } } else if (local34 == 86) { - if (anIntArray578[--anInt7142] == 1) { + if (intStack[--isp] == 1) { local5 += local11[local5]; } } else if (local34 == 87) { - if (anIntArray578[--anInt7142] == 0) { + if (intStack[--isp] == 0) { local5 += local11[local5]; } } else if (local34 == 106) { @@ -3466,25 +3466,25 @@ private static void method6419(@OriginalArg(0) ClientScript arg0, @OriginalArg(1 if (local1178 == null) { @Pc(1185) VarClanType local1185 = Static628.aVarClanTypeList5.method7785(local96); if (local1185.aChar3 == 'i' || local1185.aChar3 == '1') { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; } else { - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; } } else { - anIntArray578[anInt7142++] = local1178; + intStack[isp++] = local1178; } } else if (local34 == 107) { local96 = local11[local5]; @Pc(1236) VarClanType local1236 = Static628.aVarClanTypeList5.method7785(local96); if (local1236.aChar3 != '\u0001') { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; } @Pc(1256) Integer local1256 = (Integer) Static279.anObjectArray35[local1236.anInt2816]; if (local1256 == null) { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; } else { @Pc(1284) int local1284 = local1236.anInt2817 == 31 ? -1 : (0x1 << local1236.anInt2817 + 1) - 1; - anIntArray578[anInt7142++] = (local1256 & local1284) >>> local1236.anInt2812; + intStack[isp++] = (local1256 & local1284) >>> local1236.anInt2812; } } else if (local34 == 108) { local96 = local11[local5]; @@ -3498,18 +3498,18 @@ private static void method6419(@OriginalArg(0) ClientScript arg0, @OriginalArg(1 local96 = local11[local5]; local465 = (String) Static279.anObjectArray35[local96]; if (local465 == null) { - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; } else { - aStringArray37[anInt7139++] = local465; + stringStack[ssp++] = local465; } } else if (local34 == 112) { - anIntArray578[anInt7142++] = method6412(local11[local5]); + intStack[isp++] = method6412(local11[local5]); } else if (local34 == 113) { - anIntArray578[anInt7142++] = method6411(local11[local5]); + intStack[isp++] = method6411(local11[local5]); } else if (local34 == 114) { aLongArray14[anInt7152++] = method6413(local11[local5]); } else if (local34 == 115) { - aStringArray37[anInt7139++] = method6425(local11[local5]); + stringStack[ssp++] = method6425(local11[local5]); } } } @@ -3543,19 +3543,19 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean @Pc(101) String local101; if (arg0 < 5100) { if (arg0 == 5000) { - anIntArray578[anInt7142++] = Static133.anInt2458; + intStack[isp++] = Static133.anInt2458; return; } @Pc(57) Connection local57; @Pc(63) OutboundPacket local63; if (arg0 == 5001) { - anInt7142 -= 3; - Static133.anInt2458 = anIntArray578[anInt7142]; - Static726.aClass280_7 = Static189.method2864(anIntArray578[anInt7142 + 1]); + isp -= 3; + Static133.anInt2458 = intStack[isp]; + Static726.aClass280_7 = Static189.method2864(intStack[isp + 1]); if (Static726.aClass280_7 == null) { Static726.aClass280_7 = Static137.aClass280_4; } - Static87.anInt1806 = anIntArray578[anInt7142 + 2]; + Static87.anInt1806 = intStack[isp + 2]; local57 = Connection.getActiveConnection(); local63 = OutboundPacket.create(Static98.aClientProt20, local57.random); local63.buffer.p1(Static133.anInt2458); @@ -3565,12 +3565,12 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5002) { - anInt7139 -= 2; - local95 = aStringArray37[anInt7139]; - local101 = aStringArray37[anInt7139 + 1]; - anInt7142 -= 2; - local109 = anIntArray578[anInt7142]; - local115 = anIntArray578[anInt7142 + 1]; + ssp -= 2; + local95 = stringStack[ssp]; + local101 = stringStack[ssp + 1]; + isp -= 2; + local109 = intStack[isp]; + local115 = intStack[isp + 1]; if (local101 == null) { local101 = ""; } @@ -3589,37 +3589,37 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } @Pc(196) Class283 local196; if (arg0 == 5003) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local196 = Static8.method122(local192); local198 = ""; if (local196 != null && local196.aString78 != null) { local198 = local196.aString78; } - aStringArray37[anInt7139++] = local198; + stringStack[ssp++] = local198; return; } if (arg0 == 5004) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local196 = Static8.method122(local192); local109 = -1; if (local196 != null) { local109 = local196.anInt7166; } - anIntArray578[anInt7142++] = local109; + intStack[isp++] = local109; return; } if (arg0 == 5005) { if (Static726.aClass280_7 == null) { - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = Static726.aClass280_7.anInt7039; + intStack[isp++] = Static726.aClass280_7.anInt7039; return; } @Pc(295) OutboundPacket local295; @Pc(289) Connection local289; if (arg0 == 5006) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local289 = Connection.getActiveConnection(); local295 = OutboundPacket.create(ClientProt.aClientProt67, local289.random); local295.buffer.p1(local192); @@ -3627,15 +3627,15 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5008) { - local95 = aStringArray37[--anInt7139]; + local95 = stringStack[--ssp]; method6426(local95, arg0); return; } if (arg0 == 5009) { - anInt7139 -= 2; - local95 = aStringArray37[anInt7139]; - local101 = aStringArray37[anInt7139 + 1]; - if (Static608.anInt9290 != 0 || (!Static389.aBoolean459 || Static34.aBoolean62) && !Static617.aBoolean724) { + ssp -= 2; + local95 = stringStack[ssp]; + local101 = stringStack[ssp + 1]; + if (Static608.staffModLevel != 0 || (!Static389.aBoolean459 || Static34.aBoolean62) && !Static617.mapQuickChat) { @Pc(360) Connection local360 = Connection.getActiveConnection(); @Pc(366) OutboundPacket local366 = OutboundPacket.create(Static243.aClientProt52, local360.random); local366.buffer.p2(0); @@ -3649,178 +3649,178 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5010) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local196 = Static8.method122(local192); local198 = ""; if (local196 != null && local196.aString81 != null) { local198 = local196.aString81; } - aStringArray37[anInt7139++] = local198; + stringStack[ssp++] = local198; return; } if (arg0 == 5011) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local196 = Static8.method122(local192); local198 = ""; if (local196 != null && local196.aString79 != null) { local198 = local196.aString79; } - aStringArray37[anInt7139++] = local198; + stringStack[ssp++] = local198; return; } if (arg0 == 5012) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local196 = Static8.method122(local192); local109 = -1; if (local196 != null) { local109 = local196.anInt7167; } - anIntArray578[anInt7142++] = local109; + intStack[isp++] = local109; return; } if (arg0 == 5015) { - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 == null || Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name1 == null) { + if (Static556.self == null || Static556.self.name1 == null) { local95 = ""; } else { - local95 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method1424(false); + local95 = Static556.self.method1424(false); } - aStringArray37[anInt7139++] = local95; + stringStack[ssp++] = local95; return; } if (arg0 == 5016) { - anIntArray578[anInt7142++] = Static87.anInt1806; + intStack[isp++] = Static87.anInt1806; return; } if (arg0 == 5017) { - anIntArray578[anInt7142++] = Static402.method5578(); + intStack[isp++] = Static402.method5578(); return; } if (arg0 == 5018) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local196 = Static8.method122(local192); local109 = 0; if (local196 != null) { local109 = local196.anInt7171; } - anIntArray578[anInt7142++] = local109; + intStack[isp++] = local109; return; } if (arg0 == 5019) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local196 = Static8.method122(local192); local198 = ""; if (local196 != null && local196.aString80 != null) { local198 = local196.aString80; } - aStringArray37[anInt7139++] = local198; + stringStack[ssp++] = local198; return; } if (arg0 == 5020) { - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 == null || Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name1 == null) { + if (Static556.self == null || Static556.self.name1 == null) { local95 = ""; } else { - local95 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method1422(); + local95 = Static556.self.method1422(); } - aStringArray37[anInt7139++] = local95; + stringStack[ssp++] = local95; return; } if (arg0 == 5023) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local196 = Static8.method122(local192); local109 = -1; if (local196 != null) { local109 = local196.anInt7163; } - anIntArray578[anInt7142++] = local109; + intStack[isp++] = local109; return; } if (arg0 == 5024) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local196 = Static8.method122(local192); local109 = -1; if (local196 != null) { local109 = local196.anInt7164; } - anIntArray578[anInt7142++] = local109; + intStack[isp++] = local109; return; } if (arg0 == 5025) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local196 = Static8.method122(local192); local198 = ""; if (local196 != null && local196.aString77 != null) { local198 = local196.aString77; } - aStringArray37[anInt7139++] = local198; + stringStack[ssp++] = local198; return; } if (arg0 == 5050) { - local192 = anIntArray578[--anInt7142]; - aStringArray37[anInt7139++] = Static68.aQuickChatCatTypeList3.method3234(local192).aString4; + local192 = intStack[--isp]; + stringStack[ssp++] = Static68.aQuickChatCatTypeList3.method3234(local192).aString4; return; } @Pc(793) QuickChatCatType local793; if (arg0 == 5051) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local793 = Static68.aQuickChatCatTypeList3.method3234(local192); if (local793.anIntArray93 == null) { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } - anIntArray578[anInt7142++] = local793.anIntArray93.length; + intStack[isp++] = local793.anIntArray93.length; return; } if (arg0 == 5052) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; @Pc(839) QuickChatCatType local839 = Static68.aQuickChatCatTypeList3.method3234(local192); local115 = local839.anIntArray93[local834]; - anIntArray578[anInt7142++] = local115; + intStack[isp++] = local115; return; } if (arg0 == 5053) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local793 = Static68.aQuickChatCatTypeList3.method3234(local192); if (local793.anIntArray94 == null) { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } - anIntArray578[anInt7142++] = local793.anIntArray94.length; + intStack[isp++] = local793.anIntArray94.length; return; } if (arg0 == 5054) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static68.aQuickChatCatTypeList3.method3234(local192).anIntArray94[local834]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + intStack[isp++] = Static68.aQuickChatCatTypeList3.method3234(local192).anIntArray94[local834]; return; } if (arg0 == 5055) { - local192 = anIntArray578[--anInt7142]; - aStringArray37[anInt7139++] = Static288.aQuickChatPhraseTypeList2.method2950(local192).method3906(); + local192 = intStack[--isp]; + stringStack[ssp++] = Static288.aQuickChatPhraseTypeList2.method2950(local192).method3906(); return; } if (arg0 == 5056) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; @Pc(966) QuickChatPhraseType local966 = Static288.aQuickChatPhraseTypeList2.method2950(local192); if (local966.anIntArray333 == null) { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } - anIntArray578[anInt7142++] = local966.anIntArray333.length; + intStack[isp++] = local966.anIntArray333.length; return; } if (arg0 == 5057) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static288.aQuickChatPhraseTypeList2.method2950(local192).anIntArray333[local834]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + intStack[isp++] = Static288.aQuickChatPhraseTypeList2.method2950(local192).anIntArray333[local834]; return; } if (arg0 == 5058) { aClass21_1 = new Class21(); - aClass21_1.anInt521 = anIntArray578[--anInt7142]; + aClass21_1.anInt521 = intStack[--isp]; aClass21_1.aClass2_Sub2_Sub12_1 = Static288.aQuickChatPhraseTypeList2.method2950(aClass21_1.anInt521); aClass21_1.anIntArray29 = new int[aClass21_1.aClass2_Sub2_Sub12_1.method3901()]; return; @@ -3838,7 +3838,7 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5060) { - local95 = aStringArray37[--anInt7139]; + local95 = stringStack[--ssp]; local289 = Connection.getActiveConnection(); local295 = OutboundPacket.create(Static234.aClientProt46, local289.random); local295.buffer.p1(0); @@ -3863,93 +3863,93 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5062) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static68.aQuickChatCatTypeList3.method3234(local192).aCharArray2[local834]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + intStack[isp++] = Static68.aQuickChatCatTypeList3.method3234(local192).aCharArray2[local834]; return; } if (arg0 == 5063) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static68.aQuickChatCatTypeList3.method3234(local192).aCharArray3[local834]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + intStack[isp++] = Static68.aQuickChatCatTypeList3.method3234(local192).aCharArray3[local834]; return; } if (arg0 == 5064) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; if (local834 == -1) { - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = Static68.aQuickChatCatTypeList3.method3234(local192).method1185((char) local834); + intStack[isp++] = Static68.aQuickChatCatTypeList3.method3234(local192).method1185((char) local834); return; } if (arg0 == 5065) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; if (local834 == -1) { - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = Static68.aQuickChatCatTypeList3.method3234(local192).method1184((char) local834); + intStack[isp++] = Static68.aQuickChatCatTypeList3.method3234(local192).method1184((char) local834); return; } if (arg0 == 5066) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static288.aQuickChatPhraseTypeList2.method2950(local192).method3901(); + local192 = intStack[--isp]; + intStack[isp++] = Static288.aQuickChatPhraseTypeList2.method2950(local192).method3901(); return; } if (arg0 == 5067) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; local109 = Static288.aQuickChatPhraseTypeList2.method2950(local192).method3898(local834).anInt4575; - anIntArray578[anInt7142++] = local109; + intStack[isp++] = local109; return; } if (arg0 == 5068) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; aClass21_1.anIntArray29[local192] = local834; return; } if (arg0 == 5069) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; aClass21_1.anIntArray29[local192] = local834; return; } if (arg0 == 5070) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; @Pc(1526) QuickChatPhraseType local1526 = Static288.aQuickChatPhraseTypeList2.method2950(local192); if (local1526.method3898(local834).anInt4575 != 0) { throw new RuntimeException("bad command"); } - anIntArray578[anInt7142++] = local1526.method3900(local834, local109); + intStack[isp++] = local1526.method3900(local834, local109); return; } if (arg0 == 5071) { - local95 = aStringArray37[--anInt7139]; - local1578 = anIntArray578[--anInt7142] == 1; + local95 = stringStack[--ssp]; + local1578 = intStack[--isp] == 1; Static494.method6599(local95, local1578); - anIntArray578[anInt7142++] = Static606.anInt8947; + intStack[isp++] = Static606.anInt8947; return; } if (arg0 == 5072) { if (Static256.aShortArray63 != null && Static143.anInt4054 < Static606.anInt8947) { - anIntArray578[anInt7142++] = Static256.aShortArray63[Static143.anInt4054++] & 0xFFFF; + intStack[isp++] = Static256.aShortArray63[Static143.anInt4054++] & 0xFFFF; return; } - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; return; } if (arg0 == 5073) { @@ -3983,126 +3983,126 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } else if (arg0 < 5200) { if (arg0 == 5100) { if (Static334.aKeyboard1.method8479(86)) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 5101) { if (Static334.aKeyboard1.method8479(82)) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 5102) { if (Static334.aKeyboard1.method8479(81)) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } } else { @Pc(2331) boolean local2331; if (arg0 < 5300) { if (arg0 == 5200) { - Static2.method65(anIntArray578[--anInt7142]); + Static2.method65(intStack[--isp]); return; } if (arg0 == 5201) { - anIntArray578[anInt7142++] = Static466.method6323(); + intStack[isp++] = Static466.method6323(); return; } if (arg0 == 5205) { - Static60.method1293(anIntArray578[--anInt7142], false, -1, -1, -11493); + Static60.method1293(intStack[--isp], false, -1, -1, -11493); return; } @Pc(1908) Map local1908; if (arg0 == 5206) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local1908 = Static30.method5078(local192 >> 14 & 0x3FFF, local192 & 0x3FFF); if (local1908 == null) { - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = local1908.anInt4563; + intStack[isp++] = local1908.anInt4563; return; } @Pc(1942) Map local1942; if (arg0 == 5207) { - local1942 = Static30.method5059(anIntArray578[--anInt7142]); + local1942 = Static30.method5059(intStack[--isp]); if (local1942 != null && local1942.aString49 != null) { - aStringArray37[anInt7139++] = local1942.aString49; + stringStack[ssp++] = local1942.aString49; return; } - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } if (arg0 == 5208) { - anIntArray578[anInt7142++] = Static329.anInt1750; - anIntArray578[anInt7142++] = Static588.anInt8690; + intStack[isp++] = Static329.anInt1750; + intStack[isp++] = Static588.anInt8690; return; } if (arg0 == 5209) { - anIntArray578[anInt7142++] = Static164.anInt2809 + Static30.anInt5655; - anIntArray578[anInt7142++] = Static615.anInt9389 + Static30.anInt5648; + intStack[isp++] = Static164.anInt2809 + Static30.anInt5655; + intStack[isp++] = Static615.anInt9389 + Static30.anInt5648; return; } if (arg0 == 5210) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local1908 = Static30.method5059(local192); if (local1908 == null) { - anIntArray578[anInt7142++] = 0; - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; + intStack[isp++] = 0; return; } - anIntArray578[anInt7142++] = local1908.anInt4556 >> 14 & 0x3FFF; - anIntArray578[anInt7142++] = local1908.anInt4556 & 0x3FFF; + intStack[isp++] = local1908.anInt4556 >> 14 & 0x3FFF; + intStack[isp++] = local1908.anInt4556 & 0x3FFF; return; } if (arg0 == 5211) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local1908 = Static30.method5059(local192); if (local1908 == null) { - anIntArray578[anInt7142++] = 0; - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; + intStack[isp++] = 0; return; } - anIntArray578[anInt7142++] = local1908.anInt4552 - local1908.anInt4560; - anIntArray578[anInt7142++] = local1908.anInt4562 - local1908.anInt4559; + intStack[isp++] = local1908.anInt4552 - local1908.anInt4560; + intStack[isp++] = local1908.anInt4562 - local1908.anInt4559; return; } @Pc(2139) MapElement local2139; if (arg0 == 5212) { local2139 = Static122.method2207(); if (local2139 == null) { - anIntArray578[anInt7142++] = -1; - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = local2139.anInt3131; + intStack[isp++] = local2139.anInt3131; local834 = local2139.anInt3125 << 28 | local2139.anInt3129 + Static30.anInt5655 << 14 | local2139.anInt3124 + Static30.anInt5648; - anIntArray578[anInt7142++] = local834; + intStack[isp++] = local834; return; } if (arg0 == 5213) { local2139 = Static364.method5248(); if (local2139 == null) { - anIntArray578[anInt7142++] = -1; - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = local2139.anInt3131; + intStack[isp++] = local2139.anInt3131; local834 = local2139.anInt3125 << 28 | local2139.anInt3129 + Static30.anInt5655 << 14 | local2139.anInt3124 + Static30.anInt5648; - anIntArray578[anInt7142++] = local834; + intStack[isp++] = local834; return; } @Pc(2289) boolean local2289; if (arg0 == 5214) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local1908 = Static186.method2819(); if (local1908 != null) { local2289 = local1908.method4088(anIntArray579, local192 & 0x3FFF, local192 >> 28 & 0x3, local192 >> 14 & 0x3FFF); @@ -4113,9 +4113,9 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5215) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; @Pc(2329) SecondaryLinkedList local2329 = Static30.method5076(local192 >> 14 & 0x3FFF, local192 & 0x3FFF); local2331 = false; for (@Pc(2336) Map local2336 = (Map) local2329.head(); local2336 != null; local2336 = (Map) local2329.next()) { @@ -4125,28 +4125,28 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } } if (local2331) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 5218) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local1908 = Static30.method5059(local192); if (local1908 == null) { - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = local1908.anInt4564; + intStack[isp++] = local1908.anInt4564; return; } if (arg0 == 5220) { - anIntArray578[anInt7142++] = Static273.anInt4403 == 100 ? 1 : 0; + intStack[isp++] = Static273.anInt4403 == 100 ? 1 : 0; return; } if (arg0 == 5221) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; Static106.method2048(local192 >> 14 & 0x3FFF, local192 & 0x3FFF); return; } @@ -4155,90 +4155,90 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean if (local1942 != null) { local1578 = local1942.method4091(Static615.anInt9389 + Static30.anInt5648, Static164.anInt2809 + Static30.anInt5655, anIntArray579); if (local1578) { - anIntArray578[anInt7142++] = anIntArray579[1]; - anIntArray578[anInt7142++] = anIntArray579[2]; + intStack[isp++] = anIntArray579[1]; + intStack[isp++] = anIntArray579[2]; return; } - anIntArray578[anInt7142++] = -1; - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = -1; - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; + intStack[isp++] = -1; return; } if (arg0 == 5223) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; Static60.method1293(local192, false, local834 & 0x3FFF, local834 >> 14 & 0x3FFF, -11493); return; } if (arg0 == 5224) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local1908 = Static186.method2819(); if (local1908 != null) { local2289 = local1908.method4088(anIntArray579, local192 & 0x3FFF, local192 >> 28 & 0x3, local192 >> 14 & 0x3FFF); if (local2289) { - anIntArray578[anInt7142++] = anIntArray579[1]; - anIntArray578[anInt7142++] = anIntArray579[2]; + intStack[isp++] = anIntArray579[1]; + intStack[isp++] = anIntArray579[2]; return; } - anIntArray578[anInt7142++] = -1; - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = -1; - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; + intStack[isp++] = -1; return; } if (arg0 == 5225) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local1908 = Static186.method2819(); if (local1908 != null) { local2289 = local1908.method4091(local192 & 0x3FFF, local192 >> 14 & 0x3FFF, anIntArray579); if (local2289) { - anIntArray578[anInt7142++] = anIntArray579[1]; - anIntArray578[anInt7142++] = anIntArray579[2]; + intStack[isp++] = anIntArray579[1]; + intStack[isp++] = anIntArray579[2]; return; } - anIntArray578[anInt7142++] = -1; - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = -1; - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; + intStack[isp++] = -1; return; } if (arg0 == 5226) { - Static688.method8975(anIntArray578[--anInt7142]); + Static688.method8975(intStack[--isp]); return; } if (arg0 == 5227) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; Static60.method1293(local192, true, local834 & 0x3FFF, local834 >> 14 & 0x3FFF, -11493); return; } if (arg0 == 5228) { - Static178.aBoolean251 = anIntArray578[--anInt7142] == 1; + Static178.aBoolean251 = intStack[--isp] == 1; return; } if (arg0 == 5229) { - anIntArray578[anInt7142++] = Static178.aBoolean251 ? 1 : 0; + intStack[isp++] = Static178.aBoolean251 ? 1 : 0; return; } if (arg0 == 5230) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; Static170.method2653(local192); return; } @Pc(2867) Linkable local2867; if (arg0 == 5231) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local1578 = anIntArray578[anInt7142 + 1] == 1; + isp -= 2; + local192 = intStack[isp]; + local1578 = intStack[isp + 1] == 1; if (Static232.aHashTable18 != null) { local2867 = Static232.aHashTable18.get((long) local192); if (local2867 != null && !local1578) { @@ -4254,19 +4254,19 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } @Pc(2914) Linkable local2914; if (arg0 == 5232) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (Static232.aHashTable18 != null) { local2914 = Static232.aHashTable18.get((long) local192); - anIntArray578[anInt7142++] = local2914 == null ? 0 : 1; + intStack[isp++] = local2914 == null ? 0 : 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 5233) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local1578 = anIntArray578[anInt7142 + 1] == 1; + isp -= 2; + local192 = intStack[isp]; + local1578 = intStack[isp + 1] == 1; if (Static268.aHashTable22 != null) { local2867 = Static268.aHashTable22.get((long) local192); if (local2867 != null && !local1578) { @@ -4281,31 +4281,31 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5234) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (Static268.aHashTable22 != null) { local2914 = Static268.aHashTable22.get((long) local192); - anIntArray578[anInt7142++] = local2914 == null ? 0 : 1; + intStack[isp++] = local2914 == null ? 0 : 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 5235) { - anIntArray578[anInt7142++] = Static30.aClass2_Sub2_Sub13_3 == null ? -1 : Static30.aClass2_Sub2_Sub13_3.anInt4563; + intStack[isp++] = Static30.aClass2_Sub2_Sub13_3 == null ? -1 : Static30.aClass2_Sub2_Sub13_3.anInt4563; return; } if (arg0 == 5236) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; local109 = local834 >> 14 & 0x3FFF; local115 = local834 & 0x3FFF; local375 = Static687.method8957(local192, local115, local109); if (local375 < 0) { - anIntArray578[anInt7142++] = -1; + intStack[isp++] = -1; return; } - anIntArray578[anInt7142++] = local375; + intStack[isp++] = local375; return; } if (arg0 == 5237) { @@ -4314,11 +4314,11 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } } else if (arg0 < 5400) { if (arg0 == 5300) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; Static409.method5657(3, local192, false, local834); - anIntArray578[anInt7142++] = Static316.aFrame8 == null ? 0 : 1; + intStack[isp++] = Static316.aFrame8 == null ? 0 : 1; return; } if (arg0 == 5301) { @@ -4329,14 +4329,14 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } if (arg0 == 5302) { @Pc(3186) Class273[] local3186 = Static587.method7710(); - anIntArray578[anInt7142++] = local3186.length; + intStack[isp++] = local3186.length; return; } if (arg0 == 5303) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; @Pc(3210) Class273[] local3210 = Static587.method7710(); - anIntArray578[anInt7142++] = local3210[local192].anInt6918; - anIntArray578[anInt7142++] = local3210[local192].anInt6912; + intStack[isp++] = local3210[local192].anInt6918; + intStack[isp++] = local3210[local192].anInt6912; return; } if (arg0 == 5305) { @@ -4351,15 +4351,15 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean break; } } - anIntArray578[anInt7142++] = local109; + intStack[isp++] = local109; return; } if (arg0 == 5306) { - anIntArray578[anInt7142++] = Static36.method978(3); + intStack[isp++] = Static36.method978(3); return; } if (arg0 == 5307) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (local192 >= 1 && local192 <= 2) { Static409.method5657(local192, -1, false, -1); return; @@ -4367,15 +4367,15 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5308) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub1_1.method1485(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub1_1.method1485(); return; } if (arg0 == 5309) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (local192 >= 1 && local192 <= 2) { Static400.aClass2_Sub34_28.method5104(local192, Static400.aClass2_Sub34_28.aPreference_Sub1_1); Static400.aClass2_Sub34_28.method5104(local192, Static400.aClass2_Sub34_28.aPreference_Sub1_2); - Static666.method8693(1); + Static666.write(1); return; } return; @@ -4384,10 +4384,10 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean @Pc(3561) int local3561; if (arg0 < 5500) { if (arg0 == 5400) { - anInt7139 -= 2; - local95 = aStringArray37[anInt7139]; - local101 = aStringArray37[anInt7139 + 1]; - local109 = anIntArray578[--anInt7142]; + ssp -= 2; + local95 = stringStack[ssp]; + local101 = stringStack[ssp + 1]; + local109 = intStack[--isp]; @Pc(3411) Connection local3411 = Connection.getActiveConnection(); @Pc(3417) OutboundPacket local3417 = OutboundPacket.create(Static563.aClientProt102, local3411.random); local3417.buffer.p1(Static231.method3379(local95) + Static231.method3379(local101) + 1); @@ -4398,8 +4398,8 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5401) { - anInt7142 -= 2; - Static637.aShortArray132[anIntArray578[anInt7142]] = (short) Static166.method2616(anIntArray578[anInt7142 + 1]); + isp -= 2; + Static637.aShortArray132[intStack[isp]] = (short) Static166.method2616(intStack[isp + 1]); ObjTypeList.objTypes.method2482(); ObjTypeList.objTypes.method2484(); Static690.aNpcTypeList2.method7091(); @@ -4407,23 +4407,23 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5405) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; if (local192 >= 0 && local192 < 2) { Static603.anIntArrayArrayArray18[local192] = new int[local834 << 1][4]; } return; } if (arg0 == 5406) { - anInt7142 -= 7; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1] << 1; - local109 = anIntArray578[anInt7142 + 2]; - local115 = anIntArray578[anInt7142 + 3]; - local375 = anIntArray578[anInt7142 + 4]; - local3561 = anIntArray578[anInt7142 + 5]; - @Pc(3567) int local3567 = anIntArray578[anInt7142 + 6]; + isp -= 7; + local192 = intStack[isp]; + local834 = intStack[isp + 1] << 1; + local109 = intStack[isp + 2]; + local115 = intStack[isp + 3]; + local375 = intStack[isp + 4]; + local3561 = intStack[isp + 5]; + @Pc(3567) int local3567 = intStack[isp + 6]; if (local192 >= 0 && local192 < 2 && Static603.anIntArrayArrayArray18[local192] != null && local834 >= 0 && local834 < Static603.anIntArrayArrayArray18[local192].length) { Static603.anIntArrayArrayArray18[local192][local834] = new int[] { (local109 >> 14 & 0x3FFF) << 9, local115 << 2, (local109 & 0x3FFF) << 9, local3567 }; Static603.anIntArrayArrayArray18[local192][local834 + 1] = new int[] { (local375 >> 14 & 0x3FFF) << 9, local3561 << 2, (local375 & 0x3FFF) << 9 }; @@ -4431,8 +4431,8 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5407) { - local192 = Static603.anIntArrayArrayArray18[anIntArray578[--anInt7142]].length >> 1; - anIntArray578[anInt7142++] = local192; + local192 = Static603.anIntArrayArrayArray18[intStack[--isp]].length >> 1; + intStack[isp++] = local192; return; } if (arg0 == 5411) { @@ -4451,34 +4451,34 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean if (arg0 == 5419) { local95 = ""; if (Static439.aPrivilegedRequest4 != null) { - if (Static439.aPrivilegedRequest4.anObject13 == null) { - local95 = Static419.method5756(Static439.aPrivilegedRequest4.anInt6788); + if (Static439.aPrivilegedRequest4.result == null) { + local95 = Static419.method5756(Static439.aPrivilegedRequest4.intArg2); } else { - local95 = (String) Static439.aPrivilegedRequest4.anObject13; + local95 = (String) Static439.aPrivilegedRequest4.result; } } - aStringArray37[anInt7139++] = local95; + stringStack[ssp++] = local95; return; } if (arg0 == 5420) { - anIntArray578[anInt7142++] = Static446.aSignlink6.aBoolean781 ? 0 : 1; + intStack[isp++] = Static446.aSignlink6.aBoolean781 ? 0 : 1; return; } if (arg0 == 5421) { if (Static316.aFrame8 != null) { Static409.method5657(Static400.aClass2_Sub34_28.aPreference_Sub1_1.method1485(), -1, false, -1); } - local95 = aStringArray37[--anInt7139]; - local1578 = anIntArray578[--anInt7142] == 1; + local95 = stringStack[--ssp]; + local1578 = intStack[--isp] == 1; local198 = Static659.method8605() + local95; Static664.method8655(Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915() == 1, local198, local1578, Static446.aSignlink6); return; } if (arg0 == 5422) { - anInt7139 -= 2; - local95 = aStringArray37[anInt7139]; - local101 = aStringArray37[anInt7139 + 1]; - local109 = anIntArray578[--anInt7142]; + ssp -= 2; + local95 = stringStack[ssp]; + local101 = stringStack[ssp + 1]; + local109 = intStack[--isp]; if (local95.length() > 0) { if (Static685.aStringArray47 == null) { Static685.aStringArray47 = new String[Static390.anIntArray476[Static392.clientModeGame.id]]; @@ -4494,22 +4494,22 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5423) { - System.out.println(aStringArray37[--anInt7139]); + System.out.println(stringStack[--ssp]); return; } if (arg0 == 5424) { - anInt7142 -= 11; - Static719.anInt10504 = anIntArray578[anInt7142]; - Static514.anInt7677 = anIntArray578[anInt7142 + 1]; - Static183.anInt3022 = anIntArray578[anInt7142 + 2]; - Static405.anInt6255 = anIntArray578[anInt7142 + 3]; - Static63.anInt1474 = anIntArray578[anInt7142 + 4]; - Static282.anInt4417 = anIntArray578[anInt7142 + 5]; - Static337.anInt5561 = anIntArray578[anInt7142 + 6]; - Static176.anInt7532 = anIntArray578[anInt7142 + 7]; - Static282.anInt4419 = anIntArray578[anInt7142 + 8]; - Static563.anInt8455 = anIntArray578[anInt7142 + 9]; - Static634.anInt9510 = anIntArray578[anInt7142 + 10]; + isp -= 11; + Static719.anInt10504 = intStack[isp]; + Static514.anInt7677 = intStack[isp + 1]; + Static183.anInt3022 = intStack[isp + 2]; + Static405.anInt6255 = intStack[isp + 3]; + Static63.anInt1474 = intStack[isp + 4]; + Static282.anInt4417 = intStack[isp + 5]; + Static337.anInt5561 = intStack[isp + 6]; + Static176.anInt7532 = intStack[isp + 7]; + Static282.anInt4419 = intStack[isp + 8]; + Static563.anInt8455 = intStack[isp + 9]; + Static634.anInt9510 = intStack[isp + 10]; client.sprites.isFileReady(Static63.anInt1474); client.sprites.isFileReady(Static282.anInt4417); client.sprites.isFileReady(Static337.anInt5561); @@ -4532,24 +4532,24 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5426) { - anInt7142 -= 2; - ParticleNode_Sub2_Sub4_Sub1.lb = anIntArray578[anInt7142]; - Static39.anInt950 = anIntArray578[anInt7142 + 1]; + isp -= 2; + ParticleNode_Sub2_Sub4_Sub1.lb = intStack[isp]; + Static39.anInt950 = intStack[isp + 1]; return; } if (arg0 == 5427) { - anInt7142 -= 2; + isp -= 2; return; } if (arg0 == 5428) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - anIntArray578[anInt7142++] = Static251.method3549(local192, local834) ? 1 : 0; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + intStack[isp++] = Static251.method3549(local192, local834) ? 1 : 0; return; } if (arg0 == 5429) { - Static231.method3381(false, false, aStringArray37[--anInt7139]); + Static231.method3381(false, false, stringStack[--ssp]); return; } if (arg0 == 5430) { @@ -4582,74 +4582,74 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } } } - aStringArray37[anInt7139++] = local95; + stringStack[ssp++] = local95; return; } if (arg0 == 5433) { - Static143.anInt4059 = anIntArray578[--anInt7142]; + Static143.anInt4059 = intStack[--isp]; return; } if (arg0 == 5435) { - anIntArray578[anInt7142++] = Static98.aBoolean191 ? 1 : 0; + intStack[isp++] = Static98.aBoolean191 ? 1 : 0; return; } if (arg0 == 5436) { if (Static292.aClass2_Sub43_2.anInt7603 < 6) { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (Static292.aClass2_Sub43_2.anInt7603 == 6 && Static292.aClass2_Sub43_2.anInt7607 < 10) { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; return; } } else if (arg0 < 5600) { if (arg0 == 5500) { - anInt7142 -= 4; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; - local115 = anIntArray578[anInt7142 + 3]; - Static319.method4595((local192 >> 14 & 0x3FFF) - Static691.anInt10367, false, local109, local834 << 2, (local192 & 0x3FFF) - Static116.anInt2270, local115); + isp -= 4; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; + local115 = intStack[isp + 3]; + Static319.method4595((local192 >> 14 & 0x3FFF) - Static691.originX, false, local109, local834 << 2, (local192 & 0x3FFF) - Static116.originZ, local115); return; } if (arg0 == 5501) { - anInt7142 -= 4; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; - local115 = anIntArray578[anInt7142 + 3]; - Static638.method8397(local109, (local192 & 0x3FFF) - Static116.anInt2270, (local192 >> 14 & 0x3FFF) - Static691.anInt10367, local834 << 2, local115); + isp -= 4; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; + local115 = intStack[isp + 3]; + Static638.method8397(local109, (local192 & 0x3FFF) - Static116.originZ, (local192 >> 14 & 0x3FFF) - Static691.originX, local834 << 2, local115); return; } if (arg0 == 5502) { - anInt7142 -= 6; - local192 = anIntArray578[anInt7142]; + isp -= 6; + local192 = intStack[isp]; if (local192 >= 2) { throw new RuntimeException(); } Static197.anInt3260 = local192; - local834 = anIntArray578[anInt7142 + 1]; + local834 = intStack[isp + 1]; if (local834 + 1 >= Static603.anIntArrayArrayArray18[Static197.anInt3260].length >> 1) { throw new RuntimeException(); } Static303.anInt4868 = local834; Static260.anInt4244 = 0; - Static71.anInt1581 = anIntArray578[anInt7142 + 2]; - Static410.anInt6322 = anIntArray578[anInt7142 + 3]; - local109 = anIntArray578[anInt7142 + 4]; + Static71.anInt1581 = intStack[isp + 2]; + Static410.anInt6322 = intStack[isp + 3]; + local109 = intStack[isp + 4]; if (local109 >= 2) { throw new RuntimeException(); } Static374.anInt5907 = local109; - local115 = anIntArray578[anInt7142 + 5]; + local115 = intStack[isp + 5]; if (local115 + 1 >= Static603.anIntArrayArrayArray18[Static374.anInt5907].length >> 1) { throw new RuntimeException(); } Static591.anInt8739 = local115; - Static511.anInt7645 = 3; + Static511.cameraType = 3; Static693.anInt10383 = -1; Static692.anInt10376 = -1; return; @@ -4659,16 +4659,16 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5504) { - anInt7142 -= 2; - Static471.method6408(anIntArray578[anInt7142 + 1], anIntArray578[anInt7142]); + isp -= 2; + Static471.method6408(intStack[isp + 1], intStack[isp]); return; } if (arg0 == 5505) { - anIntArray578[anInt7142++] = (int) Static479.aFloat123 >> 3; + intStack[isp++] = (int) Static479.aFloat123 >> 3; return; } if (arg0 == 5506) { - anIntArray578[anInt7142++] = (int) Static171.aFloat64 >> 3; + intStack[isp++] = (int) Static171.aFloat64 >> 3; return; } if (arg0 == 5507) { @@ -4688,16 +4688,16 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5511) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local834 = local192 >> 14 & 0x3FFF; local109 = local192 & 0x3FFF; - local834 -= Static691.anInt10367; + local834 -= Static691.originX; if (local834 < 0) { local834 = 0; } else if (local834 >= Static720.anInt10859) { local834 = Static720.anInt10859; } - local109 -= Static116.anInt2270; + local109 -= Static116.originZ; if (local109 < 0) { local109 = 0; } else if (local109 >= Static501.anInt7568) { @@ -4705,7 +4705,7 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } Static433.anInt6262 = (local834 << 9) + 256; Static249.anInt4018 = (local109 << 9) + 256; - Static511.anInt7645 = 4; + Static511.cameraType = 4; Static693.anInt10383 = -1; Static692.anInt10376 = -1; return; @@ -4715,25 +4715,25 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5514) { - Static582.anInt8630 = anIntArray578[--anInt7142]; + Static582.anInt8630 = intStack[--isp]; return; } if (arg0 == 5516) { - anIntArray578[anInt7142++] = Static582.anInt8630; + intStack[isp++] = Static582.anInt8630; return; } if (arg0 == 5517) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (local192 == -1) { local834 = local192 >> 14 & 0x3FFF; local109 = local192 & 0x3FFF; - local834 -= Static691.anInt10367; + local834 -= Static691.originX; if (local834 < 0) { local834 = 0; } else if (local834 >= Static720.anInt10859) { local834 = Static720.anInt10859; } - local109 -= Static116.anInt2270; + local109 -= Static116.originZ; if (local109 < 0) { local109 = 0; } else if (local109 >= Static501.anInt7568) { @@ -4748,15 +4748,15 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5547) { - anIntArray578[anInt7142++] = Static511.anInt7645 == 1 ? 1 : 0; + intStack[isp++] = Static511.cameraType == 1 ? 1 : 0; return; } } else if (arg0 < 5700) { if (arg0 == 5600) { - anInt7139 -= 2; - local95 = aStringArray37[anInt7139]; - local101 = aStringArray37[anInt7139 + 1]; - local109 = anIntArray578[--anInt7142]; + ssp -= 2; + local95 = stringStack[ssp]; + local101 = stringStack[ssp + 1]; + local109 = intStack[--isp]; Static57.method1232(local109, local101, local95); return; } @@ -4771,63 +4771,63 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5604) { - anInt7139--; + ssp--; if (Static283.gameState != 3) { return; } - if (!Static242.method3500() && Static6.anInt95 == 0) { - Static104.method2029(aStringArray37[anInt7139]); + if (!Static242.method3500() && Static6.step == 0) { + Static104.method2029(stringStack[ssp]); return; } return; } if (arg0 == 5605) { - anInt7139 -= 2; - anInt7142 -= 2; + ssp -= 2; + isp -= 2; if (Static283.gameState != 3) { return; } - if (!Static242.method3500() && Static6.anInt95 == 0) { - Static81.method1591(aStringArray37[anInt7139], anIntArray578[anInt7142], aStringArray37[anInt7139 + 1], anIntArray578[anInt7142 + 1] == 1); + if (!Static242.method3500() && Static6.step == 0) { + Static81.method1591(stringStack[ssp], intStack[isp], stringStack[ssp + 1], intStack[isp + 1] == 1); return; } return; } if (arg0 == 5606) { - if (Static6.anInt95 == 0) { + if (Static6.step == 0) { Static580.anInt8621 = -2; } return; } if (arg0 == 5607) { - anIntArray578[anInt7142++] = Static169.anInt2855; + intStack[isp++] = Static169.anInt2855; return; } if (arg0 == 5608) { - anIntArray578[anInt7142++] = Static118.anInt2292; + intStack[isp++] = Static118.anInt2292; return; } if (arg0 == 5609) { - anIntArray578[anInt7142++] = Static580.anInt8621; + intStack[isp++] = Static580.anInt8621; return; } if (arg0 == 5611) { - anIntArray578[anInt7142++] = Static329.anInt1749; + intStack[isp++] = Static329.anInt1749; return; } if (arg0 == 5612) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; Static674.method8789(local192); return; } if (arg0 == 5613) { - anIntArray578[anInt7142++] = Static169.anInt2855; + intStack[isp++] = Static169.anInt2855; return; } if (arg0 == 5615) { - anInt7139 -= 2; - local95 = aStringArray37[anInt7139]; - local101 = aStringArray37[anInt7139 + 1]; + ssp -= 2; + local95 = stringStack[ssp]; + local101 = stringStack[ssp + 1]; Static218.method3188(local101, local95); return; } @@ -4836,24 +4836,24 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5617) { - anIntArray578[anInt7142++] = Static284.anInt4583; + intStack[isp++] = Static284.anInt4583; return; } if (arg0 == 5618) { - anInt7142--; + isp--; return; } if (arg0 == 5619) { - anInt7142--; + isp--; return; } if (arg0 == 5620) { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 5621) { - anInt7139 -= 2; - anInt7142 -= 2; + ssp -= 2; + isp -= 2; return; } if (arg0 == 5622) { @@ -4861,19 +4861,19 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } if (arg0 == 5623) { if (Static265.aByteArray44 != null) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 5624) { - anIntArray578[anInt7142++] = (int) (Static416.aLong208 >> 32); - anIntArray578[anInt7142++] = (int) (Static416.aLong208 & 0xFFFFFFFFFFFFFFFFL); + intStack[isp++] = (int) (Static416.aLong208 >> 32); + intStack[isp++] = (int) (Static416.aLong208 & 0xFFFFFFFFFFFFFFFFL); return; } if (arg0 == 5625) { - anIntArray578[anInt7142++] = Static477.aBoolean543 ? 1 : 0; + intStack[isp++] = Static477.aBoolean543 ? 1 : 0; return; } if (arg0 == 5626) { @@ -4882,20 +4882,20 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5627) { - anIntArray578[anInt7142++] = Static78.anInt1626; - anIntArray578[anInt7142++] = Static383.anInt6001; - anIntArray578[anInt7142++] = Static673.anInt10079; + intStack[isp++] = Static78.anInt1626; + intStack[isp++] = Static383.anInt6001; + intStack[isp++] = Static673.anInt10079; Static78.anInt1626 = -2; Static383.anInt6001 = -1; Static673.anInt10079 = -1; return; } if (arg0 == 5628) { - anIntArray578[anInt7142++] = Static242.method3500() ? 1 : 0; + intStack[isp++] = Static242.method3500() ? 1 : 0; return; } if (arg0 == 5629) { - anIntArray578[anInt7142++] = Static660.anInt9837; + intStack[isp++] = Static660.anInt9837; return; } if (arg0 == 5630) { @@ -4903,125 +4903,125 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 5631) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; Static151.method9291(local192, local834); return; } if (arg0 == 5632) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; Static303.method4428(local192); return; } if (arg0 == 5633) { - anIntArray578[anInt7142++] = Static356.anInt5780; + intStack[isp++] = Static356.anInt5780; return; } } else if (arg0 < 6100) { if (arg0 == 6001) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; Static400.aClass2_Sub34_28.method5104(local192, Static400.aClass2_Sub34_28.aPreference_Sub22_1); Static449.method6116(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } @Pc(5337) boolean local5337; if (arg0 == 6002) { - local5337 = anIntArray578[--anInt7142] == 1; + local5337 = intStack[--isp] == 1; Static400.aClass2_Sub34_28.method5104(local5337 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub19_1); Static400.aClass2_Sub34_28.method5104(local5337 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub19_2); Static449.method6116(); Static77.method1561(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6003) { - local5337 = anIntArray578[--anInt7142] == 1; + local5337 = intStack[--isp] == 1; Static400.aClass2_Sub34_28.method5104(local5337 ? 2 : 1, Static400.aClass2_Sub34_28.aPreference_Sub4_1); Static400.aClass2_Sub34_28.method5104(local5337 ? 2 : 1, Static400.aClass2_Sub34_28.aPreference_Sub4_2); Static77.method1561(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6005) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub6_1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub6_1); Static449.method6116(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6007) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142], Static400.aClass2_Sub34_28.aPreference_Sub27_1); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp], Static400.aClass2_Sub34_28.aPreference_Sub27_1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6008) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub8_1); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub8_1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6010) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub7_1); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub7_1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6011) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142], Static400.aClass2_Sub34_28.aPreference_Sub12_1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp], Static400.aClass2_Sub34_28.aPreference_Sub12_1); Static449.method6116(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6012) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub24_1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub24_1); Static296.method4362(); Static218.method3187(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6014) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 1 ? 2 : 0, Static400.aClass2_Sub34_28.aPreference_Sub26_1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 1 ? 2 : 0, Static400.aClass2_Sub34_28.aPreference_Sub26_1); Static449.method6116(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6015) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub16_1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub16_1); Static449.method6116(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6016) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142], Static400.aClass2_Sub34_28.aPreference_Sub13_1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp], Static400.aClass2_Sub34_28.aPreference_Sub13_1); Static32.method880(Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915(), false); - Static666.method8693(1); + Static666.write(1); return; } if (arg0 == 6017) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub17_1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub17_1); Static150.method2455(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6018) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142], Static400.aClass2_Sub34_28.aPreference_Sub25_3); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp], Static400.aClass2_Sub34_28.aPreference_Sub25_3); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6019) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local834 = Static400.aClass2_Sub34_28.aPreference_Sub25_2.method7208(); if (local192 != local834) { if (Static109.method2070(Static283.gameState)) { @@ -5037,43 +5037,43 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } } Static400.aClass2_Sub34_28.method5104(local192, Static400.aClass2_Sub34_28.aPreference_Sub25_2); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; } return; } if (arg0 == 6020) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142], Static400.aClass2_Sub34_28.aPreference_Sub25_1); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp], Static400.aClass2_Sub34_28.aPreference_Sub25_1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6021) { local192 = Static400.aClass2_Sub34_28.aPreference_Sub4_1.method2143(); - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 1 ? 0 : local192, Static400.aClass2_Sub34_28.aPreference_Sub4_2); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 1 ? 0 : local192, Static400.aClass2_Sub34_28.aPreference_Sub4_2); Static77.method1561(); return; } if (arg0 == 6023) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; Static400.aClass2_Sub34_28.method5104(local192, Static400.aClass2_Sub34_28.aPreference_Sub28_1); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6024) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142], Static400.aClass2_Sub34_28.aPreference_Sub13_2); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp], Static400.aClass2_Sub34_28.aPreference_Sub13_2); + Static666.write(1); return; } if (arg0 == 6025) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142], Static400.aClass2_Sub34_28.aPreference_Sub5_1); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp], Static400.aClass2_Sub34_28.aPreference_Sub5_1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6027) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (local192 < 0 || local192 > 1) { local192 = 0; } @@ -5081,23 +5081,23 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 6028) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 0 ? 0 : 1, Static400.aClass2_Sub34_28.aPreference_Sub14_1); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 0 ? 0 : 1, Static400.aClass2_Sub34_28.aPreference_Sub14_1); + Static666.write(1); return; } if (arg0 == 6029) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142], Static400.aClass2_Sub34_28.aPreference_Sub27_1); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp], Static400.aClass2_Sub34_28.aPreference_Sub27_1); + Static666.write(1); return; } if (arg0 == 6030) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 0 ? 0 : 1, Static400.aClass2_Sub34_28.aPreference_Sub23_1); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 0 ? 0 : 1, Static400.aClass2_Sub34_28.aPreference_Sub23_1); + Static666.write(1); Static449.method6116(); return; } if (arg0 == 6031) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (local192 < 0 || local192 > 5) { local192 = 2; } @@ -5105,50 +5105,50 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 6032) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local1578 = anIntArray578[anInt7142 + 1] == 1; + isp -= 2; + local192 = intStack[isp]; + local1578 = intStack[isp + 1] == 1; Static400.aClass2_Sub34_28.method5104(local192, Static400.aClass2_Sub34_28.aPreference_Sub29_2); if (!local1578) { Static400.aClass2_Sub34_28.method5104(0, Static400.aClass2_Sub34_28.aPreference_Sub15_1); } - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6033) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142], Static400.aClass2_Sub34_28.aPreference_Sub21_1); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp], Static400.aClass2_Sub34_28.aPreference_Sub21_1); + Static666.write(1); return; } if (arg0 == 6034) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub30_1); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 1 ? 1 : 0, Static400.aClass2_Sub34_28.aPreference_Sub30_1); + Static666.write(1); Static296.method4362(); Static503.aBoolean578 = false; return; } if (arg0 == 6035) { local192 = Static400.aClass2_Sub34_28.aPreference_Sub19_1.method5960(); - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142] == 1 ? 1 : local192, Static400.aClass2_Sub34_28.aPreference_Sub19_2); + Static400.aClass2_Sub34_28.method5104(intStack[--isp] == 1 ? 1 : local192, Static400.aClass2_Sub34_28.aPreference_Sub19_2); Static449.method6116(); Static77.method1561(); return; } if (arg0 == 6036) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142], Static400.aClass2_Sub34_28.aPreference_Sub18_1); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp], Static400.aClass2_Sub34_28.aPreference_Sub18_1); + Static666.write(1); Static284.aBoolean355 = true; return; } if (arg0 == 6037) { - Static400.aClass2_Sub34_28.method5104(anIntArray578[--anInt7142], Static400.aClass2_Sub34_28.lb); - Static666.method8693(1); + Static400.aClass2_Sub34_28.method5104(intStack[--isp], Static400.aClass2_Sub34_28.lb); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 6038) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local834 = Static400.aClass2_Sub34_28.aPreference_Sub25_4.method7208(); if (local192 != local834 && Static588.anInt8692 == Static597.anInt8821) { if (!Static109.method2070(Static283.gameState)) { @@ -5164,237 +5164,237 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } } Static400.aClass2_Sub34_28.method5104(local192, Static400.aClass2_Sub34_28.aPreference_Sub25_4); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; } return; } if (arg0 == 6039) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (local192 > 255 || local192 < 0) { local192 = 0; } if (local192 != Static400.aClass2_Sub34_28.aPreference_Sub11_1.method3603()) { Static400.aClass2_Sub34_28.method5104(local192, Static400.aClass2_Sub34_28.aPreference_Sub11_1); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; } return; } if (arg0 == 6040) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (local192 != Static400.aClass2_Sub34_28.aPreference_Sub3_1.method2120()) { Static400.aClass2_Sub34_28.method5104(local192, Static400.aClass2_Sub34_28.aPreference_Sub3_1); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; Static498.method6646(); } return; } if (arg0 == 6041) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (local192 != Static400.aClass2_Sub34_28.aPreference_Sub2_1.method1989()) { Static400.aClass2_Sub34_28.method5104(local192, Static400.aClass2_Sub34_28.aPreference_Sub2_1); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; } return; } } else if (arg0 < 6200) { if (arg0 == 6101) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub22_1.method6769(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub22_1.method6769(); return; } if (arg0 == 6102) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub19_1.method5960() == 1 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub19_1.method5960() == 1 ? 1 : 0; return; } if (arg0 == 6103) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub4_1.method2143() == 2 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub4_1.method2143() == 2 ? 1 : 0; return; } if (arg0 == 6105) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub6_1.method2714() == 1 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub6_1.method2714() == 1 ? 1 : 0; return; } if (arg0 == 6107) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub27_1.method7667(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub27_1.method7667(); return; } if (arg0 == 6108) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub8_1.method3176() == 1 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub8_1.method3176() == 1 ? 1 : 0; return; } if (arg0 == 6110) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub7_1.method2905() == 1 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub7_1.method2905() == 1 ? 1 : 0; return; } if (arg0 == 6111) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub12_1.method4364(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub12_1.method4364(); return; } if (arg0 == 6112) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub24_1.method7082() == 1 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub24_1.method7082() == 1 ? 1 : 0; return; } if (arg0 == 6114) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub26_1.method7463() == 2 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub26_1.method7463() == 2 ? 1 : 0; return; } if (arg0 == 6115) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub16_1.method5507() == 1 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub16_1.method5507() == 1 ? 1 : 0; return; } if (arg0 == 6116) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub13_1.method4373(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub13_1.method4373(); return; } if (arg0 == 6117) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub17_1.method5667() == 1 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub17_1.method5667() == 1 ? 1 : 0; return; } if (arg0 == 6118) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub25_3.method7208(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub25_3.method7208(); return; } if (arg0 == 6119) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub25_2.method7208(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub25_2.method7208(); return; } if (arg0 == 6120) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub25_1.method7208(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub25_1.method7208(); return; } if (arg0 == 6123) { - anIntArray578[anInt7142++] = Static436.method3416(); + intStack[isp++] = Static436.method3416(); return; } if (arg0 == 6124) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub13_2.method4373(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub13_2.method4373(); return; } if (arg0 == 6125) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub5_1.method2172(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub5_1.method2172(); return; } if (arg0 == 6127) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub20_1.method6108() == 1 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub20_1.method6108() == 1 ? 1 : 0; return; } if (arg0 == 6128) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub14_1.method5302() == 1 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub14_1.method5302() == 1 ? 1 : 0; return; } if (arg0 == 6129) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub27_1.method7667(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub27_1.method7667(); return; } if (arg0 == 6130) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub23_1.method7054() == 1 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub23_1.method7054() == 1 ? 1 : 0; return; } if (arg0 == 6131) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915(); return; } if (arg0 == 6132) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub29_2.method7915(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub29_2.method7915(); return; } if (arg0 == 6133) { - anIntArray578[anInt7142++] = Static446.aSignlink6.aBoolean781 && !Static446.aSignlink6.aBoolean779 ? 1 : 0; + intStack[isp++] = Static446.aSignlink6.aBoolean781 && !Static446.aSignlink6.aBoolean779 ? 1 : 0; return; } if (arg0 == 6135) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub21_1.method6360(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub21_1.method6360(); return; } if (arg0 == 6136) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub30_1.method8356() == 1 ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub30_1.method8356() == 1 ? 1 : 0; return; } if (arg0 == 6138) { - anIntArray578[anInt7142++] = Static363.method6235(200, Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915()); + intStack[isp++] = Static363.method6235(200, Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915()); return; } if (arg0 == 6139) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub18_1.method5767(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub18_1.method5767(); return; } if (arg0 == 6142) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.lb.method7208(); + intStack[isp++] = Static400.aClass2_Sub34_28.lb.method7208(); return; } if (arg0 == 6143) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub25_4.method7208(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub25_4.method7208(); return; } if (arg0 == 6144) { - anIntArray578[anInt7142++] = Static3.aBoolean4 ? 1 : 0; + intStack[isp++] = Static3.aBoolean4 ? 1 : 0; return; } if (arg0 == 6145) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub11_1.method3603(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub11_1.method3603(); return; } if (arg0 == 6146) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub3_1.method2120(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub3_1.method2120(); return; } if (arg0 == 6147) { - anIntArray578[anInt7142++] = Static292.aClass2_Sub43_2.anInt7610 < 512 || Static3.aBoolean4 || Static171.aBoolean245 ? 1 : 0; + intStack[isp++] = Static292.aClass2_Sub43_2.anInt7610 < 512 || Static3.aBoolean4 || Static171.aBoolean245 ? 1 : 0; return; } if (arg0 == 6148) { - anIntArray578[anInt7142++] = Static416.aBoolean472 ? 1 : 0; + intStack[isp++] = Static416.aBoolean472 ? 1 : 0; return; } if (arg0 == 6149) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub2_1.method1989(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub2_1.method1989(); return; } } else if (arg0 < 6300) { if (arg0 == 6200) { - anInt7142 -= 2; - Static640.aShort122 = (short) anIntArray578[anInt7142]; + isp -= 2; + Static640.aShort122 = (short) intStack[isp]; if (Static640.aShort122 <= 0) { Static640.aShort122 = 256; } - Static640.aShort121 = (short) anIntArray578[anInt7142 + 1]; + Static640.aShort121 = (short) intStack[isp + 1]; if (Static640.aShort121 <= 0) { Static640.aShort121 = 205; } return; } if (arg0 == 6201) { - anInt7142 -= 2; - Static228.aShort45 = (short) anIntArray578[anInt7142]; + isp -= 2; + Static228.aShort45 = (short) intStack[isp]; if (Static228.aShort45 <= 0) { Static228.aShort45 = 256; } - Static502.zoom = (short) anIntArray578[anInt7142 + 1]; + Static502.zoom = (short) intStack[isp + 1]; if (Static502.zoom <= 0) { Static502.zoom = 320; } return; } if (arg0 == 6202) { - anInt7142 -= 4; - Static25.aShort1 = (short) anIntArray578[anInt7142]; + isp -= 4; + Static25.aShort1 = (short) intStack[isp]; if (Static25.aShort1 <= 0) { Static25.aShort1 = 1; } - Static598.aShort120 = (short) anIntArray578[anInt7142 + 1]; + Static598.aShort120 = (short) intStack[isp + 1]; if (Static598.aShort120 <= 0) { Static598.aShort120 = 32767; } else if (Static598.aShort120 < Static25.aShort1) { Static598.aShort120 = Static25.aShort1; } - Static552.aShort123 = (short) anIntArray578[anInt7142 + 2]; + Static552.aShort123 = (short) intStack[isp + 2]; if (Static552.aShort123 <= 0) { Static552.aShort123 = 1; } - Static306.aShort59 = (short) anIntArray578[anInt7142 + 3]; + Static306.aShort59 = (short) intStack[isp + 3]; if (Static306.aShort59 <= 0) { Static306.aShort59 = 32767; return; @@ -5405,49 +5405,49 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 6203) { - Static498.method6643(0, false, 0, Static610.aComponent16.anInt3746, Static610.aComponent16.anInt3802); - anIntArray578[anInt7142++] = Static242.anInt3971; - anIntArray578[anInt7142++] = Static200.anInt3305; + Static498.method6643(0, false, 0, Static610.aComponent16.height, Static610.aComponent16.width); + intStack[isp++] = Static242.anInt3971; + intStack[isp++] = Static200.anInt3305; return; } if (arg0 == 6204) { - anIntArray578[anInt7142++] = Static228.aShort45; - anIntArray578[anInt7142++] = Static502.zoom; + intStack[isp++] = Static228.aShort45; + intStack[isp++] = Static502.zoom; return; } if (arg0 == 6205) { - anIntArray578[anInt7142++] = Static640.aShort122; - anIntArray578[anInt7142++] = Static640.aShort121; + intStack[isp++] = Static640.aShort122; + intStack[isp++] = Static640.aShort121; return; } } else if (arg0 < 6400) { if (arg0 == 6300) { - anIntArray578[anInt7142++] = (int) (Static588.currentTimeWithDrift() / 60000L); + intStack[isp++] = (int) (Static588.currentTimeWithDrift() / 60000L); return; } if (arg0 == 6301) { - anIntArray578[anInt7142++] = (int) (Static588.currentTimeWithDrift() / 86400000L) - 11745; + intStack[isp++] = (int) (Static588.currentTimeWithDrift() / 86400000L) - 11745; return; } if (arg0 == 6302) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; @Pc(7384) long local7384 = Static40.method1026(local834, local109, local192); local3561 = Static68.method3585(local7384); if (local109 < 1970) { local3561--; } - anIntArray578[anInt7142++] = local3561; + intStack[isp++] = local3561; return; } if (arg0 == 6303) { - anIntArray578[anInt7142++] = Static614.method8242(Static588.currentTimeWithDrift()); + intStack[isp++] = Static614.getYear(Static588.currentTimeWithDrift()); return; } if (arg0 == 6304) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local1578 = true; if (local192 < 0) { local1578 = (local192 + 1) % 4 == 0; @@ -5460,49 +5460,49 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } else if (local192 % 400 != 0) { local1578 = false; } - anIntArray578[anInt7142++] = local1578 ? 1 : 0; + intStack[isp++] = local1578 ? 1 : 0; return; } if (arg0 == 6305) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; @Pc(7512) int[] local7512 = Static212.method3135(local192); - Static734.method7695(local7512, 0, anIntArray578, anInt7142, 3); - anInt7142 += 3; + Static734.method7695(local7512, 0, intStack, isp, 3); + isp += 3; return; } if (arg0 == 6306) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = (int) (Static38.method1003(local192) / 60000L); + local192 = intStack[--isp]; + intStack[isp++] = (int) (Static38.method1003(local192) / 60000L); return; } } else if (arg0 < 6500) { if (arg0 == 6405) { - anIntArray578[anInt7142++] = Static21.method8119() ? 1 : 0; + intStack[isp++] = Static21.showVideoAd() ? 1 : 0; return; } if (arg0 == 6406) { - anIntArray578[anInt7142++] = Static385.method5421() ? 1 : 0; + intStack[isp++] = Static385.isShowingVideoAd() ? 1 : 0; return; } } else if (arg0 < 6600) { if (arg0 == 6500) { - if (Static283.gameState == 7 && !Static242.method3500() && Static6.anInt95 == 0) { + if (Static283.gameState == 7 && !Static242.method3500() && Static6.step == 0) { if (Static149.aBoolean221) { - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (Static363.aLong219 > Static588.currentTimeWithDrift() - 1000L) { - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; return; } Static149.aBoolean221 = true; @Pc(7662) OutboundPacket local7662 = OutboundPacket.create(Static231.aClientProt41, Connection.lobbyConnection.random); - local7662.buffer.p4(Static379.anInt5968); + local7662.buffer.p4(Static379.checksum); Connection.lobbyConnection.queue(local7662); - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } - anIntArray578[anInt7142++] = 1; + intStack[isp++] = 1; return; } @Pc(7719) Country local7719; @@ -5510,90 +5510,90 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean if (arg0 == 6501) { local7686 = Static724.method9452(); if (local7686 != null) { - anIntArray578[anInt7142++] = local7686.anInt7569; - anIntArray578[anInt7142++] = local7686.anInt7563; - aStringArray37[anInt7139++] = local7686.aString91; - local7719 = local7686.method6717(); - anIntArray578[anInt7142++] = local7719.anInt1610; - aStringArray37[anInt7139++] = local7719.aString13; - anIntArray578[anInt7142++] = local7686.anInt7561; - anIntArray578[anInt7142++] = local7686.anInt7570; - aStringArray37[anInt7139++] = local7686.aString90; - return; - } - anIntArray578[anInt7142++] = -1; - anIntArray578[anInt7142++] = 0; - aStringArray37[anInt7139++] = ""; - anIntArray578[anInt7142++] = 0; - aStringArray37[anInt7139++] = ""; - anIntArray578[anInt7142++] = 0; - anIntArray578[anInt7142++] = 0; - aStringArray37[anInt7139++] = ""; + intStack[isp++] = local7686.id; + intStack[isp++] = local7686.flags; + stringStack[ssp++] = local7686.activity; + local7719 = local7686.getWorldInfo(); + intStack[isp++] = local7719.flag; + stringStack[ssp++] = local7719.name; + intStack[isp++] = local7686.players; + intStack[isp++] = local7686.anInt7570; + stringStack[ssp++] = local7686.hostname; + return; + } + intStack[isp++] = -1; + intStack[isp++] = 0; + stringStack[ssp++] = ""; + intStack[isp++] = 0; + stringStack[ssp++] = ""; + intStack[isp++] = 0; + intStack[isp++] = 0; + stringStack[ssp++] = ""; return; } if (arg0 == 6502) { - local7686 = Static557.method7333(); + local7686 = Static557.getNextWorld(); if (local7686 != null) { - anIntArray578[anInt7142++] = local7686.anInt7569; - anIntArray578[anInt7142++] = local7686.anInt7563; - aStringArray37[anInt7139++] = local7686.aString91; - local7719 = local7686.method6717(); - anIntArray578[anInt7142++] = local7719.anInt1610; - aStringArray37[anInt7139++] = local7719.aString13; - anIntArray578[anInt7142++] = local7686.anInt7561; - anIntArray578[anInt7142++] = local7686.anInt7570; - aStringArray37[anInt7139++] = local7686.aString90; - return; - } - anIntArray578[anInt7142++] = -1; - anIntArray578[anInt7142++] = 0; - aStringArray37[anInt7139++] = ""; - anIntArray578[anInt7142++] = 0; - aStringArray37[anInt7139++] = ""; - anIntArray578[anInt7142++] = 0; - anIntArray578[anInt7142++] = 0; - aStringArray37[anInt7139++] = ""; + intStack[isp++] = local7686.id; + intStack[isp++] = local7686.flags; + stringStack[ssp++] = local7686.activity; + local7719 = local7686.getWorldInfo(); + intStack[isp++] = local7719.flag; + stringStack[ssp++] = local7719.name; + intStack[isp++] = local7686.players; + intStack[isp++] = local7686.anInt7570; + stringStack[ssp++] = local7686.hostname; + return; + } + intStack[isp++] = -1; + intStack[isp++] = 0; + stringStack[ssp++] = ""; + intStack[isp++] = 0; + stringStack[ssp++] = ""; + intStack[isp++] = 0; + intStack[isp++] = 0; + stringStack[ssp++] = ""; return; } if (arg0 == 6503) { - local192 = anIntArray578[--anInt7142]; - local101 = aStringArray37[--anInt7139]; - if (Static283.gameState == 7 && !Static242.method3500() && Static6.anInt95 == 0) { - anIntArray578[anInt7142++] = Static430.method5817(local192, local101) ? 1 : 0; + local192 = intStack[--isp]; + local101 = stringStack[--ssp]; + if (Static283.gameState == 7 && !Static242.method3500() && Static6.step == 0) { + intStack[isp++] = Static430.hopWorld(local192, local101) ? 1 : 0; return; } - anIntArray578[anInt7142++] = 0; + intStack[isp++] = 0; return; } if (arg0 == 6506) { - local192 = anIntArray578[--anInt7142]; - @Pc(8053) World local8053 = Static615.method8260(local192); + local192 = intStack[--isp]; + @Pc(8053) World local8053 = Static615.getWorld(local192); if (local8053 != null) { - anIntArray578[anInt7142++] = local8053.anInt7563; - aStringArray37[anInt7139++] = local8053.aString91; - @Pc(8077) Country local8077 = local8053.method6717(); - anIntArray578[anInt7142++] = local8077.anInt1610; - aStringArray37[anInt7139++] = local8077.aString13; - anIntArray578[anInt7142++] = local8053.anInt7561; - anIntArray578[anInt7142++] = local8053.anInt7570; - aStringArray37[anInt7139++] = local8053.aString90; + intStack[isp++] = local8053.flags; + stringStack[ssp++] = local8053.activity; + @Pc(8077) Country local8077 = local8053.getWorldInfo(); + intStack[isp++] = local8077.flag; + stringStack[ssp++] = local8077.name; + intStack[isp++] = local8053.players; + intStack[isp++] = local8053.anInt7570; + stringStack[ssp++] = local8053.hostname; return; } - anIntArray578[anInt7142++] = -1; - aStringArray37[anInt7139++] = ""; - anIntArray578[anInt7142++] = 0; - aStringArray37[anInt7139++] = ""; - anIntArray578[anInt7142++] = 0; - anIntArray578[anInt7142++] = 0; - aStringArray37[anInt7139++] = ""; + intStack[isp++] = -1; + stringStack[ssp++] = ""; + intStack[isp++] = 0; + stringStack[ssp++] = ""; + intStack[isp++] = 0; + intStack[isp++] = 0; + stringStack[ssp++] = ""; return; } if (arg0 == 6507) { - anInt7142 -= 4; - local192 = anIntArray578[anInt7142]; - local1578 = anIntArray578[anInt7142 + 1] == 1; - local109 = anIntArray578[anInt7142 + 2]; - local2331 = anIntArray578[anInt7142 + 3] == 1; + isp -= 4; + local192 = intStack[isp]; + local1578 = intStack[isp + 1] == 1; + local109 = intStack[isp + 2]; + local2331 = intStack[isp + 3] == 1; Static210.method3119(local1578, local109, local192, local2331); return; } @@ -5605,341 +5605,341 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean if (Static283.gameState != 7) { return; } - Static60.aBoolean86 = anIntArray578[--anInt7142] == 1; + Static60.aBoolean86 = intStack[--isp] == 1; return; } if (arg0 == 6510) { - anIntArray578[anInt7142++] = Static715.anInt10805; + intStack[isp++] = Static715.anInt10805; return; } } else if (arg0 >= 6700) { if (arg0 < 6800 && Static598.aClass162_5 == Static225.aClass162_1) { if (arg0 == 6700) { - local192 = Static548.aHashTable40.size(); - if (Static377.anInt5930 != -1) { + local192 = Static548.openInterfaces.size(); + if (Static377.topLevelInterface != -1) { local192++; } - anIntArray578[anInt7142++] = local192; + intStack[isp++] = local192; return; } if (arg0 == 6701) { - local192 = anIntArray578[--anInt7142]; - if (Static377.anInt5930 != -1) { + local192 = intStack[--isp]; + if (Static377.topLevelInterface != -1) { if (local192 == 0) { - anIntArray578[anInt7142++] = Static377.anInt5930; + intStack[isp++] = Static377.topLevelInterface; return; } local192--; } - @Pc(8344) SubInterface local8344 = (SubInterface) Static548.aHashTable40.head(); + @Pc(8344) SubInterface local8344 = (SubInterface) Static548.openInterfaces.head(); while (local192-- > 0) { - local8344 = (SubInterface) Static548.aHashTable40.next(); + local8344 = (SubInterface) Static548.openInterfaces.next(); } - anIntArray578[anInt7142++] = local8344.anInt147; + intStack[isp++] = local8344.interfaceId; return; } if (arg0 == 6702) { - local192 = anIntArray578[--anInt7142]; - if (Static453.aComponentArrayArray2[local192] == null) { - aStringArray37[anInt7139++] = ""; + local192 = intStack[--isp]; + if (Static453.components[local192] == null) { + stringStack[ssp++] = ""; return; } - local101 = Static453.aComponentArrayArray2[local192][0].aString40; + local101 = Static453.components[local192][0].aString40; if (local101 == null) { - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } - aStringArray37[anInt7139++] = local101.substring(0, local101.indexOf(58)); + stringStack[ssp++] = local101.substring(0, local101.indexOf(58)); return; } if (arg0 == 6703) { - local192 = anIntArray578[--anInt7142]; - if (Static453.aComponentArrayArray2[local192] == null) { - anIntArray578[anInt7142++] = 0; + local192 = intStack[--isp]; + if (Static453.components[local192] == null) { + intStack[isp++] = 0; return; } - anIntArray578[anInt7142++] = Static453.aComponentArrayArray2[local192].length; + intStack[isp++] = Static453.components[local192].length; return; } if (arg0 == 6704) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - if (Static453.aComponentArrayArray2[local192] == null) { - aStringArray37[anInt7139++] = ""; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + if (Static453.components[local192] == null) { + stringStack[ssp++] = ""; return; } - local198 = Static453.aComponentArrayArray2[local192][local834].aString40; + local198 = Static453.components[local192][local834].aString40; if (local198 == null) { - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } - aStringArray37[anInt7139++] = local198; + stringStack[ssp++] = local198; return; } if (arg0 == 6705) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - if (Static453.aComponentArrayArray2[local192] == null) { - anIntArray578[anInt7142++] = 0; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + if (Static453.components[local192] == null) { + intStack[isp++] = 0; return; } - anIntArray578[anInt7142++] = Static453.aComponentArrayArray2[local192][local834].anInt3774; + intStack[isp++] = Static453.components[local192][local834].anInt3774; return; } if (arg0 == 6706) { return; } if (arg0 == 6707) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; Static120.method2193(local192 << 16 | local834, local109, "", 1); return; } if (arg0 == 6708) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; Static120.method2193(local192 << 16 | local834, local109, "", 2); return; } if (arg0 == 6709) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; Static120.method2193(local192 << 16 | local834, local109, "", 3); return; } if (arg0 == 6710) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; Static120.method2193(local192 << 16 | local834, local109, "", 4); return; } if (arg0 == 6711) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; Static120.method2193(local192 << 16 | local834, local109, "", 5); return; } if (arg0 == 6712) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; Static120.method2193(local192 << 16 | local834, local109, "", 6); return; } if (arg0 == 6713) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; Static120.method2193(local192 << 16 | local834, local109, "", 7); return; } if (arg0 == 6714) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; Static120.method2193(local192 << 16 | local834, local109, "", 8); return; } if (arg0 == 6715) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; Static120.method2193(local192 << 16 | local834, local109, "", 9); return; } if (arg0 == 6716) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; Static120.method2193(local192 << 16 | local834, local109, "", 10); return; } if (arg0 == 6717) { - anInt7142 -= 3; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; - local109 = anIntArray578[anInt7142 + 2]; + isp -= 3; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; + local109 = intStack[isp + 2]; @Pc(8940) Component local8940 = Static15.method186(local109, local192 << 16 | local834); Static470.method6384(); - @Pc(8945) ServerActiveProperties local8945 = Static84.method1661(local8940); - Static389.method5476(local8945.method6216(), local8940, local8945.anInt6904); + @Pc(8945) ServerActiveProperties local8945 = Static84.getServerActiveProperties(local8940); + Static389.method5476(local8945.getTargetMask(), local8940, local8945.targetParam); return; } } else if (arg0 < 6900) { @Pc(8975) MelType local8975; if (arg0 == 6800) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local8975 = Static577.aMelTypeList4.method5584(local192); if (local8975.aString25 == null) { - aStringArray37[anInt7139++] = ""; + stringStack[ssp++] = ""; return; } - aStringArray37[anInt7139++] = local8975.aString25; + stringStack[ssp++] = local8975.aString25; return; } if (arg0 == 6801) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local8975 = Static577.aMelTypeList4.method5584(local192); - anIntArray578[anInt7142++] = local8975.anInt2596; + intStack[isp++] = local8975.anInt2596; return; } if (arg0 == 6802) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local8975 = Static577.aMelTypeList4.method5584(local192); - anIntArray578[anInt7142++] = local8975.anInt2615; + intStack[isp++] = local8975.anInt2615; return; } if (arg0 == 6803) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; local8975 = Static577.aMelTypeList4.method5584(local192); - anIntArray578[anInt7142++] = local8975.anInt2597; + intStack[isp++] = local8975.anInt2597; return; } if (arg0 == 6804) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; @Pc(9098) ParamType local9098 = Static386.aParamTypeList2.method1161(local834); if (local9098.method6672()) { - aStringArray37[anInt7139++] = Static577.aMelTypeList4.method5584(local192).method2426(local834, local9098.aString89); + stringStack[ssp++] = Static577.aMelTypeList4.method5584(local192).method2426(local834, local9098.aString89); return; } - anIntArray578[anInt7142++] = Static577.aMelTypeList4.method5584(local192).method2427(local9098.anInt7509, local834); + intStack[isp++] = Static577.aMelTypeList4.method5584(local192).method2427(local9098.anInt7509, local834); return; } } else if (arg0 < 7000) { if (arg0 == 6900) { - anIntArray578[anInt7142++] = Static389.aBoolean459 && !Static34.aBoolean62 ? 1 : 0; + intStack[isp++] = Static389.aBoolean459 && !Static34.aBoolean62 ? 1 : 0; return; } if (arg0 == 6901) { - anIntArray578[anInt7142++] = (int) (Static416.aLong207 / 60000L); - anIntArray578[anInt7142++] = (int) ((Static416.aLong207 - Static588.currentTimeWithDrift() - Static94.aLong70) / 60000L); - anIntArray578[anInt7142++] = Static425.aBoolean482 ? 1 : 0; + intStack[isp++] = (int) (Static416.aLong207 / 60000L); + intStack[isp++] = (int) ((Static416.aLong207 - Static588.currentTimeWithDrift() - Static94.aLong70) / 60000L); + intStack[isp++] = Static425.aBoolean482 ? 1 : 0; return; } if (arg0 == 6902) { - anIntArray578[anInt7142++] = Static677.anInt10234; + intStack[isp++] = Static677.anInt10234; return; } if (arg0 == 6903) { - anIntArray578[anInt7142++] = Static476.anInt7175; + intStack[isp++] = Static476.anInt7175; return; } if (arg0 == 6904) { - anIntArray578[anInt7142++] = Static323.anInt5118; + intStack[isp++] = Static323.anInt5118; return; } if (arg0 == 6905) { local95 = ""; if (Static439.aPrivilegedRequest4 != null) { - if (Static439.aPrivilegedRequest4.anObject13 == null) { - local95 = Static419.method5756(Static439.aPrivilegedRequest4.anInt6788); + if (Static439.aPrivilegedRequest4.result == null) { + local95 = Static419.method5756(Static439.aPrivilegedRequest4.intArg2); } else { - local95 = (String) Static439.aPrivilegedRequest4.anObject13; + local95 = (String) Static439.aPrivilegedRequest4.result; } } - aStringArray37[anInt7139++] = local95; + stringStack[ssp++] = local95; return; } if (arg0 == 6906) { - anIntArray578[anInt7142++] = Static335.anInt5462; + intStack[isp++] = Static335.anInt5462; return; } if (arg0 == 6907) { - anIntArray578[anInt7142++] = Static626.anInt9473; + intStack[isp++] = Static626.anInt9473; return; } if (arg0 == 6908) { - anIntArray578[anInt7142++] = Static636.anInt9527; + intStack[isp++] = Static636.anInt9527; return; } if (arg0 == 6909) { - anIntArray578[anInt7142++] = Static420.aBoolean479 ? 1 : 0; + intStack[isp++] = Static420.aBoolean479 ? 1 : 0; return; } if (arg0 == 6910) { - anIntArray578[anInt7142++] = Static106.anInt2153; + intStack[isp++] = Static106.anInt2153; return; } if (arg0 == 6911) { - anIntArray578[anInt7142++] = Static639.anInt9571; + intStack[isp++] = Static639.anInt9571; return; } if (arg0 == 6912) { - anIntArray578[anInt7142++] = Static438.anInt6640; + intStack[isp++] = Static438.anInt6640; return; } if (arg0 == 6913) { - anIntArray578[anInt7142++] = Static435.anInt6594; + intStack[isp++] = Static435.anInt6594; return; } if (arg0 == 6914) { - anIntArray578[anInt7142++] = Static684.aBoolean775 ? 1 : 0; + intStack[isp++] = Static684.aBoolean775 ? 1 : 0; return; } if (arg0 == 6915) { - anIntArray578[anInt7142++] = Static134.anInt10326; + intStack[isp++] = Static134.anInt10326; return; } } else if (arg0 < 7100) { if (arg0 == 7000) { local192 = Static519.method6831(); - anIntArray578[anInt7142++] = Static165.anInt2810 = Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915(); - anIntArray578[anInt7142++] = local192; + intStack[isp++] = Static165.anInt2810 = Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915(); + intStack[isp++] = local192; Static449.method6116(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 7001) { Static395.method9162(); Static449.method6116(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 7002) { Static133.method2316(); Static449.method6116(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 7003) { Static75.method6239(); Static449.method6116(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 7004) { Static468.method7643(); Static449.method6116(); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } if (arg0 == 7005) { Static400.aClass2_Sub34_28.method5104(0, Static400.aClass2_Sub34_28.aPreference_Sub15_1); - Static666.method8693(1); + Static666.write(1); Static503.aBoolean578 = false; return; } @@ -5958,14 +5958,14 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 7007) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub15_1.method5320(); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub15_1.method5320(); return; } } else if (arg0 < 7200) { if (arg0 == 7100) { - anInt7142 -= 2; - local192 = anIntArray578[anInt7142]; - local834 = anIntArray578[anInt7142 + 1]; + isp -= 2; + local192 = intStack[isp]; + local834 = intStack[isp + 1]; if (local192 != -1) { if (local834 > 255) { local834 = 255; @@ -5977,166 +5977,166 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 7101) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (local192 != -1) { Static121.method2199(local192); } return; } if (arg0 == 7102) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (local192 != -1) { Static695.method9267(local192); } return; } if (arg0 == 7103) { - anIntArray578[anInt7142++] = Static183.method2796("jagtheora") ? 1 : 0; + intStack[isp++] = Static183.method2796("jagtheora") ? 1 : 0; return; } } else if (arg0 < 7300) { if (arg0 == 7201) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub6_1.method2715() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub6_1.method2715() ? 1 : 0; return; } if (arg0 == 7202) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub7_1.method2906() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub7_1.method2906() ? 1 : 0; return; } if (arg0 == 7203) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub12_1.method4360() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub12_1.method4360() ? 1 : 0; return; } if (arg0 == 7204) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub26_1.method7464() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub26_1.method7464() ? 1 : 0; return; } if (arg0 == 7205) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub13_2.method4372() && Static163.aClass19_17.method8015() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub13_2.method4372() && Static163.aClass19_17.method8015() ? 1 : 0; return; } if (arg0 == 7206) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub28_1.method7837() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub28_1.method7837() ? 1 : 0; return; } if (arg0 == 7207) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub5_1.method2173() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub5_1.method2173() ? 1 : 0; return; } if (arg0 == 7208) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub20_1.method6107() && Static163.aClass19_17.method7936() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub20_1.method6107() && Static163.aClass19_17.method7936() ? 1 : 0; return; } if (arg0 == 7209) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub23_1.method7053() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub23_1.method7053() ? 1 : 0; return; } if (arg0 == 7210) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub30_1.method8355() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub30_1.method8355() ? 1 : 0; return; } if (arg0 == 7211) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub18_1.method5768() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub18_1.method5768() ? 1 : 0; return; } if (arg0 == 7212) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub16_1.method5504() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub16_1.method5504() ? 1 : 0; return; } if (arg0 == 7213) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub3_1.method2117() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub3_1.method2117() ? 1 : 0; return; } if (arg0 == 7214) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub29_2.method7917() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub29_2.method7917() ? 1 : 0; return; } if (arg0 == 7215) { - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub2_1.method1985() ? 1 : 0; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub2_1.method1985() ? 1 : 0; return; } } else if (arg0 < 7400) { if (arg0 == 7301) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub6_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub6_1.method8352(local192); return; } if (arg0 == 7302) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub7_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub7_1.method8352(local192); return; } if (arg0 == 7303) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub12_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub12_1.method8352(local192); return; } if (arg0 == 7304) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub26_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub26_1.method8352(local192); return; } if (arg0 == 7305) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (!Static163.aClass19_17.method8015()) { - anIntArray578[anInt7142++] = 3; + intStack[isp++] = 3; return; } - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub13_2.method8352(local192); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub13_2.method8352(local192); return; } if (arg0 == 7306) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub28_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub28_1.method8352(local192); return; } if (arg0 == 7307) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub5_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub5_1.method8352(local192); return; } if (arg0 == 7308) { - local192 = anIntArray578[--anInt7142]; + local192 = intStack[--isp]; if (!Static163.aClass19_17.method7936()) { - anIntArray578[anInt7142++] = 3; + intStack[isp++] = 3; return; } - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub20_1.method8352(local192); + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub20_1.method8352(local192); return; } if (arg0 == 7309) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub23_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub23_1.method8352(local192); return; } if (arg0 == 7310) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub30_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub30_1.method8352(local192); return; } if (arg0 == 7311) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub18_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub18_1.method8352(local192); return; } if (arg0 == 7312) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub16_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub16_1.method8352(local192); return; } if (arg0 == 7313) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub3_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub3_1.method8352(local192); return; } if (arg0 == 7314) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub29_2.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub29_2.method8352(local192); return; } if (arg0 == 7315) { - local192 = anIntArray578[--anInt7142]; - anIntArray578[anInt7142++] = Static400.aClass2_Sub34_28.aPreference_Sub2_1.method8352(local192); + local192 = intStack[--isp]; + intStack[isp++] = Static400.aClass2_Sub34_28.aPreference_Sub2_1.method8352(local192); return; } } @@ -6170,19 +6170,19 @@ private static void method6422(@OriginalArg(0) Linkable_Sub42 arg0, @OriginalArg local48 = arg0.anInt7214; } if (local48 == -2147483645) { - local48 = arg0.aComponent14 == null ? -1 : arg0.aComponent14.anInt3812; + local48 = arg0.aComponent14 == null ? -1 : arg0.aComponent14.id; } if (local48 == -2147483644) { local48 = arg0.anInt7219; } if (local48 == -2147483643) { - local48 = arg0.aComponent14 == null ? -1 : arg0.aComponent14.anInt3741; + local48 = arg0.aComponent14 == null ? -1 : arg0.aComponent14.createdComponentId; } if (local48 == -2147483642) { - local48 = arg0.aComponent13 == null ? -1 : arg0.aComponent13.anInt3812; + local48 = arg0.aComponent13 == null ? -1 : arg0.aComponent13.id; } if (local48 == -2147483641) { - local48 = arg0.aComponent13 == null ? -1 : arg0.aComponent13.anInt3741; + local48 = arg0.aComponent13 == null ? -1 : arg0.aComponent13.createdComponentId; } if (local48 == -2147483640) { local48 = arg0.anInt7216; @@ -6219,7 +6219,7 @@ private static String method6425(@OriginalArg(0) int arg0) { @OriginalMember(owner = "client!ou", name = "a", descriptor = "(Ljava/lang/String;I)V") private static void method6426(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1) { - if (Static608.anInt9290 == 0 && (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.aBoolean724)) { + if (Static608.staffModLevel == 0 && (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.mapQuickChat)) { return; } @Pc(18) String local18 = arg0.toLowerCase(); @@ -6374,8 +6374,8 @@ public static void method6429(@OriginalArg(0) Class242 arg0, @OriginalArg(1) int @Pc(35) int local35 = 0; @Pc(37) int local37 = 0; if (Static210.aComponent4 != null) { - local35 = Static210.aComponent4.anInt3735; - local37 = Static210.aComponent4.anInt3784; + local35 = Static210.aComponent4.x; + local37 = Static210.aComponent4.y; } anIntArray580[0] = Static189.aMouse1.method8853() - local35; anIntArray580[1] = Static189.aMouse1.method8854() - local37; diff --git a/client/src/main/java/Static476.java b/client/src/main/java/Static476.java index 839d91b..e7f64d7 100644 --- a/client/src/main/java/Static476.java +++ b/client/src/main/java/Static476.java @@ -7,7 +7,7 @@ public final class Static476 { public static int anInt7175; @OriginalMember(owner = "client!paa", name = "e", descriptor = "I") - public static int anInt7177; + public static int size; @OriginalMember(owner = "client!paa", name = "b", descriptor = "[F") public static final float[] aFloatArray46 = new float[4]; diff --git a/client/src/main/java/Static479.java b/client/src/main/java/Static479.java index 8d4856e..12c9bf5 100644 --- a/client/src/main/java/Static479.java +++ b/client/src/main/java/Static479.java @@ -20,7 +20,7 @@ public static void method6461(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 @OriginalMember(owner = "client!pc", name = "a", descriptor = "(IIIII)V") public static void method6462(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(4, (long) arg3); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(4, (long) arg3); local9.method202(); local9.anInt192 = arg2; local9.anInt197 = arg1; diff --git a/client/src/main/java/Static48.java b/client/src/main/java/Static48.java index 82f7f3c..ae6ed97 100644 --- a/client/src/main/java/Static48.java +++ b/client/src/main/java/Static48.java @@ -48,11 +48,11 @@ public static ClientScript method1097(@OriginalArg(0) byte[] arg0) { @Pc(95) int local95; @Pc(100) int local100; if (local84 > 0) { - local7.aHashTableArray1 = new HashTable[local84]; + local7.switchTables = new HashTable[local84]; for (local95 = 0; local95 < local84; local95++) { local100 = local12.g2(); @Pc(107) HashTable local107 = new HashTable(IntUtils.clp2(local100)); - local7.aHashTableArray1[local95] = local107; + local7.switchTables[local95] = local107; while (local100-- > 0) { @Pc(117) int local117 = local12.g4(); @Pc(121) int local121 = local12.g4(); diff --git a/client/src/main/java/Static480.java b/client/src/main/java/Static480.java index 73804fd..efd258d 100644 --- a/client/src/main/java/Static480.java +++ b/client/src/main/java/Static480.java @@ -101,7 +101,7 @@ public static void method6468(@OriginalArg(1) Packet arg0, @OriginalArg(2) Signl } local23.anIntArray828[local65] = local73; local23.anIntArray827[local65] = local114; - local23.aPrivilegedRequestArray1[local65] = arg1.method8978(Static488.method6524(local106), local110); + local23.aPrivilegedRequestArray1[local65] = arg1.getDeclaredField(Static488.method6524(local106), local110); } else if (local73 == 3 || local73 == 4) { local106 = arg0.gjstr(); local110 = arg0.gjstr(); @@ -124,7 +124,7 @@ public static void method6468(@OriginalArg(1) Packet arg0, @OriginalArg(2) Signl for (local153 = 0; local153 < local114; local153++) { local180[local153] = Static488.method6524(local117[local153]); } - local23.aPrivilegedRequestArray2[local65] = arg1.method8988(Static488.method6524(local106), local180, local110); + local23.aPrivilegedRequestArray2[local65] = arg1.getDeclaredMethod(Static488.method6524(local106), local180, local110); local23.aByteArrayArrayArray18[local65] = local138; } } catch (@Pc(271) ClassNotFoundException local271) { diff --git a/client/src/main/java/Static482.java b/client/src/main/java/Static482.java index 0f66f11..c8e61c3 100644 --- a/client/src/main/java/Static482.java +++ b/client/src/main/java/Static482.java @@ -17,7 +17,7 @@ public final class Static482 { public static int[] anIntArray588 = new int[2]; @OriginalMember(owner = "client!pda", name = "a", descriptor = "(IIIB)V") - public static void method6481(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + public static void playJingle(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(12) int local12 = Static400.aClass2_Sub34_28.aPreference_Sub25_2.method7208() * arg0 >> 8; if (local12 == 0 || arg1 == -1) { return; diff --git a/client/src/main/java/Static484.java b/client/src/main/java/Static484.java index aea9b60..a346d48 100644 --- a/client/src/main/java/Static484.java +++ b/client/src/main/java/Static484.java @@ -159,7 +159,7 @@ public static boolean method6494(@OriginalArg(0) Class19 arg0, @OriginalArg(1) i } if (local730 != null) { @Pc(776) LocType local776 = Static354.aLocTypeList4.get(local730.method6859(-32136)); - if (!local776.members || Static174.aBoolean249) { + if (!local776.members || Static174.mapMembers) { local238 = local776.mel; if (local776.multiloc != null) { for (local249 = 0; local249 < local776.multiloc.length; local249++) { @@ -217,9 +217,9 @@ public static boolean method6494(@OriginalArg(0) Class19 arg0, @OriginalArg(1) i Static577.aMelTypeList4.method5583(1024, 64); for (local214 = 0; local214 < Static42.aClass255_2.anInt6373; local214++) { local216 = Static42.aClass255_2.anIntArray495[local214]; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 == local216 >> 28) { - local218 = (local216 >> 14 & 0x3FFF) - Static691.anInt10367; - local229 = (local216 & 0x3FFF) - Static116.anInt2270; + if (Static556.self.plane == local216 >> 28) { + local218 = (local216 >> 14 & 0x3FFF) - Static691.originX; + local229 = (local216 & 0x3FFF) - Static116.originZ; if (local218 >= 0 && local218 < Static720.anInt10859 && local229 >= 0 && local229 < Static501.anInt7568) { Static612.aLinkedList67.addTail(new IntNode(local214)); } else { diff --git a/client/src/main/java/Static485.java b/client/src/main/java/Static485.java index b769394..d498065 100644 --- a/client/src/main/java/Static485.java +++ b/client/src/main/java/Static485.java @@ -15,10 +15,10 @@ public final class Static485 { @OriginalMember(owner = "client!pf", name = "a", descriptor = "(Lclient!hda;ILclient!ha;)V") public static void method9415(@OriginalArg(0) Component arg0, @OriginalArg(2) Class19 arg1) { - @Pc(38) boolean local38 = ObjTypeList.objTypes.method2483(arg0.aBoolean288 ? Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 : null, arg1, arg0.anInt3757, arg0.anInt3760, arg0.anInt3773, arg0.anInt3817, arg0.anInt3798 | 0xFF000000) == null; + @Pc(38) boolean local38 = ObjTypeList.objTypes.method2483(arg0.aBoolean288 ? Static556.self.aPlayerAppearance1 : null, arg1, arg0.anInt3757, arg0.objId, arg0.outlineThickness, arg0.objCount, arg0.shadowColor | 0xFF000000) == null; if (local38) { - Static133.aLinkedList13.addTail(new Linkable_Sub36(arg0.anInt3760, arg0.anInt3817, arg0.anInt3773, arg0.anInt3798 | 0xFF000000, arg0.anInt3757, arg0.aBoolean288)); - Static178.method2729(arg0); + Static133.aLinkedList13.addTail(new Linkable_Sub36(arg0.objId, arg0.objCount, arg0.outlineThickness, arg0.shadowColor | 0xFF000000, arg0.anInt3757, arg0.aBoolean288)); + Static178.redraw(arg0); } } diff --git a/client/src/main/java/Static487.java b/client/src/main/java/Static487.java index 190f8e9..6b9cadd 100644 --- a/client/src/main/java/Static487.java +++ b/client/src/main/java/Static487.java @@ -14,7 +14,7 @@ public static int method6515(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalMember(owner = "client!pg", name = "a", descriptor = "(IIZ)V") public static void method6516(@OriginalArg(0) int arg0, @OriginalArg(2) boolean arg1) { - @Pc(21) SecondaryLinkable_Sub2 local21 = Static440.method5963(21, (long) arg0); + @Pc(21) SecondaryLinkable_Sub2 local21 = Static440.create(21, (long) arg0); local21.method202(); local21.anInt197 = arg1 ? 1 : 0; } diff --git a/client/src/main/java/Static489.java b/client/src/main/java/Static489.java index 84dc6fb..fc8ad76 100644 --- a/client/src/main/java/Static489.java +++ b/client/src/main/java/Static489.java @@ -30,11 +30,11 @@ public static Frame method6543(@OriginalArg(0) int arg0, @OriginalArg(1) Signlin if (!local25) { return null; } - @Pc(101) PrivilegedRequest local101 = arg1.method8977(arg0, arg2, arg3); + @Pc(101) PrivilegedRequest local101 = arg1.enterFullScreen(arg0, arg2, arg3); while (local101.state == 0) { Static638.sleep(10L); } - @Pc(112) Frame local112 = (Frame) local101.anObject13; + @Pc(112) Frame local112 = (Frame) local101.result; if (local112 == null) { return null; } else if (local101.state == 2) { @@ -49,9 +49,9 @@ public static Frame method6543(@OriginalArg(0) int arg0, @OriginalArg(1) Signlin public static void method6547(@OriginalArg(0) boolean arg0, @OriginalArg(2) PathingEntity arg1) { @Pc(7) int local7 = -1; @Pc(16) int local16 = 0; - if (arg1.anInt10759 > Static333.anInt5455) { + if (arg1.anInt10759 > Static333.loop) { Static441.method5967(arg1); - } else if (Static333.anInt5455 > arg1.anInt10755) { + } else if (Static333.loop > arg1.anInt10755) { Static256.method3638(arg1, arg0); local7 = Static521.anInt7756; local16 = Static524.anInt8042; @@ -59,7 +59,7 @@ public static void method6547(@OriginalArg(0) boolean arg0, @OriginalArg(2) Path Static354.method5181(arg1); } @Pc(107) int local107; - if (arg1.anInt10690 < 512 || arg1.anInt10694 < 512 || Static720.anInt10859 * 512 - 512 <= arg1.anInt10690 || arg1.anInt10694 >= Static501.anInt7568 * 512 - 512) { + if (arg1.xFine < 512 || arg1.zFine < 512 || Static720.anInt10859 * 512 - 512 <= arg1.xFine || arg1.zFine >= Static501.anInt7568 * 512 - 512) { arg1.aClass152_11.method9113(true, -1); for (local107 = 0; local107 < arg1.aClass199Array3.length; local107++) { arg1.aClass199Array3[local107].anInt4930 = -1; @@ -70,11 +70,11 @@ public static void method6547(@OriginalArg(0) boolean arg0, @OriginalArg(2) Path arg1.anInt10755 = 0; arg1.anIntArray869 = null; local16 = 0; - arg1.anInt10690 = arg1.anIntArray879[0] * 512 + arg1.method9302((byte) 97) * 256; - arg1.anInt10694 = arg1.anIntArray878[0] * 512 + arg1.method9302((byte) 113) * 256; + arg1.xFine = arg1.anIntArray879[0] * 512 + arg1.method9302((byte) 97) * 256; + arg1.zFine = arg1.anIntArray878[0] * 512 + arg1.method9302((byte) 113) * 256; arg1.method9316(); } - if (arg1 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 && (arg1.anInt10690 < 6144 || arg1.anInt10694 < 6144 || arg1.anInt10690 >= Static720.anInt10859 * 512 - 6144 || Static501.anInt7568 * 512 - 6144 <= arg1.anInt10694)) { + if (arg1 == Static556.self && (arg1.xFine < 6144 || arg1.zFine < 6144 || arg1.xFine >= Static720.anInt10859 * 512 - 6144 || Static501.anInt7568 * 512 - 6144 <= arg1.zFine)) { arg1.aClass152_11.method9113(true, -1); for (local107 = 0; local107 < arg1.aClass199Array3.length; local107++) { arg1.aClass199Array3[local107].anInt4930 = -1; @@ -85,8 +85,8 @@ public static void method6547(@OriginalArg(0) boolean arg0, @OriginalArg(2) Path arg1.anIntArray869 = null; local16 = 0; local7 = -1; - arg1.anInt10690 = arg1.anIntArray879[0] * 512 + arg1.method9302((byte) 69) * 256; - arg1.anInt10694 = arg1.anIntArray878[0] * 512 + arg1.method9302((byte) 49) * 256; + arg1.xFine = arg1.anIntArray879[0] * 512 + arg1.method9302((byte) 69) * 256; + arg1.zFine = arg1.anIntArray878[0] * 512 + arg1.method9302((byte) 49) * 256; arg1.method9316(); } local107 = Static112.method2104(arg1); @@ -142,7 +142,7 @@ public static void method6548() { if (Static162.aClass2_Sub2_Sub13_2 == null || !client.worldMapData.isGroupNameVaild(Static162.aClass2_Sub2_Sub13_2.aString48 + "_staticelements")) { Static42.aClass255_2 = new Class255(0); } else if (client.worldMapData.isGroupReady(Static162.aClass2_Sub2_Sub13_2.aString48 + "_staticelements")) { - Static42.aClass255_2 = Static284.method4103(Static174.aBoolean249, client.worldMapData, Static162.aClass2_Sub2_Sub13_2.aString48 + "_staticelements"); + Static42.aClass255_2 = Static284.method4103(Static174.mapMembers, client.worldMapData, Static162.aClass2_Sub2_Sub13_2.aString48 + "_staticelements"); } else { local10 = false; Static593.anInt8763++; @@ -159,8 +159,8 @@ public static void method6548() { @Pc(287) byte[] local287 = Static118.aByteArrayArray3[local282]; @Pc(299) int local299; if (local287 != null) { - local299 = (Static89.anIntArray169[local282] >> 8) * 64 - Static691.anInt10367; - chunkSize = (Static89.anIntArray169[local282] & 0xFF) * 64 - Static116.anInt2270; + local299 = (Static89.anIntArray169[local282] >> 8) * 64 - Static691.originX; + chunkSize = (Static89.anIntArray169[local282] & 0xFF) * 64 - Static116.originZ; if (Static117.anInt2282 != 0) { local299 = 10; chunkSize = 10; @@ -169,8 +169,8 @@ public static void method6548() { } local287 = Static421.aByteArrayArray19[local282]; if (local287 != null) { - local299 = (Static89.anIntArray169[local282] >> 8) * 64 - Static691.anInt10367; - chunkSize = (Static89.anIntArray169[local282] & 0xFF) * 64 - Static116.anInt2270; + local299 = (Static89.anIntArray169[local282] >> 8) * 64 - Static691.originX; + chunkSize = (Static89.anIntArray169[local282] & 0xFF) * 64 - Static116.originZ; if (Static117.anInt2282 != 0) { chunkSize = 10; local299 = 10; diff --git a/client/src/main/java/Static494.java b/client/src/main/java/Static494.java index f1d2f9e..f7907b3 100644 --- a/client/src/main/java/Static494.java +++ b/client/src/main/java/Static494.java @@ -5,13 +5,13 @@ public final class Static494 { @OriginalMember(owner = "client!pja", name = "Z", descriptor = "I") - public static int anInt7396; + public static int minId; @OriginalMember(owner = "client!pja", name = "kb", descriptor = "I") public static int anInt7409; @OriginalMember(owner = "client!pja", name = "rb", descriptor = "I") - public static int anInt7404 = 0; + public static int weight = 0; @OriginalMember(owner = "client!pja", name = "K", descriptor = "Z") public static boolean aBoolean563 = false; @@ -31,8 +31,8 @@ public static void method6596() { @OriginalMember(owner = "client!pja", name = "e", descriptor = "(B)V") public static void method6597() { Static659.anInt9817 = 0; - @Pc(17) int local17 = (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 >> 9) + Static691.anInt10367; - @Pc(24) int local24 = Static116.anInt2270 + (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 >> 9); + @Pc(17) int local17 = (Static556.self.xFine >> 9) + Static691.originX; + @Pc(24) int local24 = Static116.originZ + (Static556.self.zFine >> 9); if (local17 >= 3053 && local17 <= 3156 && local24 >= 3056 && local24 <= 3136) { Static659.anInt9817 = 1; } diff --git a/client/src/main/java/Static498.java b/client/src/main/java/Static498.java index 8a388bc..fb163ac 100644 --- a/client/src/main/java/Static498.java +++ b/client/src/main/java/Static498.java @@ -5,7 +5,7 @@ public final class Static498 { @OriginalMember(owner = "client!pm", name = "p", descriptor = "[I") - public static final int[] anIntArray604 = new int[25]; + public static final int[] baseLevels = new int[25]; @OriginalMember(owner = "client!pm", name = "a", descriptor = "(IZIIBI)V") public static void method6643(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) { @@ -79,7 +79,7 @@ public static void method6646() { Static126.method2227(Static163.aClass19_17, Static680.anInt10289, Static32.anInt777, Static288.anInt4620, Static380.anInt5979); } if (Static400.aClass2_Sub34_28.aPreference_Sub3_1.method2118()) { - Static575.method7606(Static434.aCanvas7); + Static575.method7606(Static434.canvas); } if (Static163.aClass19_17 != null) { Static209.method3110(); diff --git a/client/src/main/java/Static50.java b/client/src/main/java/Static50.java index a157c4e..f4348fd 100644 --- a/client/src/main/java/Static50.java +++ b/client/src/main/java/Static50.java @@ -134,13 +134,13 @@ public static void method6638(@OriginalArg(0) PathingEntity arg0) { @Pc(88) SpotAnimType local88 = Static23.aSpotAnimTypeList1.method2694(arg0.aClass199Array3[local50].anInt4930); @Pc(92) SeqType local92 = local75.method9107(); if (local88.aBoolean448) { - if (local92.anInt1642 == 3) { - if (arg0.anInt10762 > 0 && Static333.anInt5455 >= arg0.anInt10759 && arg0.anInt10755 < Static333.anInt5455) { + if (local92.looptype == 3) { + if (arg0.anInt10762 > 0 && Static333.loop >= arg0.anInt10759 && arg0.anInt10755 < Static333.loop) { local75.method9113(true, -1); arg0.aClass199Array3[local50].anInt4930 = -1; continue; } - } else if (local92.anInt1642 == 1 && arg0.anInt10762 > 0 && arg0.anInt10759 <= Static333.anInt5455 && Static333.anInt5455 > arg0.anInt10755) { + } else if (local92.looptype == 1 && arg0.anInt10762 > 0 && arg0.anInt10759 <= Static333.loop && Static333.loop > arg0.anInt10755) { continue; } } @@ -155,14 +155,14 @@ public static void method6638(@OriginalArg(0) PathingEntity arg0) { if (local75.method9109()) { label83: { @Pc(214) SeqType local214 = local75.method9107(); - if (local214.anInt1642 == 3) { - if (arg0.anInt10762 > 0 && arg0.anInt10759 <= Static333.anInt5455 && Static333.anInt5455 > arg0.anInt10755) { + if (local214.looptype == 3) { + if (arg0.anInt10762 > 0 && arg0.anInt10759 <= Static333.loop && Static333.loop > arg0.anInt10755) { arg0.anIntArray869 = null; local75.method9113(true, -1); break label83; } - } else if (local214.anInt1642 == 1) { - if (arg0.anInt10762 > 0 && Static333.anInt5455 >= arg0.anInt10759 && arg0.anInt10755 < Static333.anInt5455) { + } else if (local214.looptype == 1) { + if (arg0.anInt10762 > 0 && Static333.loop >= arg0.anInt10759 && arg0.anInt10755 < Static333.loop) { local75.method9091(1); break label83; } @@ -188,7 +188,7 @@ public static void method6638(@OriginalArg(0) PathingEntity arg0) { @OriginalMember(owner = "client!bm", name = "a", descriptor = "(IIB)V") public static void method6639(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(8) SecondaryLinkable_Sub2 local8 = Static440.method5963(15, 0L); + @Pc(8) SecondaryLinkable_Sub2 local8 = Static440.create(15, 0L); local8.method202(); local8.anInt197 = arg1; local8.anInt195 = arg0; diff --git a/client/src/main/java/Static506.java b/client/src/main/java/Static506.java index 0d313ce..96fa2d0 100644 --- a/client/src/main/java/Static506.java +++ b/client/src/main/java/Static506.java @@ -37,13 +37,13 @@ public static void method8313() { @Pc(40) int local40 = 255 - local35; @Pc(45) float local45 = (float) local35 / 255.0F; @Pc(50) float local50 = 1.0F - local45; - Static448.anInt6801 = (local40 * (Static346.aClass367_1.anInt9537 & 0xFF00FF) + (Static386.anInt6062 & 0xFF00FF) * local35 & 0xFF00FF00) + (local35 * (Static386.anInt6062 & 0xFF00) + (local40 * (Static346.aClass367_1.anInt9537 & 0xFF00)) & 0xFF0000) >>> 8; - Static318.aFloat210 = Static620.aFloat197 + (Static346.aClass367_1.aFloat204 - Static620.aFloat197) * local50; - Static688.aFloat216 = local50 * (Static346.aClass367_1.aFloat205 - Static659.aFloat213) + Static659.aFloat213; - Static171.anInt2882 = Static679.anInt10273 * local35 + Static346.aClass367_1.anInt9539 * local40 >> 8; - Static683.aFloat215 = (Static346.aClass367_1.aFloat202 - Static671.aFloat214) * local50 + Static671.aFloat214; + Static448.anInt6801 = (local40 * (Static346.aClass367_1.screenColorRgb & 0xFF00FF) + (Static386.anInt6062 & 0xFF00FF) * local35 & 0xFF00FF00) + (local35 * (Static386.anInt6062 & 0xFF00) + (local40 * (Static346.aClass367_1.screenColorRgb & 0xFF00)) & 0xFF0000) >>> 8; + Static318.aFloat210 = Static620.aFloat197 + (Static346.aClass367_1.lightModelAmbient - Static620.aFloat197) * local50; + Static688.aFloat216 = local50 * (Static346.aClass367_1.light0Diffuse - Static659.aFloat213) + Static659.aFloat213; + Static171.anInt2882 = Static679.anInt10273 * local35 + Static346.aClass367_1.fogDepth * local40 >> 8; + Static683.aFloat215 = (Static346.aClass367_1.light1Diffuse - Static671.aFloat214) * local50 + Static671.aFloat214; Static151.aFloat218 = Static600.aFloat179 + (Static346.aClass367_1.aFloat203 - Static600.aFloat179) * local50; - Static251.anInt4037 = (local40 * (Static346.aClass367_1.anInt9538 & 0xFF00FF) + (Static360.anInt5820 & 0xFF00FF) * local35 & 0xFF00FF00) + (local35 * (Static360.anInt5820 & 0xFF00) + (Static346.aClass367_1.anInt9538 & 0xFF00) * local40 & 0xFF0000) >>> 8; + Static251.anInt4037 = (local40 * (Static346.aClass367_1.fogColorRgb & 0xFF00FF) + (Static360.anInt5820 & 0xFF00FF) * local35 & 0xFF00FF00) + (local35 * (Static360.anInt5820 & 0xFF00) + (Static346.aClass367_1.fogColorRgb & 0xFF00) * local40 & 0xFF0000) >>> 8; Static133.aFloat63 = Static538.aFloat174 + (Static346.aClass367_1.aFloat201 - Static538.aFloat174) * local50; Static57.aFloat29 = local50 * (Static346.aClass367_1.aFloat200 - Static203.aFloat69) + Static203.aFloat69; if (Static74.aClass67_3 != Static346.aClass367_1.aClass67_10) { @@ -63,15 +63,15 @@ public static void method8313() { } } } else { - Static448.anInt6801 = Static346.aClass367_1.anInt9537; + Static448.anInt6801 = Static346.aClass367_1.screenColorRgb; Static151.aFloat218 = Static346.aClass367_1.aFloat203; - Static318.aFloat210 = Static346.aClass367_1.aFloat204; + Static318.aFloat210 = Static346.aClass367_1.lightModelAmbient; Static133.aFloat63 = Static346.aClass367_1.aFloat201; - Static683.aFloat215 = Static346.aClass367_1.aFloat202; + Static683.aFloat215 = Static346.aClass367_1.light1Diffuse; Static425.aClass67_6 = Static346.aClass367_1.aClass67_10; - Static171.anInt2882 = Static346.aClass367_1.anInt9539; - Static251.anInt4037 = Static346.aClass367_1.anInt9538; - Static688.aFloat216 = Static346.aClass367_1.aFloat205; + Static171.anInt2882 = Static346.aClass367_1.fogDepth; + Static251.anInt4037 = Static346.aClass367_1.fogColorRgb; + Static688.aFloat216 = Static346.aClass367_1.light0Diffuse; Static57.aFloat29 = Static346.aClass367_1.aFloat200; if (Static456.aClass148_3 != null) { Static456.aClass148_3.method3169(); diff --git a/client/src/main/java/Static507.java b/client/src/main/java/Static507.java index 00a8a67..786f248 100644 --- a/client/src/main/java/Static507.java +++ b/client/src/main/java/Static507.java @@ -21,49 +21,49 @@ public final class Static507 { @OriginalMember(owner = "client!pw", name = "a", descriptor = "(ZIIILclient!hda;)V") public static void method6743(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Component arg3) { - @Pc(6) int local6 = arg3.anInt3802; - @Pc(16) int local16 = arg3.anInt3746; - if (arg3.aByte63 == 0) { - arg3.anInt3802 = arg3.anInt3744; - } else if (arg3.aByte63 == 1) { - arg3.anInt3802 = arg2 - arg3.anInt3744; - } else if (arg3.aByte63 == 2) { - arg3.anInt3802 = arg3.anInt3744 * arg2 >> 14; + @Pc(6) int local6 = arg3.width; + @Pc(16) int local16 = arg3.height; + if (arg3.dynamicWidthValue == 0) { + arg3.width = arg3.baseWidth; + } else if (arg3.dynamicWidthValue == 1) { + arg3.width = arg2 - arg3.baseWidth; + } else if (arg3.dynamicWidthValue == 2) { + arg3.width = arg3.baseWidth * arg2 >> 14; } - if (arg3.aByte62 == 0) { - arg3.anInt3746 = arg3.anInt3762; - } else if (arg3.aByte62 == 1) { - arg3.anInt3746 = arg1 - arg3.anInt3762; - } else if (arg3.aByte62 == 2) { - arg3.anInt3746 = arg1 * arg3.anInt3762 >> 14; + if (arg3.dynamicHeightValue == 0) { + arg3.height = arg3.baseHeight; + } else if (arg3.dynamicHeightValue == 1) { + arg3.height = arg1 - arg3.baseHeight; + } else if (arg3.dynamicHeightValue == 2) { + arg3.height = arg1 * arg3.baseHeight >> 14; } - if (arg3.aByte63 == 4) { - arg3.anInt3802 = arg3.anInt3795 * arg3.anInt3746 / arg3.anInt3750; + if (arg3.dynamicWidthValue == 4) { + arg3.width = arg3.anInt3795 * arg3.height / arg3.anInt3750; } - if (arg3.aByte62 == 4) { - arg3.anInt3746 = arg3.anInt3802 * arg3.anInt3750 / arg3.anInt3795; + if (arg3.dynamicHeightValue == 4) { + arg3.height = arg3.width * arg3.anInt3750 / arg3.anInt3795; } - if (Static103.aBoolean195 && (Static84.method1661(arg3).anInt6909 != 0 || arg3.anInt3820 == 0)) { - if (arg3.anInt3746 < 5 && arg3.anInt3802 < 5) { - arg3.anInt3746 = 5; - arg3.anInt3802 = 5; + if (Static103.aBoolean195 && (Static84.getServerActiveProperties(arg3).events != 0 || arg3.type == 0)) { + if (arg3.height < 5 && arg3.width < 5) { + arg3.height = 5; + arg3.width = 5; } else { - if (arg3.anInt3802 <= 0) { - arg3.anInt3802 = 5; + if (arg3.width <= 0) { + arg3.width = 5; } - if (arg3.anInt3746 <= 0) { - arg3.anInt3746 = 5; + if (arg3.height <= 0) { + arg3.height = 5; } } } - if (Static188.anInt3104 == arg3.anInt3806) { + if (Static188.anInt3104 == arg3.clientCode) { Static610.aComponent16 = arg3; } - if (arg0 && arg3.anObjectArray19 != null && (local6 != arg3.anInt3802 || local16 != arg3.anInt3746)) { + if (arg0 && arg3.onResize != null && (local6 != arg3.width || local16 != arg3.height)) { @Pc(225) Linkable_Sub42 local225 = new Linkable_Sub42(); - local225.anObjectArray36 = arg3.anObjectArray19; + local225.anObjectArray36 = arg3.onResize; local225.aComponent14 = arg3; - Static521.aLinkedList44.addTail(local225); + Static521.lowPriorityRequests.addTail(local225); } } diff --git a/client/src/main/java/Static511.java b/client/src/main/java/Static511.java index 2e782e0..58748d8 100644 --- a/client/src/main/java/Static511.java +++ b/client/src/main/java/Static511.java @@ -5,13 +5,13 @@ public final class Static511 { @OriginalMember(owner = "client!qb", name = "j", descriptor = "I") - public static int anInt7645; + public static int cameraType; @OriginalMember(owner = "client!qb", name = "g", descriptor = "[I") public static int[] anIntArray614; @OriginalMember(owner = "client!qb", name = "i", descriptor = "[Lclient!ci;") - public static Country[] aCountryArray1; + public static Country[] countries; @OriginalMember(owner = "client!qb", name = "n", descriptor = "[J") public static final long[] aLongArray17 = new long[100]; diff --git a/client/src/main/java/Static517.java b/client/src/main/java/Static517.java index 088dc78..5272d78 100644 --- a/client/src/main/java/Static517.java +++ b/client/src/main/java/Static517.java @@ -30,9 +30,9 @@ public static void method6822(@OriginalArg(0) boolean arg0) { if (22050 > 48000) { throw new IllegalArgumentException(); } - Static156.anInt2679 = 2; - Static686.anInt8944 = 22050; - Static316.aBoolean644 = arg0; + Static156.threadPriority = 2; + Static686.sampleRate = 22050; + Static316.stereo = arg0; } @OriginalMember(owner = "client!qea", name = "a", descriptor = "(Z[[[BIBIIZ)V") @@ -209,7 +209,7 @@ public static void method6823(@OriginalArg(0) boolean arg0, @OriginalArg(1) byte @OriginalMember(owner = "client!qea", name = "a", descriptor = "(Lclient!eo;)V") private static void method6824(@OriginalArg(0) ParticleNode_Sub2 arg0) { - Static665.aClass19_15.H(arg0.anInt10690, arg0.anInt10691 + (arg0.method9286(2) >> 1), arg0.anInt10694, Static486.anIntArray591); + Static665.aClass19_15.H(arg0.xFine, arg0.anInt10691 + (arg0.method9286(2) >> 1), arg0.zFine, Static486.anIntArray591); arg0.anInt10692 = Static486.anIntArray591[0]; arg0.anInt10698 = Static486.anIntArray591[1]; arg0.anInt10697 = Static486.anIntArray591[2]; diff --git a/client/src/main/java/Static518.java b/client/src/main/java/Static518.java index 0393d72..cc1a2e9 100644 --- a/client/src/main/java/Static518.java +++ b/client/src/main/java/Static518.java @@ -7,7 +7,7 @@ public final class Static518 { public static Packet aPacket_18; @OriginalMember(owner = "client!qf", name = "H", descriptor = "Z") - public static boolean aBoolean814 = false; + public static boolean loaded = false; @OriginalMember(owner = "client!qf", name = "G", descriptor = "[[I") public static final int[][] anIntArrayArray262 = new int[6][]; diff --git a/client/src/main/java/Static521.java b/client/src/main/java/Static521.java index 203c103..7798475 100644 --- a/client/src/main/java/Static521.java +++ b/client/src/main/java/Static521.java @@ -8,7 +8,7 @@ public final class Static521 { public static int anInt7756; @OriginalMember(owner = "client!qga", name = "i", descriptor = "Lclient!sia;") - public static final LinkedList aLinkedList44 = new LinkedList(); + public static final LinkedList lowPriorityRequests = new LinkedList(); @OriginalMember(owner = "client!qga", name = "a", descriptor = "(IIZIII[IBIIILclient!eq;[III)I") public static int method6870(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int[] arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) Class110 arg10, @OriginalArg(12) int[] arg11, @OriginalArg(13) int arg12, @OriginalArg(14) int arg13) { diff --git a/client/src/main/java/Static523.java b/client/src/main/java/Static523.java index 24d9621..fe8d06e 100644 --- a/client/src/main/java/Static523.java +++ b/client/src/main/java/Static523.java @@ -46,20 +46,20 @@ public static void method3447(@OriginalArg(0) boolean arg0) { @OriginalMember(owner = "client!qi", name = "a", descriptor = "(ZLclient!hda;)V") public static void method3449(@OriginalArg(1) Component arg0) { - if (Static376.anInt5921 != arg0.anInt3806) { + if (Static376.anInt5921 != arg0.clientCode) { return; } - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2 == null) { - arg0.anInt3831 = 0; + if (Static556.self.username == null) { + arg0.modelId = 0; arg0.anInt3738 = 0; return; } - arg0.anInt3807 = 150; - arg0.anInt3811 = (int) (Math.sin((double) Static333.anInt5455 / 40.0D) * 256.0D) & 0x7FF; - arg0.anInt3823 = 5; - arg0.anInt3831 = Static312.anInt5000; - arg0.anInt3738 = Static214.method3157(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2); - @Pc(55) Class152 local55 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aClass152_10; + arg0.modelXAngle = 150; + arg0.modelYAngle = (int) (Math.sin((double) Static333.loop / 40.0D) * 256.0D) & 0x7FF; + arg0.modelType = 5; + arg0.modelId = Static312.anInt5000; + arg0.anInt3738 = Static214.method3157(Static556.self.username); + @Pc(55) Class152 local55 = Static556.self.aClass152_10; if (local55 == null) { arg0.aClass152_6 = null; return; @@ -67,7 +67,7 @@ public static void method3449(@OriginalArg(1) Component arg0) { if (arg0.aClass152_6 == null) { arg0.aClass152_6 = new Class152_Sub1(); } - arg0.anInt3789 = local55.method9114(); + arg0.modelSeqId = local55.method9114(); arg0.aClass152_6.method9096(local55); } } diff --git a/client/src/main/java/Static527.java b/client/src/main/java/Static527.java index 77f9d03..16cafee 100644 --- a/client/src/main/java/Static527.java +++ b/client/src/main/java/Static527.java @@ -22,23 +22,23 @@ public static void method7081(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 public static void method7083() { for (@Pc(15) SecondaryLinkable_Sub15 local15 = (SecondaryLinkable_Sub15) Static505.aLinkedList77.head(); local15 != null; local15 = (SecondaryLinkable_Sub15) Static505.aLinkedList77.next()) { @Pc(20) ProjAnimEntity local20 = local15.aClass8_Sub2_Sub1_Sub1_1; - if (Static333.anInt5455 > local20.anInt697) { + if (Static333.loop > local20.anInt697) { local15.unlink(); local20.method815(); - } else if (Static333.anInt5455 >= local20.anInt722) { + } else if (Static333.loop >= local20.anInt722) { local20.method816(); if (local20.anInt711 > 0) { if (Static1.anInt10798 == 3) { @Pc(61) PathingEntity local61 = Static219.aClass236Array1[local20.anInt711 - 1].method5363(); - if (local61 != null && local61.anInt10690 >= 0 && local61.anInt10690 < Static720.anInt10859 * 512 && local61.anInt10694 >= 0 && local61.anInt10694 < Static501.anInt7568 * 512) { - local20.method813(Static102.method2025(local20.aByte144, -29754, local61.anInt10694, local61.anInt10690) - local20.lb, Static333.anInt5455, local61.anInt10694, local61.anInt10690); + if (local61 != null && local61.xFine >= 0 && local61.xFine < Static720.anInt10859 * 512 && local61.zFine >= 0 && local61.zFine < Static501.anInt7568 * 512) { + local20.method813(Static102.method2025(local20.plane, -29754, local61.zFine, local61.xFine) - local20.lb, Static333.loop, local61.zFine, local61.xFine); } } else { @Pc(130) Linkable_Sub45 local130 = (Linkable_Sub45) Static18.aHashTable2.get((long) (local20.anInt711 - 1)); if (local130 != null) { @Pc(135) Npc local135 = local130.aClass8_Sub2_Sub1_Sub2_Sub2_2; - if (local135.anInt10690 >= 0 && local135.anInt10690 < Static720.anInt10859 * 512 && local135.anInt10694 >= 0 && local135.anInt10694 < Static501.anInt7568 * 512) { - local20.method813(Static102.method2025(local20.aByte144, -29754, local135.anInt10694, local135.anInt10690) - local20.lb, Static333.anInt5455, local135.anInt10694, local135.anInt10690); + if (local135.xFine >= 0 && local135.xFine < Static720.anInt10859 * 512 && local135.zFine >= 0 && local135.zFine < Static501.anInt7568 * 512) { + local20.method813(Static102.method2025(local20.plane, -29754, local135.zFine, local135.xFine) - local20.lb, Static333.loop, local135.zFine, local135.xFine); } } } @@ -47,12 +47,12 @@ public static void method7083() { @Pc(193) int local193 = -local20.anInt711 - 1; @Pc(198) Player local198; if (local193 == Static312.anInt5000) { - local198 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2; + local198 = Static556.self; } else { local198 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local193]; } - if (local198 != null && local198.anInt10690 >= 0 && Static720.anInt10859 * 512 > local198.anInt10690 && local198.anInt10694 >= 0 && Static501.anInt7568 * 512 > local198.anInt10694) { - local20.method813(Static102.method2025(local20.aByte144, -29754, local198.anInt10694, local198.anInt10690) - local20.lb, Static333.anInt5455, local198.anInt10694, local198.anInt10690); + if (local198 != null && local198.xFine >= 0 && Static720.anInt10859 * 512 > local198.xFine && local198.zFine >= 0 && Static501.anInt7568 * 512 > local198.zFine) { + local20.method813(Static102.method2025(local20.plane, -29754, local198.zFine, local198.xFine) - local20.lb, Static333.loop, local198.zFine, local198.xFine); } } local20.method819(Static35.anInt800); diff --git a/client/src/main/java/Static528.java b/client/src/main/java/Static528.java index 30f21b5..7a80f07 100644 --- a/client/src/main/java/Static528.java +++ b/client/src/main/java/Static528.java @@ -9,7 +9,7 @@ public final class Static528 { @OriginalMember(owner = "client!ql", name = "a", descriptor = "(BIIII)V") public static void method7087(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(10, (long) arg1); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(10, (long) arg1); local9.method202(); local9.anInt195 = arg2; local9.anInt197 = arg3; diff --git a/client/src/main/java/Static534.java b/client/src/main/java/Static534.java index e74ce58..6a61767 100644 --- a/client/src/main/java/Static534.java +++ b/client/src/main/java/Static534.java @@ -16,7 +16,7 @@ public final class Static534 { @OriginalMember(owner = "client!qq", name = "a", descriptor = "(IIIIIIIZI)V") public static void method7120(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(8) int arg7) { @Pc(17) int local17; - if (Static571.method7566(arg0)) { + if (Static571.load(arg0)) { local17 = 0; @Pc(58) int local58 = 0; @Pc(60) int local60 = 0; @@ -31,7 +31,7 @@ public static void method7120(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 Static691.anInt10368 = 1; } if (Static148.aComponentArrayArray1[arg0] == null) { - Static71.method1522(-1, arg6, Static453.aComponentArrayArray2[arg0], arg1, arg3, arg7, arg5, arg5 < 0, arg2, arg4); + Static71.method1522(-1, arg6, Static453.components[arg0], arg1, arg3, arg7, arg5, arg5 < 0, arg2, arg4); } else { Static71.method1522(-1, arg6, Static148.aComponentArrayArray1[arg0], arg1, arg3, arg7, arg5, arg5 < 0, arg2, arg4); } diff --git a/client/src/main/java/Static536.java b/client/src/main/java/Static536.java index 1e4d3e5..8b353d7 100644 --- a/client/src/main/java/Static536.java +++ b/client/src/main/java/Static536.java @@ -11,7 +11,7 @@ public final class Static536 { public static int anInt8149 = 0; @OriginalMember(owner = "client!qt", name = "a", descriptor = "(IZBI)I") - public static int method7169(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2) { + public static int getItemCount(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2) { @Pc(8) Linkable_Sub22 local8 = Static556.method7303(arg2, arg1); if (local8 == null) { return 0; diff --git a/client/src/main/java/Static538.java b/client/src/main/java/Static538.java index 7902f47..24c9918 100644 --- a/client/src/main/java/Static538.java +++ b/client/src/main/java/Static538.java @@ -103,7 +103,7 @@ public static void method7193() { } local280 = local15.gSamrt1or2(); local284 = local15.g1(); - local31.method9301(local240, local280, local284, local96, Static333.anInt5455, local90, local86); + local31.method9301(local240, local280, local284, local96, Static333.loop, local90, local86); } } } @@ -113,7 +113,7 @@ public static void method7193() { local31.anInt10731 = local15.g1_alt2(); local31.anInt10737 = local73 & 0x7FFF; local31.aBoolean818 = (local73 & 0x8000) != 0; - local31.anInt10719 = local31.anInt10737 + Static333.anInt5455 + local31.anInt10738; + local31.anInt10719 = local31.anInt10737 + Static333.loop + local31.anInt10738; } if ((local35 & 0x40000) != 0) { local31.aString128 = local15.gjstr(); @@ -129,7 +129,7 @@ public static void method7193() { local31.method9310(local31.aNpcType1.anInt6713); local31.anInt10757 = local31.aNpcType1.lb << 3; if (local31.aNpcType1.method5984()) { - Static89.method1714(local31.aByte144, (Player) null, local31.anIntArray879[0], local31.anIntArray878[0], local31, (LocType) null, 0); + Static89.method1714(local31.plane, (Player) null, local31.anIntArray879[0], local31.anIntArray878[0], local31, (LocType) null, 0); } } if ((local35 & 0x2) != 0) { @@ -208,8 +208,8 @@ public static void method7193() { local31.anInt10753 = local15.g1b_alt3(); local31.anInt10761 = local15.g1b_alt2(); local31.anInt10758 = local15.g1b_alt2(); - local31.anInt10759 = local15.g2() + Static333.anInt5455; - local31.anInt10755 = local15.g2_alt3() + Static333.anInt5455; + local31.anInt10759 = local15.g2() + Static333.loop; + local31.anInt10755 = local15.g2_alt3() + Static333.loop; local31.anInt10754 = local15.g1_alt3(); local31.anInt10758 += local31.anIntArray878[0]; local31.anInt10764 = 1; @@ -319,8 +319,8 @@ public static void method7193() { local31.aByte147 = local15.g1b_alt3(); local31.aByte148 = local15.g1b(); local31.aByte149 = (byte) local15.g1_alt3(); - local31.anInt10760 = Static333.anInt5455 + local15.ig2(); - local31.anInt10752 = Static333.anInt5455 + local15.g2(); + local31.anInt10760 = Static333.loop + local15.ig2(); + local31.anInt10752 = Static333.loop + local15.g2(); } } } diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java index 0afec58..b4f622f 100644 --- a/client/src/main/java/Static54.java +++ b/client/src/main/java/Static54.java @@ -16,10 +16,10 @@ public final class Static54 { @OriginalMember(owner = "client!bq", name = "a", descriptor = "(I)V") public static void method1179() { Static342.method4465(Static400.aClass2_Sub34_28.aPreference_Sub5_1.method2172()); - @Pc(19) int local19 = (Static691.anInt10367 >> 3) + (Static170.anInt2864 >> 12); - @Pc(28) int local28 = (Static110.anInt2186 >> 12) + (Static116.anInt2270 >> 3); - Static394.anInt6176 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 = 0; - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method1419(8, 8); + @Pc(19) int local19 = (Static691.originX >> 3) + (Static170.anInt2864 >> 12); + @Pc(28) int local28 = (Static110.anInt2186 >> 12) + (Static116.originZ >> 3); + Static394.anInt6176 = Static556.self.plane = 0; + Static556.self.method1419(8, 8); Static22.anIntArrayArray11 = new int[18][4]; Static363.aByteArrayArray22 = new byte[18][]; Static177.aByteArrayArray5 = new byte[18][]; diff --git a/client/src/main/java/Static540.java b/client/src/main/java/Static540.java index 93bc00b..95ff8ba 100644 --- a/client/src/main/java/Static540.java +++ b/client/src/main/java/Static540.java @@ -8,7 +8,7 @@ public final class Static540 { public static FluTypeList aFluTypeList6; @OriginalMember(owner = "client!r", name = "t", descriptor = "[I") - public static final int[] anIntArray594 = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 }; + public static final int[] FEMALE_FEATURES = new int[] { 7, 8, 9, 10, 11, 12, 13, 15 }; @OriginalMember(owner = "client!r", name = "a", descriptor = "(BC)Z") public static boolean method6536(@OriginalArg(1) char arg0) { @@ -37,7 +37,7 @@ public static boolean method6536(@OriginalArg(1) char arg0) { @OriginalMember(owner = "client!r", name = "a", descriptor = "(IBI)V") public static void method6537(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.method5963(1, (long) arg1); + @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.create(1, (long) arg1); local16.method202(); local16.anInt197 = arg0; } @@ -122,7 +122,7 @@ public static void method6539(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1 local7.anInt957 = arg3; local7.aString3 = arg2; local7.anInt959 = arg5; - local7.anInt953 = Static333.anInt5455 + arg1; + local7.anInt953 = Static333.loop + arg1; local7.anInt956 = arg4; Static422.aParticleLinkedList9.method2787(local7); } diff --git a/client/src/main/java/Static542.java b/client/src/main/java/Static542.java index 6529229..6b998f6 100644 --- a/client/src/main/java/Static542.java +++ b/client/src/main/java/Static542.java @@ -41,7 +41,7 @@ public static void method7200(@OriginalArg(0) Object[] arg0, @OriginalArg(2) lon @OriginalMember(owner = "client!rb", name = "a", descriptor = "(ILclient!hda;)V") public static void method7202(@OriginalArg(1) Component arg0) { - if (arg0.anInt3820 == 5 && arg0.anInt3760 != -1) { + if (arg0.type == 5 && arg0.objId != -1) { Static485.method9415(arg0, Static163.aClass19_17); } } diff --git a/client/src/main/java/Static545.java b/client/src/main/java/Static545.java index 8b84e48..450012b 100644 --- a/client/src/main/java/Static545.java +++ b/client/src/main/java/Static545.java @@ -21,7 +21,7 @@ public static void method7241(@OriginalArg(0) int[] arg0, @OriginalArg(2) int[] } @OriginalMember(owner = "client!rca", name = "a", descriptor = "(ILjava/lang/String;)V") - public static void method7242(@OriginalArg(1) String arg0) { + public static void remove(@OriginalArg(1) String arg0) { if (arg0 == null) { return; } @@ -29,17 +29,17 @@ public static void method7242(@OriginalArg(1) String arg0) { if (local11 == null) { return; } - for (@Pc(22) int local22 = 0; local22 < Static327.anInt5392; local22++) { + for (@Pc(22) int local22 = 0; local22 < Static327.size; local22++) { @Pc(27) String local27 = Static330.aStringArray25[local22]; @Pc(31) String local31 = Static390.method5492(local27); if (Static585.method7682(arg0, local31, local27, local11)) { - Static327.anInt5392--; - for (@Pc(44) int local44 = local22; local44 < Static327.anInt5392; local44++) { + Static327.size--; + for (@Pc(44) int local44 = local22; local44 < Static327.size; local44++) { Static330.aStringArray25[local44] = Static330.aStringArray25[local44 + 1]; Static572.aStringArray42[local44] = Static572.aStringArray42[local44 + 1]; - Static371.anIntArray455[local44] = Static371.anIntArray455[local44 + 1]; - Static419.aStringArray33[local44] = Static419.aStringArray33[local44 + 1]; - Static715.anIntArray881[local44] = Static715.anIntArray881[local44 + 1]; + Static371.worlds[local44] = Static371.worlds[local44 + 1]; + Static419.worldNames[local44] = Static419.worldNames[local44 + 1]; + Static715.ranks[local44] = Static715.ranks[local44 + 1]; Static623.aBooleanArray30[local44] = Static623.aBooleanArray30[local44 + 1]; Static429.aBooleanArray21[local44] = Static429.aBooleanArray21[local44 + 1]; } diff --git a/client/src/main/java/Static546.java b/client/src/main/java/Static546.java index 2f4150b..7e973b5 100644 --- a/client/src/main/java/Static546.java +++ b/client/src/main/java/Static546.java @@ -73,7 +73,7 @@ public static void method7251(@OriginalArg(0) Class19 arg0) { return; } local65 = -1; - if (Static333.anInt5455 % 30 > 15) { + if (Static333.loop % 30 > 15) { local65 = 16777215; } arg0.method7998(12, local9 + 350 - Static42.aClass381_4.anInt10036 - 11, local65, Static42.aClass381_4.method8744("--> " + Static386.method5439(Static110.aString19).substring(0, Static594.anInt8776)) + local7 + 10); diff --git a/client/src/main/java/Static548.java b/client/src/main/java/Static548.java index 417bd0b..eff2888 100644 --- a/client/src/main/java/Static548.java +++ b/client/src/main/java/Static548.java @@ -8,7 +8,7 @@ public final class Static548 { public static int anInt8259; @OriginalMember(owner = "client!re", name = "n", descriptor = "Lclient!av;") - public static HashTable aHashTable40 = new HashTable(8); + public static HashTable openInterfaces = new HashTable(8); @OriginalMember(owner = "client!re", name = "a", descriptor = "(IIIIIIB)V") public static void method7253(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { diff --git a/client/src/main/java/Static549.java b/client/src/main/java/Static549.java index 77f4125..9bad083 100644 --- a/client/src/main/java/Static549.java +++ b/client/src/main/java/Static549.java @@ -14,7 +14,7 @@ public final class Static549 { public static void method8293(@OriginalArg(0) Entity arg0, @OriginalArg(1) boolean arg1) { for (@Pc(2) int local2 = arg0.aShort131; local2 <= arg0.aShort134; local2++) { for (@Pc(6) int local6 = arg0.aShort132; local6 <= arg0.aShort133; local6++) { - @Pc(16) Class291 local16 = Static334.aClass291ArrayArrayArray1[arg0.aByte144][local2][local6]; + @Pc(16) Class291 local16 = Static334.aClass291ArrayArrayArray1[arg0.plane][local2][local6]; if (local16 != null) { @Pc(21) Class286 local21 = local16.aClass286_2; @Pc(23) Class286 local23 = null; diff --git a/client/src/main/java/Static55.java b/client/src/main/java/Static55.java index 8f134d2..a8e519e 100644 --- a/client/src/main/java/Static55.java +++ b/client/src/main/java/Static55.java @@ -47,7 +47,7 @@ public static void method1217(@OriginalArg(0) int arg0, @OriginalArg(2) Secondar Static481.anInt7215 = 0; Static676.anInt10206 = arg2; local147 = OutboundPacket.create(Static664.aClientProt115, Connection.gameConnection.random); - local147.buffer.ip2(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10740); + local147.buffer.ip2(Static556.self.anInt10740); local147.buffer.p4_alt1(Static450.anInt6819); local147.buffer.p2(Static162.anInt2799); local147.buffer.p1_alt3(Static334.aKeyboard1.method8479(82) ? 1 : 0); @@ -58,10 +58,10 @@ public static void method1217(@OriginalArg(0) int arg0, @OriginalArg(2) Secondar @Pc(197) Component local197 = Static15.method186(local16, local19); if (local197 != null) { Static470.method6384(); - @Pc(206) ServerActiveProperties local206 = Static84.method1661(local197); - Static389.method5476(local206.method6216(), local197, local206.anInt6904); + @Pc(206) ServerActiveProperties local206 = Static84.getServerActiveProperties(local197); + Static389.method5476(local206.getTargetMask(), local197, local206.targetParam); Static153.aString27 = Static380.method5359(local197); - Static128.aString108 = local197.aString41 + ""; + Static128.aString108 = local197.optionBase + ""; if (Static153.aString27 == null) { Static153.aString27 = "Null"; } @@ -69,8 +69,8 @@ public static void method1217(@OriginalArg(0) int arg0, @OriginalArg(2) Secondar return; } if (local22 == 58) { - if (Static608.anInt9290 > 0 && Static334.aKeyboard1.method8479(82) && Static334.aKeyboard1.method8479(81)) { - Static624.method8331(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144, Static116.anInt2270 + local19, Static691.anInt10367 + local16); + if (Static608.staffModLevel > 0 && Static334.aKeyboard1.method8479(82) && Static334.aKeyboard1.method8479(81)) { + Static624.method8331(Static556.self.plane, Static116.originZ + local19, Static691.originX + local16); } else { local147 = Static32.method878(local16, local19, local26); if (local26 == 1) { @@ -81,8 +81,8 @@ public static void method1217(@OriginalArg(0) int arg0, @OriginalArg(2) Secondar local147.buffer.p1(Static29.anInt723); local147.buffer.p1(Static660.anInt9835); local147.buffer.p1(89); - local147.buffer.p2(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690); - local147.buffer.p2(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694); + local147.buffer.p2(Static556.self.xFine); + local147.buffer.p2(Static556.self.zFine); local147.buffer.p1(63); } else { Static305.anInt4882 = arg0; @@ -97,7 +97,7 @@ public static void method1217(@OriginalArg(0) int arg0, @OriginalArg(2) Secondar if (local22 == 10 && Static390.aComponent9 == null) { Static479.method6461(local16, local19); Static390.aComponent9 = Static15.method186(local16, local19); - Static178.method2729(Static390.aComponent9); + Static178.redraw(Static390.aComponent9); } @Pc(389) ClientProt local389 = null; if (local22 == 2) { @@ -158,22 +158,22 @@ public static void method1217(@OriginalArg(0) int arg0, @OriginalArg(2) Secondar local494 = OutboundPacket.create(local548, Connection.gameConnection.random); local494.buffer.p2_alt2(local26); local494.buffer.p1(Static334.aKeyboard1.method8479(82) ? 1 : 0); - local494.buffer.p2(local19 + Static116.anInt2270); - local494.buffer.ip2(Static691.anInt10367 + local16); + local494.buffer.p2(local19 + Static116.originZ); + local494.buffer.ip2(Static691.originX + local16); Connection.gameConnection.queue(local494); Static414.method5697(local19, local16); } if (local22 == 11) { - if (Static608.anInt9290 > 0 && Static334.aKeyboard1.method8479(82) && Static334.aKeyboard1.method8479(81)) { - Static624.method8331(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144, Static116.anInt2270 + local19, Static691.anInt10367 + local16); + if (Static608.staffModLevel > 0 && Static334.aKeyboard1.method8479(82) && Static334.aKeyboard1.method8479(81)) { + Static624.method8331(Static556.self.plane, Static116.originZ + local19, Static691.originX + local16); } else { Static481.anInt7215 = 0; Static676.anInt10206 = arg2; Static616.anInt9417 = 1; Static305.anInt4882 = arg0; local494 = OutboundPacket.create(Static512.aClientProt96, Connection.gameConnection.random); - local494.buffer.p2_alt3(local19 + Static116.anInt2270); - local494.buffer.ip2(Static691.anInt10367 + local16); + local494.buffer.p2_alt3(local19 + Static116.originZ); + local494.buffer.ip2(Static691.originX + local16); Connection.gameConnection.queue(local494); } } @@ -234,9 +234,9 @@ public static void method1217(@OriginalArg(0) int arg0, @OriginalArg(2) Secondar Static676.anInt10206 = arg2; local949 = OutboundPacket.create(local878, Connection.gameConnection.random); local949.buffer.p1_alt1(Static334.aKeyboard1.method8479(82) ? 1 : 0); - local949.buffer.p2_alt2(Static691.anInt10367 + local16); + local949.buffer.p2_alt2(Static691.originX + local16); local949.buffer.p2_alt3((int) (local35 >>> 32) & Integer.MAX_VALUE); - local949.buffer.ip2(local19 + Static116.anInt2270); + local949.buffer.ip2(local19 + Static116.originZ); Connection.gameConnection.queue(local949); Static38.method1001(local16, local35, local19); } @@ -249,10 +249,10 @@ public static void method1217(@OriginalArg(0) int arg0, @OriginalArg(2) Secondar Static305.anInt4882 = arg0; Static481.anInt7215 = 0; local949 = OutboundPacket.create(Static181.aClientProt34, Connection.gameConnection.random); - local949.buffer.p2_alt2(Static691.anInt10367 + local16); + local949.buffer.p2_alt2(Static691.originX + local16); local949.buffer.ip2(Static162.anInt2799); local949.buffer.p4_alt2(Static450.anInt6819); - local949.buffer.p2_alt2(Static116.anInt2270 + local19); + local949.buffer.p2_alt2(Static116.originZ + local19); local949.buffer.p2(Static77.anInt1614); Connection.gameConnection.queue(local949); Static147.method2419(0, local19, 1, true, local16, 0, -4, 1); @@ -263,8 +263,8 @@ public static void method1217(@OriginalArg(0) int arg0, @OriginalArg(2) Secondar Static305.anInt4882 = arg0; Static676.anInt10206 = arg2; local949 = OutboundPacket.create(Static175.aClientProt31, Connection.gameConnection.random); - local949.buffer.p2(local16 + Static691.anInt10367); - local949.buffer.p2(Static116.anInt2270 + local19); + local949.buffer.p2(local16 + Static691.originX); + local949.buffer.p2(Static116.originZ + local19); local949.buffer.p2_alt3(Static162.anInt2799); local949.buffer.p4_alt3(Static450.anInt6819); local949.buffer.ip2(Static77.anInt1614); @@ -301,11 +301,11 @@ public static void method1217(@OriginalArg(0) int arg0, @OriginalArg(2) Secondar Static616.anInt9417 = 2; local949 = OutboundPacket.create(Static419.aClientProt77, Connection.gameConnection.random); local949.buffer.p1_alt2(Static334.aKeyboard1.method8479(82) ? 1 : 0); - local949.buffer.ip2(Static116.anInt2270 + local19); + local949.buffer.ip2(Static116.originZ + local19); local949.buffer.ip2(Static77.anInt1614); local949.buffer.p4_alt1(Static450.anInt6819); local949.buffer.p2_alt3(Static162.anInt2799); - local949.buffer.ip2(local16 + Static691.anInt10367); + local949.buffer.ip2(local16 + Static691.originX); local949.buffer.p2_alt2(Integer.MAX_VALUE & (int) (local35 >>> 32)); Connection.gameConnection.queue(local949); Static38.method1001(local16, local35, local19); @@ -314,7 +314,7 @@ public static void method1217(@OriginalArg(0) int arg0, @OriginalArg(2) Secondar Static470.method6384(); } if (Static67.aComponent10 != null && Static499.anInt7501 == 0) { - Static178.method2729(Static67.aComponent10); + Static178.redraw(Static67.aComponent10); } } diff --git a/client/src/main/java/Static550.java b/client/src/main/java/Static550.java index cb9473f..d9f13b8 100644 --- a/client/src/main/java/Static550.java +++ b/client/src/main/java/Static550.java @@ -8,7 +8,7 @@ public final class Static550 { public static int anInt8271; @OriginalMember(owner = "client!rf", name = "a", descriptor = "(BLclient!ca;II)V") - public static void method7260(@OriginalArg(1) Player arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { + public static void animate(@OriginalArg(1) Player arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { @Pc(6) int[] local6 = new int[4]; Static734.method7690(local6, 0, local6.length, arg2); Static651.method8515(local6, arg1, false, arg0); @@ -16,8 +16,8 @@ public static void method7260(@OriginalArg(1) Player arg0, @OriginalArg(2) int a @OriginalMember(owner = "client!rf", name = "a", descriptor = "(II)V") public static void method7265(@OriginalArg(1) int arg0) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(7, (long) arg0); - local9.method205(); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(7, (long) arg0); + local9.pushClient(); } @OriginalMember(owner = "client!rf", name = "a", descriptor = "(I)V") diff --git a/client/src/main/java/Static555.java b/client/src/main/java/Static555.java index 259864a..dfab5f7 100644 --- a/client/src/main/java/Static555.java +++ b/client/src/main/java/Static555.java @@ -23,7 +23,7 @@ public static boolean method7297(@OriginalArg(0) int arg0, @OriginalArg(2) int a @OriginalMember(owner = "client!ria", name = "a", descriptor = "(IIII)V") public static void method7298(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { - @Pc(14) SecondaryLinkable_Sub2 local14 = Static440.method5963(11, (long) arg2); + @Pc(14) SecondaryLinkable_Sub2 local14 = Static440.create(11, (long) arg2); local14.method202(); local14.anInt197 = arg0; local14.anInt195 = arg1; diff --git a/client/src/main/java/Static556.java b/client/src/main/java/Static556.java index c73d778..37099af 100644 --- a/client/src/main/java/Static556.java +++ b/client/src/main/java/Static556.java @@ -5,21 +5,21 @@ public final class Static556 { @OriginalMember(owner = "client!rj", name = "c", descriptor = "Lclient!ca;") - public static Player aClass8_Sub2_Sub1_Sub2_Sub1_2; + public static Player self; @OriginalMember(owner = "client!rj", name = "a", descriptor = "Lclient!uc;") public static Class367 aClass367_2; @OriginalMember(owner = "client!rj", name = "a", descriptor = "(BLclient!hda;)Lclient!hda;") public static Component method7299(@OriginalArg(1) Component arg0) { - if (arg0.anInt3743 != -1) { - return Static145.method2412(arg0.anInt3743); + if (arg0.overlayer != -1) { + return Static145.getComponent(arg0.overlayer); } - @Pc(25) int local25 = arg0.anInt3812 >>> 16; - @Pc(30) Class331 local30 = new Class331(Static548.aHashTable40); + @Pc(25) int local25 = arg0.id >>> 16; + @Pc(30) Class331 local30 = new Class331(Static548.openInterfaces); for (@Pc(35) SubInterface local35 = (SubInterface) local30.method7613(); local35 != null; local35 = (SubInterface) local30.method7610()) { - if (local35.anInt147 == local25) { - return Static145.method2412((int) local35.id); + if (local35.interfaceId == local25) { + return Static145.getComponent((int) local35.id); } } return null; @@ -88,7 +88,7 @@ public static void method7301(@OriginalArg(0) Class19 arg0) { if (local232 == null) { local232 = Static180.aClass14_3; } - local232.method8836(Static329.anIntArray163, Static605.aComponent15.anInt3818, Static605.aComponent15.anInt3802, Static460.anIntArray554, Static605.aComponent15.anInt3779, Static605.aComponent15.anInt3746, Static493.aRandom1, local63, Static366.anInt5852, Static605.aComponent15.anInt3798, Static186.aSoftwareIndexedSpriteArray5, Static178.anInt2947, Static157.anInt2777, Static605.aComponent15.anInt3814); + local232.method8836(Static329.anIntArray163, Static605.aComponent15.halign, Static605.aComponent15.width, Static460.anIntArray554, Static605.aComponent15.color, Static605.aComponent15.height, Static493.aRandom1, local63, Static366.anInt5852, Static605.aComponent15.shadowColor, Static186.aSoftwareIndexedSpriteArray5, Static178.anInt2947, Static157.anInt2777, Static605.aComponent15.valign); Static585.method7670(Static329.anIntArray163[2], Static329.anIntArray163[0], Static329.anIntArray163[3], Static329.anIntArray163[1]); } else if (Static71.aComponent2 != null && Static392.clientModeGame == ModeGame.GAME_RUNESCAPE) { @Pc(299) int local299 = Static180.aClass14_3.method8816(Static186.aSoftwareIndexedSpriteArray5, Static178.anInt2947, Static192.anInt3123 + 16, local63, Static460.anIntArray554, Static493.aRandom1, Static725.anInt10936 + 4); diff --git a/client/src/main/java/Static557.java b/client/src/main/java/Static557.java index 80264af..23ac235 100644 --- a/client/src/main/java/Static557.java +++ b/client/src/main/java/Static557.java @@ -16,7 +16,7 @@ public static void method7331() { } @OriginalMember(owner = "client!rja", name = "d", descriptor = "(I)Lclient!pq;") - public static World method7333() { - return Static59.anInt5936 < Static343.aClass297_Sub1Array2.length ? Static343.aClass297_Sub1Array2[Static59.anInt5936++] : null; + public static World getNextWorld() { + return Static59.anInt5936 < Static343.sorted.length ? Static343.sorted[Static59.anInt5936++] : null; } } diff --git a/client/src/main/java/Static563.java b/client/src/main/java/Static563.java index 7b590f3..d65977a 100644 --- a/client/src/main/java/Static563.java +++ b/client/src/main/java/Static563.java @@ -7,7 +7,7 @@ public final class Static563 { public static int anInt8455; @OriginalMember(owner = "client!ro", name = "h", descriptor = "I") - public static final int anInt8460 = 13156520; + public static final int defaulFogColorRgb = 13156520; @OriginalMember(owner = "client!ro", name = "j", descriptor = "Lclient!ss;") public static final ClientProt aClientProt102 = new ClientProt(88, -1); diff --git a/client/src/main/java/Static568.java b/client/src/main/java/Static568.java index f4d3b8c..f3a84b6 100644 --- a/client/src/main/java/Static568.java +++ b/client/src/main/java/Static568.java @@ -3,5 +3,5 @@ public final class Static568 { @OriginalMember(owner = "client!rt", name = "g", descriptor = "I") - public static final int anInt8497 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ÄËÏÖÜäëïöüÿßÁÀÉÈÍÌÓÒÚÙáàéèíìóòúùÂÊÎÔÛâêîôûÆæãÃõÕçÇ".length(); + public static final int ALPHABET_SIZE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ÄËÏÖÜäëïöüÿßÁÀÉÈÍÌÓÒÚÙáàéèíìóòúùÂÊÎÔÛâêîôûÆæãÃõÕçÇ".length(); } diff --git a/client/src/main/java/Static57.java b/client/src/main/java/Static57.java index 8db6a38..5cd4975 100644 --- a/client/src/main/java/Static57.java +++ b/client/src/main/java/Static57.java @@ -86,7 +86,7 @@ public static void method1231(@OriginalArg(1) String arg0) { @Pc(26) int[] local26 = Static210.anIntArray280; for (@Pc(28) int local28 = 0; local28 < local24; local28++) { @Pc(35) Player local35 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local26[local28]]; - if (local35.name2 != null && local35.name2.equalsIgnoreCase(arg0) && (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 == local35 && (Static717.anInt10822 & 0x10) != 0 || (Static717.anInt10822 & 0x8) != 0)) { + if (local35.username != null && local35.username.equalsIgnoreCase(arg0) && (Static556.self == local35 && (Static717.anInt10822 & 0x10) != 0 || (Static717.anInt10822 & 0x8) != 0)) { @Pc(75) OutboundPacket local75 = OutboundPacket.create(Static664.aClientProt115, Connection.gameConnection.random); local75.buffer.ip2(local26[local28]); local75.buffer.p4_alt1(Static450.anInt6819); diff --git a/client/src/main/java/Static571.java b/client/src/main/java/Static571.java index c24efad..361ed9c 100644 --- a/client/src/main/java/Static571.java +++ b/client/src/main/java/Static571.java @@ -17,7 +17,7 @@ public final class Static571 { public static final ClientProt aClientProt103 = new ClientProt(43, 3); @OriginalMember(owner = "client!rw", name = "d", descriptor = "(II)Z") - public static boolean method7566(@OriginalArg(1) int arg0) { + public static boolean load(@OriginalArg(1) int arg0) { if (Static132.aBooleanArray5[arg0]) { return true; } else if (Static666.aJs5118.isGroupReady(arg0)) { @@ -26,19 +26,19 @@ public static boolean method7566(@OriginalArg(1) int arg0) { Static132.aBooleanArray5[arg0] = true; return true; } - if (Static453.aComponentArrayArray2[arg0] == null) { - Static453.aComponentArrayArray2[arg0] = new Component[local25]; + if (Static453.components[arg0] == null) { + Static453.components[arg0] = new Component[local25]; } for (@Pc(53) int local53 = 0; local53 < local25; local53++) { - if (Static453.aComponentArrayArray2[arg0][local53] == null) { + if (Static453.components[arg0][local53] == null) { @Pc(66) byte[] local66 = Static666.aJs5118.fetchFile(arg0, local53); if (local66 != null) { - @Pc(78) Component local78 = Static453.aComponentArrayArray2[arg0][local53] = new Component(); - local78.anInt3812 = local53 + (arg0 << 16); + @Pc(78) Component local78 = Static453.components[arg0][local53] = new Component(); + local78.id = local53 + (arg0 << 16); if (local66[0] != -1) { throw new IllegalStateException("if1"); } - local78.method3390(new Packet(local66)); + local78.decodeIf3(new Packet(local66)); } } } diff --git a/client/src/main/java/Static574.java b/client/src/main/java/Static574.java index 4544ee3..616ca4c 100644 --- a/client/src/main/java/Static574.java +++ b/client/src/main/java/Static574.java @@ -13,15 +13,15 @@ public final class Static574 { @OriginalMember(owner = "client!saa", name = "b", descriptor = "(I)V") public static void method7572() { if (Static163.aClass19_17.method7978()) { - Static163.aClass19_17.method7972(Static434.aCanvas7); + Static163.aClass19_17.method7972(Static434.canvas); Static208.method3106(); if (Static137.aBoolean210) { - Static720.method9397(Static434.aCanvas7); + Static720.method9397(Static434.canvas); } else { - @Pc(26) Dimension local26 = Static434.aCanvas7.getSize(); - Static163.aClass19_17.method8022(Static434.aCanvas7, local26.width, local26.height); + @Pc(26) Dimension local26 = Static434.canvas.getSize(); + Static163.aClass19_17.method8022(Static434.canvas, local26.width, local26.height); } - Static163.aClass19_17.method8019(Static434.aCanvas7); + Static163.aClass19_17.method8019(Static434.canvas); } else { Static32.method880(Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915(), false); } diff --git a/client/src/main/java/Static580.java b/client/src/main/java/Static580.java index 66ceefa..ee775be 100644 --- a/client/src/main/java/Static580.java +++ b/client/src/main/java/Static580.java @@ -28,8 +28,8 @@ public static int method7649(@OriginalArg(1) boolean arg0) { } @OriginalMember(owner = "client!sea", name = "a", descriptor = "(II)V") - public static void method7651(@OriginalArg(0) int arg0) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(10, (long) arg0); - local9.method205(); + public static void setComponentModelOffsetClient(@OriginalArg(0) int arg0) { + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(10, (long) arg0); + local9.pushClient(); } } diff --git a/client/src/main/java/Static581.java b/client/src/main/java/Static581.java index 1d2dd04..33e85cd 100644 --- a/client/src/main/java/Static581.java +++ b/client/src/main/java/Static581.java @@ -12,5 +12,5 @@ public final class Static581 { public static final int[] anIntArray687 = new int[1]; @OriginalMember(owner = "client!sf", name = "h", descriptor = "[I") - public static final int[] anIntArray688 = new int[25]; + public static final int[] boostedLevels = new int[25]; } diff --git a/client/src/main/java/Static583.java b/client/src/main/java/Static583.java index 2b285ff..8cf8891 100644 --- a/client/src/main/java/Static583.java +++ b/client/src/main/java/Static583.java @@ -4,7 +4,7 @@ public final class Static583 { @OriginalMember(owner = "client!sg", name = "a", descriptor = "(I)V") - public static void method7659() { + public static void updateLoginScreenCamera() { if (Static197.anInt3260 == -1 || Static374.anInt5907 == -1) { return; } @@ -41,9 +41,9 @@ public static void method7659() { local165 = Static603.anIntArrayArrayArray18[Static197.anInt3260][local61 + 2][local63] + local94 - local135 - local127; local57[local63] = (float) local135 + ((float) local140 + (local54 * (float) local165 + (float) local149) * local54) * local54; } - Static110.anInt2186 = (int) local57[2] - Static116.anInt2270 * 512; + Static110.anInt2186 = (int) local57[2] - Static116.originZ * 512; Static359.anInt5801 = (int) local57[1] * -1; - Static170.anInt2864 = (int) local57[0] - Static691.anInt10367 * 512; + Static170.anInt2864 = (int) local57[0] - Static691.originX * 512; @Pc(220) float[] local220 = new float[3]; local94 = Static591.anInt8739 * 2; for (local127 = 0; local127 < 3; local127++) { @@ -61,7 +61,7 @@ public static void method7659() { @Pc(372) float local372 = local220[2] - local57[2]; @Pc(382) double local382 = Math.sqrt((double) (local353 * local353 + local372 * local372)); Static598.anInt8832 = (int) (Math.atan2((double) local363, local382) * 2607.5945876176133D) & 0x3FFF; - Static323.anInt5119 = (int) (-Math.atan2((double) local353, (double) local372) * 2607.5945876176133D) & 0x3FFF; + Static323.cameraYaw = (int) (-Math.atan2((double) local353, (double) local372) * 2607.5945876176133D) & 0x3FFF; Static81.anInt1644 = ((Static603.anIntArrayArrayArray18[Static197.anInt3260][local61 + 2][3] - Static603.anIntArrayArrayArray18[Static197.anInt3260][local61][3]) * Static260.anInt4244 >> 16) + Static603.anIntArrayArrayArray18[Static197.anInt3260][local61][3]; } } diff --git a/client/src/main/java/Static584.java b/client/src/main/java/Static584.java index bbf8d3b..70c8569 100644 --- a/client/src/main/java/Static584.java +++ b/client/src/main/java/Static584.java @@ -5,7 +5,7 @@ public final class Static584 { @OriginalMember(owner = "client!sga", name = "i", descriptor = "I") - public static int anInt8634; + public static int country; @OriginalMember(owner = "client!sga", name = "k", descriptor = "I") public static int anInt8635; diff --git a/client/src/main/java/Static587.java b/client/src/main/java/Static587.java index 215ae5a..bb9d670 100644 --- a/client/src/main/java/Static587.java +++ b/client/src/main/java/Static587.java @@ -34,11 +34,11 @@ public static void method7704() { return; } while (true) { - while (Static343.aClass297_Sub1Array2.length > Static419.anInt6434) { - @Pc(26) World local26 = Static343.aClass297_Sub1Array2[Static419.anInt6434]; + while (Static343.sorted.length > Static419.anInt6434) { + @Pc(26) World local26 = Static343.sorted[Static419.anInt6434]; if (local26 != null && local26.anInt7570 == -1) { if (Static522.aClass2_Sub12_4 == null) { - Static522.aClass2_Sub12_4 = Static151.aClass226_20.method5245(local26.aString90); + Static522.aClass2_Sub12_4 = Static151.aClass226_20.method5245(local26.hostname); } @Pc(54) int local54 = Static522.aClass2_Sub12_4.anInt1631; if (local54 == -1) { diff --git a/client/src/main/java/Static59.java b/client/src/main/java/Static59.java index 0e22d34..a8dec4a 100644 --- a/client/src/main/java/Static59.java +++ b/client/src/main/java/Static59.java @@ -11,7 +11,7 @@ public final class Static59 { public static final SecondaryLinkedList aSecondaryLinkedList9 = new SecondaryLinkedList(); @OriginalMember(owner = "client!bv", name = "o", descriptor = "Lclient!sia;") - public static final LinkedList aLinkedList33 = new LinkedList(); + public static final LinkedList mediumPriorityRequests = new LinkedList(); @OriginalMember(owner = "client!bv", name = "n", descriptor = "I") public static int anInt5936 = 999999; diff --git a/client/src/main/java/Static592.java b/client/src/main/java/Static592.java index 0a2bc22..bc7370a 100644 --- a/client/src/main/java/Static592.java +++ b/client/src/main/java/Static592.java @@ -7,7 +7,7 @@ public final class Static592 { public static final Linkable_Sub45[] aClass2_Sub45Array1 = new Linkable_Sub45[1024]; @OriginalMember(owner = "client!sla", name = "a", descriptor = "(I)V") - public static void method7761() { + public static void updateLockedCamera() { @Pc(9) int local9 = Static121.anInt2333 * 512 + 256; @Pc(15) int local15 = Static709.anInt10667 * 512 + 256; @Pc(24) int local24 = Static102.method2025(Static394.anInt6176, -29754, local15, local9) - Static363.anInt6934; @@ -80,7 +80,7 @@ public static void method7761() { Static598.anInt8832 = local291; } } - @Pc(388) int local388 = local302 - Static323.anInt5119; + @Pc(388) int local388 = local302 - Static323.cameraYaw; if (local388 > 8192) { local388 -= 16384; } @@ -89,14 +89,14 @@ public static void method7761() { } local388 >>= 0x3; if (local388 > 0) { - Static323.anInt5119 += Static314.anInt5035 + Static179.anInt2991 * local388 / 1000 << 3; - Static323.anInt5119 &= 0x3FFF; + Static323.cameraYaw += Static314.anInt5035 + Static179.anInt2991 * local388 / 1000 << 3; + Static323.cameraYaw &= 0x3FFF; } if (local388 < 0) { - Static323.anInt5119 -= Static179.anInt2991 * -local388 / 1000 + Static314.anInt5035 << 3; - Static323.anInt5119 &= 0x3FFF; + Static323.cameraYaw -= Static179.anInt2991 * -local388 / 1000 + Static314.anInt5035 << 3; + Static323.cameraYaw &= 0x3FFF; } - @Pc(456) int local456 = local302 - Static323.anInt5119; + @Pc(456) int local456 = local302 - Static323.cameraYaw; if (local456 > 8192) { local456 -= 16384; } @@ -105,7 +105,7 @@ public static void method7761() { } Static81.anInt1644 = 0; if (local456 < 0 && local388 > 0 || local456 > 0 && local388 < 0) { - Static323.anInt5119 = local302; + Static323.cameraYaw = local302; } } } diff --git a/client/src/main/java/Static595.java b/client/src/main/java/Static595.java index 7e03634..ea32f99 100644 --- a/client/src/main/java/Static595.java +++ b/client/src/main/java/Static595.java @@ -11,7 +11,7 @@ public final class Static595 { public static void method7807(@OriginalArg(1) String arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2) { Static164.method2606(); if (arg2 == 0) { - Static163.aClass19_17 = Static255.method3612(client.shaders, Static56.anInterface4_3, 0, Static434.aCanvas7, Static400.aClass2_Sub34_28.aPreference_Sub13_1.method4373() * 2); + Static163.aClass19_17 = Static255.method3612(client.shaders, Static56.anInterface4_3, 0, Static434.canvas, Static400.aClass2_Sub34_28.aPreference_Sub13_1.method4373() * 2); if (arg0 != null) { Static163.aClass19_17.GA(0); @Pc(36) Class381 local36 = Static74.method1535(Static539.anInt8173, client.fontMetrics); @@ -23,7 +23,7 @@ public static void method7807(@OriginalArg(1) String arg0, @OriginalArg(2) boole @Pc(57) Class19 local57 = null; @Pc(85) Class14 local85; if (arg0 != null) { - local57 = Static255.method3612(client.shaders, Static56.anInterface4_3, 0, Static434.aCanvas7, 0); + local57 = Static255.method3612(client.shaders, Static56.anInterface4_3, 0, Static434.canvas, 0); local57.GA(0); @Pc(76) Class381 local76 = Static74.method1535(Static539.anInt8173, client.fontMetrics); local85 = local57.method8010(local76, Static735.method9375(client.sprites, Static539.anInt8173), true); @@ -34,7 +34,7 @@ public static void method7807(@OriginalArg(1) String arg0, @OriginalArg(2) boole label216: { try { var14 = true; - Static163.aClass19_17 = Static255.method3612(client.shaders, Static56.anInterface4_3, arg2, Static434.aCanvas7, Static400.aClass2_Sub34_28.aPreference_Sub13_1.method4373() * 2); + Static163.aClass19_17 = Static255.method3612(client.shaders, Static56.anInterface4_3, arg2, Static434.canvas, Static400.aClass2_Sub34_28.aPreference_Sub13_1.method4373() * 2); if (arg0 != null) { local57.GA(0); @Pc(118) Class381 local118 = Static74.method1535(Static539.anInt8173, client.fontMetrics); diff --git a/client/src/main/java/Static597.java b/client/src/main/java/Static597.java index c593ca6..58f93f7 100644 --- a/client/src/main/java/Static597.java +++ b/client/src/main/java/Static597.java @@ -8,7 +8,7 @@ public final class Static597 { public static int anInt8821 = -1; @OriginalMember(owner = "client!sr", name = "a", descriptor = "(IIIZ)I") - public static int method7822(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) boolean arg2) { + public static int getItemType(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) boolean arg2) { @Pc(18) Linkable_Sub22 local18 = Static556.method7303(arg0, arg2); if (local18 == null) { return -1; diff --git a/client/src/main/java/Static6.java b/client/src/main/java/Static6.java index 04f1bc0..1ac13f3 100644 --- a/client/src/main/java/Static6.java +++ b/client/src/main/java/Static6.java @@ -11,7 +11,7 @@ public final class Static6 { public static long aLong8 = 0L; @OriginalMember(owner = "client!ad", name = "a", descriptor = "I") - public static int anInt95 = 0; + public static int step = 0; @OriginalMember(owner = "client!ad", name = "a", descriptor = "(BILclient!aa;Lclient!st;IILclient!hda;I)V") public static void method107(@OriginalArg(1) int arg0, @OriginalArg(2) Class1 arg1, @OriginalArg(3) SoftwareIndexedSprite arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) Component arg5, @OriginalArg(7) int arg6) { @@ -19,24 +19,24 @@ public static void method107(@OriginalArg(1) int arg0, @OriginalArg(2) Class1 ar return; } @Pc(15) int local15; - if (Static511.anInt7645 == 4) { + if (Static511.cameraType == 4) { local15 = (int) Static171.aFloat64 & 0x3FFF; } else { local15 = (int) Static171.aFloat64 + Static29.anInt723 & 0x3FFF; } - @Pc(37) int local37 = Math.max(arg5.anInt3802 / 2, arg5.anInt3746 / 2) + 10; + @Pc(37) int local37 = Math.max(arg5.width / 2, arg5.height / 2) + 10; @Pc(45) int local45 = arg3 * arg3 + arg4 * arg4; if (local37 * local37 < local45) { return; } @Pc(60) int local60 = Model.anIntArray741[local15]; @Pc(64) int local64 = Model.anIntArray740[local15]; - if (Static511.anInt7645 != 4) { + if (Static511.cameraType != 4) { local60 = local60 * 256 / (Static660.anInt9835 + 256); local64 = local64 * 256 / (Static660.anInt9835 + 256); } @Pc(98) int local98 = local64 * arg4 + local60 * arg3 >> 14; @Pc(109) int local109 = arg3 * local64 - arg4 * local60 >> 14; - arg2.method8195(local98 + arg5.anInt3802 / 2 + arg6 - arg2.method8203() / 2, arg5.anInt3746 / 2 + arg0 - local109 + -(arg2.method8192() / 2), arg1, arg6, arg0); + arg2.method8195(local98 + arg5.width / 2 + arg6 - arg2.method8203() / 2, arg5.height / 2 + arg0 - local109 + -(arg2.method8192() / 2), arg1, arg6, arg0); } } diff --git a/client/src/main/java/Static603.java b/client/src/main/java/Static603.java index 476385f..f5d54c3 100644 --- a/client/src/main/java/Static603.java +++ b/client/src/main/java/Static603.java @@ -16,7 +16,7 @@ public final class Static603 { @OriginalMember(owner = "client!taa", name = "b", descriptor = "(Z)V") public static void method7899() { - Static178.method2729(Static109.aComponent3); + Static178.redraw(Static109.aComponent3); Static181.anInt3003++; if (Static702.aBoolean797 && Static343.aBoolean428) { @Pc(30) int local30 = 0; @@ -32,45 +32,45 @@ public static void method7899() { if (Static123.anInt2341 > local46) { local46 = Static123.anInt2341; } - if (Static109.aComponent3.anInt3802 + local46 > Static123.anInt2341 - -Static354.aComponent8.anInt3802) { - local46 = Static354.aComponent8.anInt3802 + Static123.anInt2341 - Static109.aComponent3.anInt3802; + if (Static109.aComponent3.width + local46 > Static123.anInt2341 - -Static354.aComponent8.width) { + local46 = Static354.aComponent8.width + Static123.anInt2341 - Static109.aComponent3.width; } if (local52 < Static169.anInt2853) { local52 = Static169.anInt2853; } - if (Static169.anInt2853 + Static354.aComponent8.anInt3746 < local52 - -Static109.aComponent3.anInt3746) { - local52 = Static169.anInt2853 + Static354.aComponent8.anInt3746 - Static109.aComponent3.anInt3746; + if (Static169.anInt2853 + Static354.aComponent8.height < local52 - -Static109.aComponent3.height) { + local52 = Static169.anInt2853 + Static354.aComponent8.height - Static109.aComponent3.height; } - @Pc(119) int local119 = Static354.aComponent8.anInt3809 + local46 - Static123.anInt2341; - @Pc(127) int local127 = Static354.aComponent8.anInt3768 + local52 - Static169.anInt2853; + @Pc(119) int local119 = Static354.aComponent8.scrollX + local46 - Static123.anInt2341; + @Pc(127) int local127 = Static354.aComponent8.scrollY + local52 - Static169.anInt2853; @Pc(197) Linkable_Sub42 local197; if (Static189.aMouse1.method8844()) { - if (Static109.aComponent3.anInt3797 < Static181.anInt3003) { + if (Static109.aComponent3.dragDeadtime < Static181.anInt3003) { @Pc(141) int local141 = local46 - Static655.anInt9763; @Pc(146) int local146 = local52 - Static115.anInt2258; - if (Static109.aComponent3.anInt3754 < local141 || -Static109.aComponent3.anInt3754 > local141 || Static109.aComponent3.anInt3754 < local146 || local146 < -Static109.aComponent3.anInt3754) { + if (Static109.aComponent3.dragDeadzone < local141 || -Static109.aComponent3.dragDeadzone > local141 || Static109.aComponent3.dragDeadzone < local146 || local146 < -Static109.aComponent3.dragDeadzone) { Static172.aBoolean246 = true; } } - if (Static109.aComponent3.anObjectArray30 != null && Static172.aBoolean246) { + if (Static109.aComponent3.onDragStart != null && Static172.aBoolean246) { local197 = new Linkable_Sub42(); local197.aComponent14 = Static109.aComponent3; local197.anInt7218 = local119; local197.anInt7214 = local127; - local197.anObjectArray36 = Static109.aComponent3.anObjectArray30; + local197.anObjectArray36 = Static109.aComponent3.onDragStart; Static472.method6420(local197); return; } } else { if (Static172.aBoolean246) { Static470.method6384(); - if (Static109.aComponent3.anObjectArray5 != null) { + if (Static109.aComponent3.onDragRelease != null) { local197 = new Linkable_Sub42(); local197.aComponent13 = Static327.aComponent7; local197.anInt7218 = local119; local197.aComponent14 = Static109.aComponent3; local197.anInt7214 = local127; - local197.anObjectArray36 = Static109.aComponent3.anObjectArray5; + local197.anObjectArray36 = Static109.aComponent3.onDragRelease; Static472.method6420(local197); } if (Static327.aComponent7 != null && Static84.method1657(Static109.aComponent3) != null) { diff --git a/client/src/main/java/Static604.java b/client/src/main/java/Static604.java index a3a4711..5fdd7ff 100644 --- a/client/src/main/java/Static604.java +++ b/client/src/main/java/Static604.java @@ -9,8 +9,8 @@ public final class Static604 { @OriginalMember(owner = "client!tb", name = "a", descriptor = "(JI)V") public static void method7903(@OriginalArg(0) long arg0) { - @Pc(9) int local9 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 + Static508.anInt7627; - @Pc(15) int local15 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 + Static145.anInt2561; + @Pc(9) int local9 = Static556.self.xFine + Static508.anInt7627; + @Pc(15) int local15 = Static556.self.zFine + Static145.anInt2561; if (Static494.anInt7409 - local9 < -2000 || Static494.anInt7409 - local9 > 2000 || Static38.anInt920 - local15 < -2000 || Static38.anInt920 - local15 > 2000) { Static38.anInt920 = local15; Static494.anInt7409 = local9; diff --git a/client/src/main/java/Static605.java b/client/src/main/java/Static605.java index db04261..1f8c8cd 100644 --- a/client/src/main/java/Static605.java +++ b/client/src/main/java/Static605.java @@ -21,9 +21,9 @@ public static void method7912(@OriginalArg(1) ZoneProt arg0) { if (arg0 == ZoneProt.OPCODE_8) { local15 = local8.g1(); local21 = (local15 & 0x7) + Static270.anInt4354; - local25 = Static116.anInt2270 + local21; + local25 = Static116.originZ + local21; local34 = Static626.anInt9476 + (local15 >> 4 & 0x7); - local38 = Static691.anInt10367 + local34; + local38 = Static691.originX + local34; local42 = local8.g2(); local46 = local8.g2(); local52 = local8.g2(); @@ -144,7 +144,7 @@ public static void method7912(@OriginalArg(1) ZoneProt arg0) { local212 = local8.g2(); if (local21 >= 0 && local25 >= 0 && local21 < Static720.anInt10859 && Static501.anInt7568 > local25) { local217 = local42 + 1; - if (local21 - local217 <= Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray879[0] && local217 + local21 >= Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray879[0] && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray878[0] >= local25 - local217 && local217 + local25 >= Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray878[0]) { + if (local21 - local217 <= Static556.self.anIntArray879[0] && local217 + local21 >= Static556.self.anIntArray879[0] && Static556.self.anIntArray878[0] >= local25 - local217 && local217 + local25 >= Static556.self.anIntArray878[0]) { Static165.method2608(local537, local52, local34, local46, local212, local42 + (local25 << 8) + (Static87.anInt1810 << 24) + (local21 << 16)); } } @@ -209,7 +209,7 @@ public static void method7912(@OriginalArg(1) ZoneProt arg0) { } else { local957 = -local212 - 1; if (local957 == Static312.anInt5000) { - local948 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2; + local948 = Static556.self; } else { local948 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local957]; } @@ -224,17 +224,17 @@ public static void method7912(@OriginalArg(1) ZoneProt arg0) { } } } - @Pc(1053) ProjAnimEntity local1053 = new ProjAnimEntity(local219, Static87.anInt1810, Static87.anInt1810, local21, local25, local812, local322 + Static333.anInt5455, Static333.anInt5455 + local353, local843, local847, local212, local217, local290, local764, local46); - local1053.method813(Static102.method2025(Static87.anInt1810, -29754, local537, local52) - local290, local322 + Static333.anInt5455, local537, local52); + @Pc(1053) ProjAnimEntity local1053 = new ProjAnimEntity(local219, Static87.anInt1810, Static87.anInt1810, local21, local25, local812, local322 + Static333.loop, Static333.loop + local353, local843, local847, local212, local217, local290, local764, local46); + local1053.method813(Static102.method2025(Static87.anInt1810, -29754, local537, local52) - local290, local322 + Static333.loop, local537, local52); Static505.aLinkedList77.addTail(new SecondaryLinkable_Sub15(local1053)); } } else if (ZoneProt.OPCODE_13 == arg0) { local15 = local8.g2_alt2(); local21 = local8.g1_alt1(); local25 = Static270.anInt4354 + (local21 & 0x7); - local34 = local25 + Static116.anInt2270; + local34 = local25 + Static116.originZ; local38 = Static626.anInt9476 + (local21 >> 4 & 0x7); - local42 = Static691.anInt10367 + local38; + local42 = Static691.originX + local38; local46 = local8.ig2(); local52 = local8.g2(); if (local15 != Static312.anInt5000) { @@ -262,7 +262,7 @@ public static void method7912(@OriginalArg(1) ZoneProt arg0) { local212 = local8.g2(); if (local21 >= 0 && local25 >= 0 && Static720.anInt10859 > local21 && Static501.anInt7568 > local25) { local217 = local42 + 1; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray879[0] >= local21 - local217 && local217 + local21 >= Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray879[0] && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray878[0] >= local25 - local217 && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray878[0] <= local25 + local217) { + if (Static556.self.anIntArray879[0] >= local21 - local217 && local217 + local21 >= Static556.self.anIntArray879[0] && Static556.self.anIntArray878[0] >= local25 - local217 && Static556.self.anIntArray878[0] <= local25 + local217) { Static179.method2770(local46, local52, local42 + (local25 << 8) + (Static87.anInt1810 << 24) + (local21 << 16), local212, local537, local34); } } @@ -270,9 +270,9 @@ public static void method7912(@OriginalArg(1) ZoneProt arg0) { local15 = local8.g2(); local21 = local8.g1(); local25 = (local21 & 0x7) + Static270.anInt4354; - local34 = local25 + Static116.anInt2270; + local34 = local25 + Static116.originZ; local38 = (local21 >> 4 & 0x7) + Static626.anInt9476; - local42 = local38 + Static691.anInt10367; + local42 = local38 + Static691.originX; @Pc(1389) Linkable_Sub17 local1389 = (Linkable_Sub17) Static497.aHashTable35.get((long) (local34 << 14 | Static87.anInt1810 << 28 | local42)); if (local1389 != null) { for (@Pc(1399) Linkable_Sub15 local1399 = (Linkable_Sub15) local1389.aLinkedList12.head(); local1399 != null; local1399 = (Linkable_Sub15) local1389.aLinkedList12.next()) { @@ -324,8 +324,8 @@ public static void method7912(@OriginalArg(1) ZoneProt arg0) { local212 <<= 0x2; local38 = local38 * 512 + 256; local34 = local34 * 512 + 256; - @Pc(1728) ProjAnimEntity local1728 = new ProjAnimEntity(local52, Static87.anInt1810, Static87.anInt1810, local25, local34, local537, local217 + Static333.anInt5455, local219 + Static333.anInt5455, local812, local290, 0, local46, local212, local1540, -1); - local1728.method813(Static102.method2025(Static87.anInt1810, -29754, local42, local38) - local212, Static333.anInt5455 + local217, local42, local38); + @Pc(1728) ProjAnimEntity local1728 = new ProjAnimEntity(local52, Static87.anInt1810, Static87.anInt1810, local25, local34, local537, local217 + Static333.loop, local219 + Static333.loop, local812, local290, 0, local46, local212, local1540, -1); + local1728.method813(Static102.method2025(Static87.anInt1810, -29754, local42, local38) - local212, Static333.loop + local217, local42, local38); Static505.aLinkedList77.addTail(new SecondaryLinkable_Sub15(local1728)); } } else if (ZoneProt.OPCODE_7 == arg0) { @@ -342,9 +342,9 @@ public static void method7912(@OriginalArg(1) ZoneProt arg0) { } else if (ZoneProt.OPCODE_14 == arg0) { local15 = local8.g1_alt2(); local21 = Static270.anInt4354 + (local15 & 0x7); - local25 = local21 + Static116.anInt2270; + local25 = local21 + Static116.originZ; local34 = (local15 >> 4 & 0x7) + Static626.anInt9476; - local38 = Static691.anInt10367 + local34; + local38 = Static691.originX + local34; local42 = local8.g2_alt2(); local46 = local8.g2(); @Pc(1886) boolean local1886 = local34 >= 0 && local21 >= 0 && local34 < Static720.anInt10859 && local21 < Static501.anInt7568; diff --git a/client/src/main/java/Static608.java b/client/src/main/java/Static608.java index bcc17d4..a6124cb 100644 --- a/client/src/main/java/Static608.java +++ b/client/src/main/java/Static608.java @@ -11,7 +11,7 @@ public final class Static608 { public static int anInt9289; @OriginalMember(owner = "client!td", name = "n", descriptor = "I") - public static int anInt9290 = 0; + public static int staffModLevel = 0; @OriginalMember(owner = "client!td", name = "a", descriptor = "(IIIIIIZ)V") public static void method8176(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(4) int arg2, @OriginalArg(5) int arg3) { @@ -71,7 +71,7 @@ public static void method8176(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 } } } - if (local51.anInt10739 < 0 || local51.anInt10704 != Static198.anInt3276 && Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 != local51.aByte144) { + if (local51.anInt10739 < 0 || local51.anInt10704 != Static198.anInt3276 && Static556.self.plane != local51.plane) { continue; } } @@ -91,7 +91,7 @@ public static void method8176(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 @Pc(306) SoftwareIndexedSprite[] local306; @Pc(313) Class407[] local313; @Pc(381) SoftwareIndexedSprite local381; - if (local51.aBoolean816 || Static333.anInt5455 >= local51.anInt10747) { + if (local51.aBoolean816 || Static333.loop >= local51.anInt10747) { local233 -= Math.max(Static42.aClass381_4.anInt10030, Static119.aSoftwareIndexedSpriteArray3[0].method8182()); } else { @Pc(262) byte local262 = 1; @@ -146,7 +146,7 @@ public static void method8176(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 if (!local51.aBoolean816) { @Pc(486) SoftwareIndexedSprite local486; @Pc(496) SoftwareIndexedSprite local496; - if (local51.anInt10719 > Static333.anInt5455) { + if (local51.anInt10719 > Static333.loop) { local486 = Static34.aSoftwareIndexedSpriteArray2[local51.aBoolean818 ? 2 : 0]; local496 = Static34.aSoftwareIndexedSpriteArray2[local51.aBoolean818 ? 3 : 1]; if (local51 instanceof Npc) { @@ -174,7 +174,7 @@ public static void method8176(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 local496 = local306[local51.aBoolean818 ? 3 : 1]; } } - @Pc(612) int local612 = local51.anInt10719 - Static333.anInt5455; + @Pc(612) int local612 = local51.anInt10719 - Static333.loop; if (local51.anInt10738 < local612) { local612 -= local51.anInt10738; local321 = local51.anInt10731 == 0 ? 0 : (local51.anInt10737 - local612) / local51.anInt10731 * local51.anInt10731; @@ -233,7 +233,7 @@ public static void method8176(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 local1071 = true; } else { local409 = Static504.method6733() * 1000 / local913.anInt6360 / 2; - local1071 = local409 > Static333.anInt5455 % (local409 * 2); + local1071 = local409 > Static333.loop % (local409 * 2); } if (local1071) { local381.method8202(Static215.anIntArray284[0] + arg2 - 12, -local381.method8182() + local233); @@ -266,7 +266,7 @@ public static void method8176(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 @Pc(1186) HitmarkType local1186 = null; local651 = 0; if (local504 >= 0) { - if (Static333.anInt5455 >= local1179) { + if (Static333.loop >= local1179) { continue; } local1186 = Static561.aHitmarkTypeList2.method5186(local51.anIntArray873[local267]); @@ -279,10 +279,10 @@ public static void method8176(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 if (local321 >= 0) { local1218 = Static561.aHitmarkTypeList2.method5186(local321); } - if (local1179 - local651 <= Static333.anInt5455) { + if (local1179 - local651 <= Static333.loop) { local412 = local51.anIntArray875[local267]; if (local412 >= 0) { - local51.anInt10747 = Static333.anInt5455 + 300; + local51.anInt10747 = Static333.loop + 300; local51.anInt10726 = local412; local51.anIntArray875[local267] = -1; } @@ -494,7 +494,7 @@ public static void method8176(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 local1719 += local1351; } } - local1831 = local51.anIntArray871[local267] - Static333.anInt5455; + local1831 = local51.anIntArray871[local267] - Static333.loop; @Pc(1871) int local1871 = local1186.anInt7184 - local1186.anInt7184 * local1831 / local1186.anInt7192; @Pc(1884) int local1884 = local1831 * local1186.anInt7191 / local1186.anInt7192 - local1186.anInt7191; @Pc(1898) int local1898 = arg2 + Static215.anIntArray284[0] + local1871 - (local1719 >> 1); diff --git a/client/src/main/java/Static610.java b/client/src/main/java/Static610.java index 7cbe848..6710942 100644 --- a/client/src/main/java/Static610.java +++ b/client/src/main/java/Static610.java @@ -136,23 +136,23 @@ public static void method8217(@OriginalArg(0) int arg0, @OriginalArg(1) PacketBi } else { local37.method1425(local573, local566, Static139.aByteArray30[arg0]); } - local37.aByte144 = local37.aByte143 = (byte) (local37.aByte144 + local175 & 0x3); + local37.plane = local37.aByte143 = (byte) (local37.plane + local175 & 0x3); if (Static441.method5968(local573, local566)) { local37.aByte143++; } if (Static312.anInt5000 == arg0) { - if (local37.aByte144 != Static394.anInt6176) { + if (local37.plane != Static394.anInt6176) { Static75.aBoolean521 = true; } - Static394.anInt6176 = local37.aByte144; + Static394.anInt6176 = local37.plane; } } else { local170 = arg1.gBit(30); local175 = local170 >> 28; local539 = local170 >> 14 & 0x3FFF; local551 = local170 & 0x3FFF; - local566 = (local37.anIntArray879[0] + Static691.anInt10367 + local539 & 0x3FFF) - Static691.anInt10367; - local573 = (local551 + local37.anIntArray878[0] + Static116.anInt2270 & 0x3FFF) - Static116.anInt2270; + local566 = (local37.anIntArray879[0] + Static691.originX + local539 & 0x3FFF) - Static691.originX; + local573 = (local551 + local37.anIntArray878[0] + Static116.originZ & 0x3FFF) - Static116.originZ; if (local16) { local37.aBoolean127 = true; local37.anInt1448 = local573; @@ -160,12 +160,12 @@ public static void method8217(@OriginalArg(0) int arg0, @OriginalArg(1) PacketBi } else { local37.method1425(local573, local566, Static139.aByteArray30[arg0]); } - local37.aByte144 = local37.aByte143 = (byte) (local175 + local37.aByte144 & 0x3); + local37.plane = local37.aByte143 = (byte) (local175 + local37.plane & 0x3); if (Static441.method5968(local573, local566)) { local37.aByte143++; } if (Static312.anInt5000 == arg0) { - Static394.anInt6176 = local37.aByte144; + Static394.anInt6176 = local37.plane; } } } @@ -175,7 +175,7 @@ public static void method8217(@OriginalArg(0) int arg0, @OriginalArg(1) PacketBi throw new RuntimeException("s:lr"); } else { @Pc(70) Class350 local70 = Static246.aClass350Array1[arg0] = new Class350(); - local70.anInt9324 = (local37.aByte144 << 28) + ((Static691.anInt10367 + local37.anIntArray879[0] >> 6 << 14) + (Static116.anInt2270 + local37.anIntArray878[0] >> 6)); + local70.anInt9324 = (local37.plane << 28) + ((Static691.originX + local37.anIntArray879[0] >> 6 << 14) + (Static116.originZ + local37.anIntArray878[0] >> 6)); if (local37.anInt1467 == -1) { local70.anInt9326 = local37.aClass126_7.method2673(16383); } else { diff --git a/client/src/main/java/Static611.java b/client/src/main/java/Static611.java index 09c3b87..93beb9a 100644 --- a/client/src/main/java/Static611.java +++ b/client/src/main/java/Static611.java @@ -12,8 +12,8 @@ public final class Static611 { @OriginalMember(owner = "client!tfa", name = "a", descriptor = "(II)V") public static void method8227(@OriginalArg(1) int arg0) { - @Pc(23) SecondaryLinkable_Sub2 local23 = Static440.method5963(3, (long) arg0); - local23.method205(); + @Pc(23) SecondaryLinkable_Sub2 local23 = Static440.create(3, (long) arg0); + local23.pushClient(); } @OriginalMember(owner = "client!tfa", name = "c", descriptor = "(ZI)I") @@ -36,7 +36,7 @@ public static int method8228(@OriginalArg(1) int arg0) { Static400.aClass2_Sub34_28.method5104(2, Static400.aClass2_Sub34_28.aPreference_Sub29_2); Static32.method880(2, false); } - Static666.method8693(1); + Static666.write(1); return local8; } diff --git a/client/src/main/java/Static614.java b/client/src/main/java/Static614.java index da56d0c..6084060 100644 --- a/client/src/main/java/Static614.java +++ b/client/src/main/java/Static614.java @@ -17,7 +17,7 @@ public final class Static614 { public static final boolean aBoolean718 = false; @OriginalMember(owner = "client!th", name = "a", descriptor = "(ZJ)I") - public static int method8242(@OriginalArg(1) long arg0) { + public static int getYear(@OriginalArg(1) long arg0) { Static551.method7276(arg0); return Static260.aCalendar2.get(1); } @@ -39,7 +39,7 @@ public static void method8245() { Static354.aLocTypeList4.cleanCaches(); Static690.aNpcTypeList2.method7085(); ObjTypeList.objTypes.method2479(); - Static25.aSeqTypeList1.method1163(); + Static25.aSeqTypeList1.clean(); Static23.aSpotAnimTypeList1.method2698(); Static529.aVarBitTypeList1.method3428(); Static36.aVarPlayerTypeList1.method5785(); diff --git a/client/src/main/java/Static615.java b/client/src/main/java/Static615.java index a7154f9..514740e 100644 --- a/client/src/main/java/Static615.java +++ b/client/src/main/java/Static615.java @@ -13,7 +13,7 @@ public final class Static615 { public static final int[] anIntArray719 = new int[13]; @OriginalMember(owner = "client!tha", name = "a", descriptor = "(II)Lclient!pq;") - public static World method8260(@OriginalArg(1) int arg0) { - return Static518.aBoolean814 && Static494.anInt7396 <= arg0 && Static699.anInt10532 >= arg0 ? Static106.aClass297_Sub1Array1[arg0 - Static494.anInt7396] : null; + public static World getWorld(@OriginalArg(1) int arg0) { + return Static518.loaded && Static494.minId <= arg0 && Static699.maxId >= arg0 ? Static106.worlds[arg0 - Static494.minId] : null; } } diff --git a/client/src/main/java/Static617.java b/client/src/main/java/Static617.java index fb6ddeb..ca6a29e 100644 --- a/client/src/main/java/Static617.java +++ b/client/src/main/java/Static617.java @@ -11,7 +11,7 @@ public final class Static617 { public static int anInt9434; @OriginalMember(owner = "client!tj", name = "H", descriptor = "Z") - public static boolean aBoolean724 = false; + public static boolean mapQuickChat = false; @OriginalMember(owner = "client!tj", name = "C", descriptor = "[F") public static final float[] aFloatArray69 = new float[4]; diff --git a/client/src/main/java/Static618.java b/client/src/main/java/Static618.java index 92ac193..eb37088 100644 --- a/client/src/main/java/Static618.java +++ b/client/src/main/java/Static618.java @@ -8,7 +8,7 @@ public final class Static618 { public static int anInt9449; @OriginalMember(owner = "client!tja", name = "G", descriptor = "Lclient!sia;") - public static final LinkedList aLinkedList68 = new LinkedList(); + public static final LinkedList highPriorityRequests = new LinkedList(); @OriginalMember(owner = "client!tja", name = "a", descriptor = "(III)Z") public static boolean method8316(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @@ -84,10 +84,10 @@ public static Model method8320(@OriginalArg(0) int arg0, @OriginalArg(1) Model a local12 &= 0xFFFFFDFF; } @Pc(58) long local58 = ((long) arg3 << 48) + ((long) arg11 << 32) + (long) (arg5 + (arg7 << 16) + (arg0 << 24)); - @Pc(60) SoftLruHashTable local60 = Static354.aSoftLruHashTable120; + @Pc(60) SoftLruHashTable local60 = Static354.SHADOWS; @Pc(68) Model local68; - synchronized (Static354.aSoftLruHashTable120) { - local68 = (Model) Static354.aSoftLruHashTable120.get(local58); + synchronized (Static354.SHADOWS) { + local68 = (Model) Static354.SHADOWS.get(local58); } if (local68 == null || arg6.method7960(local68.ua(), local12) != 0) { if (local68 != null) { @@ -138,9 +138,9 @@ public static Model method8320(@OriginalArg(0) int arg0, @OriginalArg(1) Model a } } local68 = arg6.method7952(local162, local12, Static722.anInt10905, 64, 768); - @Pc(440) SoftLruHashTable local440 = Static354.aSoftLruHashTable120; - synchronized (Static354.aSoftLruHashTable120) { - Static354.aSoftLruHashTable120.put(local58, local68); + @Pc(440) SoftLruHashTable local440 = Static354.SHADOWS; + synchronized (Static354.SHADOWS) { + Static354.SHADOWS.put(local58, local68); } } @Pc(456) int local456 = arg1.V(); diff --git a/client/src/main/java/Static62.java b/client/src/main/java/Static62.java index f098285..2fa2995 100644 --- a/client/src/main/java/Static62.java +++ b/client/src/main/java/Static62.java @@ -18,7 +18,7 @@ public final class Static62 { @OriginalMember(owner = "client!ca", name = "b", descriptor = "(II)V") public static void method1423(@OriginalArg(0) int arg0) { - @Pc(17) SecondaryLinkable_Sub2 local17 = Static440.method5963(5, (long) arg0); - local17.method205(); + @Pc(17) SecondaryLinkable_Sub2 local17 = Static440.create(5, (long) arg0); + local17.pushClient(); } } diff --git a/client/src/main/java/Static620.java b/client/src/main/java/Static620.java index 634dd8a..dab7ce9 100644 --- a/client/src/main/java/Static620.java +++ b/client/src/main/java/Static620.java @@ -28,19 +28,19 @@ public static void method8322(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1 @Pc(66) int local66; for (local36 = 0; local36 < local34.length / 2; local36++) { @Pc(51) int local51; - if (Static511.anInt7645 == 4) { + if (Static511.cameraType == 4) { local51 = (int) Static171.aFloat64 & 0x3FFF; } else { local51 = (int) Static171.aFloat64 + Static29.anInt723 & 0x3FFF; } local62 = Model.anIntArray741[local51]; local66 = Model.anIntArray740[local51]; - if (Static511.anInt7645 != 4) { + if (Static511.cameraType != 4) { local62 = local62 * 256 / (Static660.anInt9835 + 256); local66 = local66 * 256 / (Static660.anInt9835 + 256); } - local34[local36 * 2] = arg7.anInt3802 / 2 + arg1 + (local66 * (local10.anIntArray228[local36 * 2] * 4 + arg6) + local62 * (arg0 + local10.anIntArray228[local36 * 2 + 1] * 4) >> 14); - local34[local36 * 2 + 1] = arg5 + arg7.anInt3746 / 2 - (local66 * (arg0 + local10.anIntArray228[local36 * 2 + 1] * 4) - local62 * (arg6 + local10.anIntArray228[local36 * 2] * 4) >> 14); + local34[local36 * 2] = arg7.width / 2 + arg1 + (local66 * (local10.anIntArray228[local36 * 2] * 4 + arg6) + local62 * (arg0 + local10.anIntArray228[local36 * 2 + 1] * 4) >> 14); + local34[local36 * 2 + 1] = arg5 + arg7.height / 2 - (local66 * (arg0 + local10.anIntArray228[local36 * 2 + 1] * 4) - local62 * (arg6 + local10.anIntArray228[local36 * 2] * 4) >> 14); } @Pc(187) Class159 local187 = arg7.method3393(arg3); if (local187 != null) { diff --git a/client/src/main/java/Static622.java b/client/src/main/java/Static622.java index 34e4ba1..12748b4 100644 --- a/client/src/main/java/Static622.java +++ b/client/src/main/java/Static622.java @@ -9,7 +9,7 @@ public final class Static622 { public static int anInt7737 = 0; @OriginalMember(owner = "client!tla", name = "a", descriptor = "(II)I") - public static int method6853(@OriginalArg(0) int arg0) { + public static int getTargetMask(@OriginalArg(0) int arg0) { return arg0 >> 11 & 0x7F; } diff --git a/client/src/main/java/Static625.java b/client/src/main/java/Static625.java index a725d10..bb7d6a8 100644 --- a/client/src/main/java/Static625.java +++ b/client/src/main/java/Static625.java @@ -38,7 +38,7 @@ public static int method8337() { Static400.aClass2_Sub34_28.method5104(0, Static400.aClass2_Sub34_28.aPreference_Sub29_2); Static32.method880(0, false); } - Static666.method8693(1); + Static666.write(1); return local10; } } diff --git a/client/src/main/java/Static63.java b/client/src/main/java/Static63.java index 02dbf05..0fae4e2 100644 --- a/client/src/main/java/Static63.java +++ b/client/src/main/java/Static63.java @@ -11,7 +11,7 @@ public final class Static63 { public static SoftwareIndexedSprite aSoftwareIndexedSprite8; @OriginalMember(owner = "client!caa", name = "a", descriptor = "(IIII)V") - public static void method1427(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { + public static void playSong(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { @Pc(12) int local12 = arg0 * Static400.aClass2_Sub34_28.aPreference_Sub25_2.method7208() >> 8; if (arg1 == -1 && !Static501.aBoolean575) { Static100.method1988(); diff --git a/client/src/main/java/Static632.java b/client/src/main/java/Static632.java index d3d27be..eae06a3 100644 --- a/client/src/main/java/Static632.java +++ b/client/src/main/java/Static632.java @@ -83,14 +83,14 @@ public static void method8366(@OriginalArg(0) int arg0, @OriginalArg(1) Linkable if (local187 > 0 && local172 > 0) { local182 = (local172 - local187) * local33 / local172; } - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method9302((byte) 71); + Static556.self.method9302((byte) 71); @Pc(214) int local214 = 8192; @Pc(225) int local225 = (arg1.anInt9362 + arg1.anInt9357) / 2 - arg3; @Pc(236) int local236 = (arg1.anInt9349 + arg1.anInt9352) / 2 - arg4; @Pc(264) int local264; @Pc(275) int local275; if (local225 != 0 || local236 != 0) { - local264 = -Static323.anInt5119 - (int) (Math.atan2((double) local225, (double) local236) * 2607.5945876176133D) - 4096 & 0x3FFF; + local264 = -Static323.cameraYaw - (int) (Math.atan2((double) local225, (double) local236) * 2607.5945876176133D) - 4096 & 0x3FFF; if (local264 > 8192) { local264 = 16384 - local264; } diff --git a/client/src/main/java/Static633.java b/client/src/main/java/Static633.java index 9a5c22f..702402f 100644 --- a/client/src/main/java/Static633.java +++ b/client/src/main/java/Static633.java @@ -9,8 +9,8 @@ public final class Static633 { @OriginalMember(owner = "client!ua", name = "a", descriptor = "(ZI)V") public static void method9425(@OriginalArg(1) int arg0) { - @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.method5963(6, (long) arg0); - local16.method205(); + @Pc(16) SecondaryLinkable_Sub2 local16 = Static440.create(6, (long) arg0); + local16.pushClient(); } @OriginalMember(owner = "client!ua", name = "a", descriptor = "(IIII)I") diff --git a/client/src/main/java/Static638.java b/client/src/main/java/Static638.java index 8ca3be4..cb53398 100644 --- a/client/src/main/java/Static638.java +++ b/client/src/main/java/Static638.java @@ -17,52 +17,52 @@ public static void method8393() { } @OriginalMember(owner = "client!uca", name = "a", descriptor = "(Lclient!vq;BIILjava/awt/Component;)Lclient!cd;") - public static AudioChannel method8394(@OriginalArg(0) Signlink arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Component arg3) { - if (Static686.anInt8944 == 0) { + public static AudioChannel create(@OriginalArg(0) Signlink arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Component arg3) { + if (Static686.sampleRate == 0) { throw new IllegalStateException(); } else if (arg1 >= 2) { throw new IllegalArgumentException(); } else { try { @Pc(41) AudioChannel local41 = (AudioChannel) Class.forName("JavaAudioChannel").getDeclaredConstructor().newInstance(); - local41.anIntArray315 = new int[(Static316.aBoolean644 ? 2 : 1) * 256]; - local41.anInt4098 = arg2; - local41.method3593(arg3); - local41.anInt4097 = (-1024 & arg2) + 1024; - if (local41.anInt4097 > 16384) { - local41.anInt4097 = 16384; + local41.samples = new int[(Static316.stereo ? 2 : 1) * 256]; + local41.sampleRate2 = arg2; + local41.init(arg3); + local41.bufferCapacity = (-1024 & arg2) + 1024; + if (local41.bufferCapacity > 16384) { + local41.bufferCapacity = 16384; } - local41.method3588(local41.anInt4097); - if (Static156.anInt2679 > 0 && Static232.aAudioThread1 == null) { - Static232.aAudioThread1 = new AudioThread(); - Static232.aAudioThread1.aSignlink2 = arg0; - arg0.method8991(Static232.aAudioThread1, Static156.anInt2679); + local41.open(local41.bufferCapacity); + if (Static156.threadPriority > 0 && Static232.thread == null) { + Static232.thread = new AudioThread(); + Static232.thread.signLink = arg0; + arg0.startThread(Static232.thread, Static156.threadPriority); } - if (Static232.aAudioThread1 != null) { - if (Static232.aAudioThread1.aAudioChannelArray1[arg1] != null) { + if (Static232.thread != null) { + if (Static232.thread.channels[arg1] != null) { throw new IllegalArgumentException(); } - Static232.aAudioThread1.aAudioChannelArray1[arg1] = local41; + Static232.thread.channels[arg1] = local41; } return local41; } catch (@Pc(135) Throwable local135) { try { @Pc(141) SignLinkAudioChannel local141 = new SignLinkAudioChannel(arg0, arg1); - local141.anIntArray315 = new int[(Static316.aBoolean644 ? 2 : 1) * 256]; - local141.anInt4098 = arg2; - local141.method3593(arg3); - local141.anInt4097 = 16384; - local141.method3588(local141.anInt4097); - if (Static156.anInt2679 > 0 && Static232.aAudioThread1 == null) { - Static232.aAudioThread1 = new AudioThread(); - Static232.aAudioThread1.aSignlink2 = arg0; - arg0.method8991(Static232.aAudioThread1, Static156.anInt2679); + local141.samples = new int[(Static316.stereo ? 2 : 1) * 256]; + local141.sampleRate2 = arg2; + local141.init(arg3); + local141.bufferCapacity = 16384; + local141.open(local141.bufferCapacity); + if (Static156.threadPriority > 0 && Static232.thread == null) { + Static232.thread = new AudioThread(); + Static232.thread.signLink = arg0; + arg0.startThread(Static232.thread, Static156.threadPriority); } - if (Static232.aAudioThread1 != null) { - if (Static232.aAudioThread1.aAudioChannelArray1[arg1] != null) { + if (Static232.thread != null) { + if (Static232.thread.channels[arg1] != null) { throw new IllegalArgumentException(); } - Static232.aAudioThread1.aAudioChannelArray1[arg1] = local141; + Static232.thread.channels[arg1] = local141; } return local141; } catch (@Pc(211) Throwable local211) { @@ -94,7 +94,7 @@ public static void doSleep(@OriginalArg(0) long ms) { } @OriginalMember(owner = "client!uca", name = "b", descriptor = "(Z)Lclient!gh;") - public static ReferenceNodeFactory method8396() { + public static ReferenceNodeFactory createSoftReferenceNodeFactory() { try { return (ReferenceNodeFactory) Class.forName("SoftReferenceNodeFactory").getDeclaredConstructor().newInstance(); } catch (@Pc(16) Throwable local16) { @@ -118,7 +118,7 @@ public static void method8397(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 @Pc(51) int local51 = local28 - Static110.anInt2186; @Pc(62) int local62 = (int) Math.sqrt((double) (local51 * local51 + local41 * local41)); Static598.anInt8832 = (int) (Math.atan2((double) local46, (double) local62) * 2607.5945876176133D) & 0x3FFF; - Static323.anInt5119 = (int) (-2607.5945876176133D * Math.atan2((double) local41, (double) local51)) & 0x3FFF; + Static323.cameraYaw = (int) (-2607.5945876176133D * Math.atan2((double) local41, (double) local51)) & 0x3FFF; if (Static598.anInt8832 < 1024) { Static598.anInt8832 = 1024; } @@ -129,7 +129,7 @@ public static void method8397(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 } Static693.anInt10383 = -1; Static692.anInt10376 = -1; - Static511.anInt7645 = 2; + Static511.cameraType = 2; } @OriginalMember(owner = "client!uca", name = "a", descriptor = "(III)Lclient!nda;") diff --git a/client/src/main/java/Static640.java b/client/src/main/java/Static640.java index 33b9360..e55101b 100644 --- a/client/src/main/java/Static640.java +++ b/client/src/main/java/Static640.java @@ -12,7 +12,7 @@ public final class Static640 { @OriginalMember(owner = "client!uda", name = "a", descriptor = "(IZ)V") public static void method8435(@OriginalArg(1) boolean arg0) { - Static19.method265(arg0, Static377.anInt5930, Static380.anInt5979, Static680.anInt10289); + Static19.method265(arg0, Static377.topLevelInterface, Static380.anInt5979, Static680.anInt10289); } @OriginalMember(owner = "client!uda", name = "i", descriptor = "(I)Lclient!wca;") diff --git a/client/src/main/java/Static643.java b/client/src/main/java/Static643.java index c8ce8d6..de14f06 100644 --- a/client/src/main/java/Static643.java +++ b/client/src/main/java/Static643.java @@ -25,21 +25,21 @@ public static Class19 method8443(@OriginalArg(0) int arg0, @OriginalArg(2) Inter public static void method8444(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) { for (@Pc(3) int local3 = 0; local3 < arg1.length; local3++) { @Pc(9) Component local9 = arg1[local3]; - if (local9 != null && local9.anInt3743 == arg0 && !Static84.method1660(local9)) { - if (local9.anInt3820 == 0) { - method8444(local9.anInt3812, arg1); + if (local9 != null && local9.overlayer == arg0 && !Static84.method1660(local9)) { + if (local9.type == 0) { + method8444(local9.id, arg1); if (local9.aComponentArray1 != null) { - method8444(local9.anInt3812, local9.aComponentArray1); + method8444(local9.id, local9.aComponentArray1); } - @Pc(56) SubInterface local56 = (SubInterface) Static548.aHashTable40.get((long) local9.anInt3812); + @Pc(56) SubInterface local56 = (SubInterface) Static548.openInterfaces.get((long) local9.id); if (local56 != null) { - Static26.method716(local56.anInt147); + Static26.method716(local56.interfaceId); } } - if (local9.anInt3820 == 6 && local9.anInt3789 != -1) { + if (local9.type == 6 && local9.modelSeqId != -1) { if (local9.aClass152_6 == null) { local9.aClass152_6 = new Class152_Sub1(); - local9.aClass152_6.method9113(true, local9.anInt3789); + local9.aClass152_6.method9113(true, local9.modelSeqId); } if (local9.aClass152_6.method9112(Static35.anInt800) && local9.aClass152_6.method9102()) { local9.aClass152_6.method9099(); diff --git a/client/src/main/java/Static646.java b/client/src/main/java/Static646.java index 4f20ced..015b71d 100644 --- a/client/src/main/java/Static646.java +++ b/client/src/main/java/Static646.java @@ -16,23 +16,23 @@ public static void method8453(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 for (@Pc(33) Class286 local33 = local28.aClass286_2; local33 != null; local33 = local33.aClass286_1) { @Pc(37) Entity local37 = local33.aClass8_Sub2_Sub1_1; if (local37.aShort131 == arg0 && local37.aShort132 == arg1) { - local37.aByte144--; + local37.plane--; } } if (local28.aClass8_Sub2_Sub2_1 != null) { - local28.aClass8_Sub2_Sub2_1.aByte144--; + local28.aClass8_Sub2_Sub2_1.plane--; } if (local28.aClass8_Sub2_Sub3_2 != null) { - local28.aClass8_Sub2_Sub3_2.aByte144--; + local28.aClass8_Sub2_Sub3_2.plane--; } if (local28.aClass8_Sub2_Sub3_1 != null) { - local28.aClass8_Sub2_Sub3_1.aByte144--; + local28.aClass8_Sub2_Sub3_1.plane--; } if (local28.aClass8_Sub2_Sub4_1 != null) { - local28.aClass8_Sub2_Sub4_1.aByte144--; + local28.aClass8_Sub2_Sub4_1.plane--; } if (local28.aClass8_Sub2_Sub4_2 != null) { - local28.aClass8_Sub2_Sub4_2.aByte144--; + local28.aClass8_Sub2_Sub4_2.plane--; } } } @@ -50,11 +50,11 @@ public static void method8454(@OriginalArg(0) Component arg0, @OriginalArg(1) in if (local8 == null) { return; } - Static163.aClass19_17.KA(arg1, arg2, arg1 + arg0.anInt3802, arg2 + arg0.anInt3746); + Static163.aClass19_17.KA(arg1, arg2, arg1 + arg0.width, arg2 + arg0.height); if (Static578.anInt8595 >= 3) { Static163.aClass19_17.A(-16777216, local8.aClass1_1, arg1, arg2); } else { - Static12.aSoftwareIndexedSprite27.method8183((float) arg0.anInt3802 / 2.0F + (float) arg1, (float) arg0.anInt3746 / 2.0F + (float) arg2, ((int) -Static171.aFloat64 & 0x3FFF) << 2, local8.aClass1_1, arg1, arg2); + Static12.aSoftwareIndexedSprite27.method8183((float) arg0.width / 2.0F + (float) arg1, (float) arg0.height / 2.0F + (float) arg2, ((int) -Static171.aFloat64 & 0x3FFF) << 2, local8.aClass1_1, arg1, arg2); } } diff --git a/client/src/main/java/Static647.java b/client/src/main/java/Static647.java index f53ff66..f01c7ab 100644 --- a/client/src/main/java/Static647.java +++ b/client/src/main/java/Static647.java @@ -10,7 +10,7 @@ public final class Static647 { @OriginalMember(owner = "client!uh", name = "a", descriptor = "(III)V") public static void method8467(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(20) SecondaryLinkable_Sub2 local20 = Static440.method5963(14, (long) arg0); + @Pc(20) SecondaryLinkable_Sub2 local20 = Static440.create(14, (long) arg0); local20.method202(); local20.anInt197 = arg1; } diff --git a/client/src/main/java/Static651.java b/client/src/main/java/Static651.java index dc47a58..f7d5bd9 100644 --- a/client/src/main/java/Static651.java +++ b/client/src/main/java/Static651.java @@ -128,7 +128,7 @@ public static void method8515(@OriginalArg(0) int[] arg0, @OriginalArg(1) int ar @Pc(31) Class152 local31 = arg3.aClass152_11; if (local8 && local31.method9109()) { @Pc(44) SeqType local44 = arg3.aClass152_11.method9107(); - @Pc(47) int local47 = local44.anInt1646; + @Pc(47) int local47 = local44.exactmove; if (local47 == 1) { local31.method9093(arg1); } @@ -142,7 +142,7 @@ public static void method8515(@OriginalArg(0) int[] arg0, @OriginalArg(1) int ar if (arg0[local10] != -1) { local8 = false; } - if (arg3.anIntArray869 == null || arg3.anIntArray869[local10] == -1 || Static25.aSeqTypeList1.method1162(arg0[local10]).anInt1649 >= Static25.aSeqTypeList1.method1162(arg3.anIntArray869[local10]).anInt1649) { + if (arg3.anIntArray869 == null || arg3.anIntArray869[local10] == -1 || Static25.aSeqTypeList1.get(arg0[local10]).priority >= Static25.aSeqTypeList1.get(arg3.anIntArray869[local10]).priority) { arg3.anIntArray869 = arg0; arg3.aClass152_11.method9091(arg1); if (arg2) { @@ -185,7 +185,7 @@ public static void method8517(@OriginalArg(1) boolean arg0, @OriginalArg(2) Npc } if (arg1.anInt10791 != 0) { @Pc(67) String local67 = ModeGame.GAME_STELLARDAWN == Static392.clientModeGame ? LocalizedText.RATING.get(Static51.clientLanguageId) : LocalizedText.LEVEL.get(Static51.clientLanguageId); - local24 = local24 + Static693.levelDifferenceColor(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.combatLevel2, arg1.anInt10791) + " (" + local67 + arg1.anInt10791 + ")"; + local24 = local24 + Static693.levelDifferenceColor(Static556.self.combatLevel2, arg1.anInt10791) + " (" + local67 + arg1.anInt10791 + ")"; } if (Static156.aBoolean223 && !arg0) { @Pc(113) ParamType local113 = Static610.anInt9329 == -1 ? null : Static386.aParamTypeList2.method1161(Static610.anInt9329); @@ -240,7 +240,7 @@ public static void method8517(@OriginalArg(1) boolean arg0, @OriginalArg(2) Npc for (@Pc(341) int local341 = 0; local341 < local176.length; local341++) { if (local176[local341] != null && (local176[local341].equalsIgnoreCase(LocalizedText.ATTACK.get(Static51.clientLanguageId)) || local176[local341].equalsIgnoreCase(LocalizedText.EXAMINE.get(Static51.clientLanguageId)))) { @Pc(372) short local372 = 0; - if (arg1.anInt10791 > Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.combatLevel2) { + if (arg1.anInt10791 > Static556.self.combatLevel2) { local372 = 2000; } @Pc(385) short local385 = 0; diff --git a/client/src/main/java/Static655.java b/client/src/main/java/Static655.java index 7b9600b..c4093fa 100644 --- a/client/src/main/java/Static655.java +++ b/client/src/main/java/Static655.java @@ -20,7 +20,7 @@ public final class Static655 { @OriginalMember(owner = "client!un", name = "a", descriptor = "(Lclient!vq;ILjava/awt/Frame;)V") public static void closeFrame(@OriginalArg(0) Signlink signlink, @OriginalArg(2) Frame frame) { while (true) { - @Pc(10) PrivilegedRequest request = signlink.method8989(frame); + @Pc(10) PrivilegedRequest request = signlink.exitFullScreen(frame); while (request.state == 0) { Static638.sleep(10L); } diff --git a/client/src/main/java/Static656.java b/client/src/main/java/Static656.java index 8d2f8e0..53db013 100644 --- a/client/src/main/java/Static656.java +++ b/client/src/main/java/Static656.java @@ -13,7 +13,7 @@ public static boolean method6691(@OriginalArg(0) int arg0) { @OriginalMember(owner = "client!up", name = "c", descriptor = "(Z)V") public static void method6692() { - Static453.aComponentArrayArray2 = new Component[Static666.aJs5118.capacity()][]; + Static453.components = new Component[Static666.aJs5118.capacity()][]; Static148.aComponentArrayArray1 = new Component[Static666.aJs5118.capacity()][]; Static132.aBooleanArray5 = new boolean[Static666.aJs5118.capacity()]; } diff --git a/client/src/main/java/Static658.java b/client/src/main/java/Static658.java index 3d76450..1333d3e 100644 --- a/client/src/main/java/Static658.java +++ b/client/src/main/java/Static658.java @@ -26,10 +26,10 @@ public static void method8591(@OriginalArg(0) ParticleNode_Sub2 arg0, @OriginalA local6 = ((Entity) arg0).aShort131; local28 = ((Entity) arg0).aShort132; } else { - local6 = arg0.anInt10690 >> Static52.anInt1066; - local28 = arg0.anInt10694 >> Static52.anInt1066; + local6 = arg0.xFine >> Static52.anInt1066; + local28 = arg0.zFine >> Static52.anInt1066; } - Static665.aClass19_15.EA(Static706.aClass178Array3[0].method7878(arg0.anInt10694, arg0.anInt10690), Static100.method1987(local6, local28), Static350.method5124(local6, local28), Static339.method5005(local6, local28)); + Static665.aClass19_15.EA(Static706.aClass178Array3[0].method7878(arg0.zFine, arg0.xFine), Static100.method1987(local6, local28), Static350.method5124(local6, local28), Static339.method5005(local6, local28)); } @Pc(64) ParticleNode_Sub7 local64 = arg0.method9276(Static665.aClass19_15); if (local64 == null) { diff --git a/client/src/main/java/Static659.java b/client/src/main/java/Static659.java index 925daa5..5fb93ea 100644 --- a/client/src/main/java/Static659.java +++ b/client/src/main/java/Static659.java @@ -14,7 +14,7 @@ public final class Static659 { public static final int[] anIntArray769 = new int[] { 0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1 }; @OriginalMember(owner = "client!ut", name = "a", descriptor = "(III)I") - public static int method8604(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + public static int noise(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(15) int local15 = arg0 * 57 + arg1; @Pc(21) int local21 = local15 ^ local15 << 13; @Pc(35) int local35 = Integer.MAX_VALUE & local21 * (local21 * 15731 * local21 + 789221) + 1376312589; @@ -35,7 +35,7 @@ public static String method8605() { if (Static150.aString26 != null) { local44 = "/p=" + Static150.aString26; } - return "http://" + local15 + "." + Static392.clientModeGame.name + ".com/l=" + Static51.clientLanguageId + "/a=" + Static323.anInt5121 + local44 + "/"; + return "http://" + local15 + "." + Static392.clientModeGame.name + ".com/l=" + Static51.clientLanguageId + "/a=" + Static323.affiliate + local44 + "/"; } @OriginalMember(owner = "client!ut", name = "d", descriptor = "(B)Lclient!ge;") diff --git a/client/src/main/java/Static664.java b/client/src/main/java/Static664.java index b5959f4..9239a5a 100644 --- a/client/src/main/java/Static664.java +++ b/client/src/main/java/Static664.java @@ -77,7 +77,7 @@ public static int method8658(@OriginalArg(1) String arg0) { if (arg0 == null) { return -1; } - for (@Pc(10) int local10 = 0; local10 < Static327.anInt5392; local10++) { + for (@Pc(10) int local10 = 0; local10 < Static327.size; local10++) { if (arg0.equalsIgnoreCase(Static330.aStringArray25[local10])) { return local10; } @@ -93,7 +93,7 @@ public static void method8659() { Static354.aLocTypeList4.method3058(); Static690.aNpcTypeList2.method7089(); ObjTypeList.objTypes.method2480(); - Static25.aSeqTypeList1.method1164(); + Static25.aSeqTypeList1.removeSoft(); Static23.aSpotAnimTypeList1.method2697(); Static529.aVarBitTypeList1.method3423(); Static36.aVarPlayerTypeList1.method5781(); diff --git a/client/src/main/java/Static666.java b/client/src/main/java/Static666.java index 0c18f2e..b1659d3 100644 --- a/client/src/main/java/Static666.java +++ b/client/src/main/java/Static666.java @@ -14,16 +14,16 @@ public final class Static666 { public static boolean aBoolean766 = false; @OriginalMember(owner = "client!vba", name = "h", descriptor = "(I)V") - public static void method8693(@OriginalArg(0) int arg0) { + public static void write(@OriginalArg(0) int arg0) { @Pc(5) FileOnDisk local5 = null; try { - @Pc(18) PrivilegedRequest local18 = Static446.aSignlink6.method8981(""); + @Pc(18) PrivilegedRequest local18 = Static446.aSignlink6.openPreferences(""); while (local18.state == 0) { Static638.sleep(1L); } if (local18.state == 1) { - local5 = (FileOnDisk) local18.anObject13; - @Pc(41) Packet local41 = Static400.aClass2_Sub34_28.method5110(); + local5 = (FileOnDisk) local18.result; + @Pc(41) Packet local41 = Static400.aClass2_Sub34_28.encode(); local5.method2162(local41.data, 0, local41.pos); } } catch (@Pc(51) Exception local51) { diff --git a/client/src/main/java/Static668.java b/client/src/main/java/Static668.java index 33fe391..96762f1 100644 --- a/client/src/main/java/Static668.java +++ b/client/src/main/java/Static668.java @@ -53,7 +53,7 @@ public static void method8700(@OriginalArg(0) boolean arg0) { } @OriginalMember(owner = "client!vca", name = "a", descriptor = "(II)I") - public static int method8702(@OriginalArg(0) int arg0) { + public static int getFileId(@OriginalArg(0) int arg0) { return arg0 & 0x7F; } diff --git a/client/src/main/java/Static669.java b/client/src/main/java/Static669.java index 222bd10..6718452 100644 --- a/client/src/main/java/Static669.java +++ b/client/src/main/java/Static669.java @@ -26,8 +26,8 @@ public static int method8712(@OriginalArg(0) World arg0, @OriginalArg(1) boolean @Pc(11) int local11; @Pc(14) int local14; if (arg3 == 1) { - local11 = arg2.anInt7561; - local14 = arg0.anInt7561; + local11 = arg2.players; + local14 = arg0.players; if (!arg1) { if (local11 == -1) { local11 = 2001; @@ -38,49 +38,49 @@ public static int method8712(@OriginalArg(0) World arg0, @OriginalArg(1) boolean } return local11 - local14; } else if (arg3 == 2) { - return Static540.method6538(arg0.method6717().aString13, Static51.clientLanguageId, arg2.method6717().aString13); + return Static540.method6538(arg0.getWorldInfo().name, Static51.clientLanguageId, arg2.getWorldInfo().name); } else if (arg3 == 3) { - if (arg2.aString91.equals("-")) { - if (arg0.aString91.equals("-")) { + if (arg2.activity.equals("-")) { + if (arg0.activity.equals("-")) { return 0; } else if (arg1) { return -1; } else { return 1; } - } else if (arg0.aString91.equals("-")) { + } else if (arg0.activity.equals("-")) { return arg1 ? 1 : -1; } else { - return Static540.method6538(arg0.aString91, Static51.clientLanguageId, arg2.aString91); + return Static540.method6538(arg0.activity, Static51.clientLanguageId, arg2.activity); } } else if (arg3 == 4) { - if (arg2.method6712()) { - return arg0.method6712() ? 0 : 1; - } else if (arg0.method6712()) { + if (arg2.isLootShare()) { + return arg0.isLootShare() ? 0 : 1; + } else if (arg0.isLootShare()) { return -1; } else { return 0; } } else if (arg3 == 5) { - if (arg2.method6706()) { - return arg0.method6706() ? 0 : 1; - } else if (arg0.method6706()) { + if (arg2.isQuickChat()) { + return arg0.isQuickChat() ? 0 : 1; + } else if (arg0.isQuickChat()) { return -1; } else { return 0; } } else if (arg3 == 6) { - if (arg2.method6708()) { - return arg0.method6708() ? 0 : 1; - } else if (arg0.method6708()) { + if (arg2.isPvp()) { + return arg0.isPvp() ? 0 : 1; + } else if (arg0.isPvp()) { return -1; } else { return 0; } } else if (arg3 == 7) { - if (arg2.method6709()) { - return arg0.method6709() ? 0 : 1; - } else if (arg0.method6709()) { + if (arg2.isMembers()) { + return arg0.isMembers() ? 0 : 1; + } else if (arg0.isMembers()) { return -1; } else { return 0; @@ -105,7 +105,7 @@ public static int method8712(@OriginalArg(0) World arg0, @OriginalArg(1) boolean } return local11 - local14; } else { - return arg2.anInt7569 - arg0.anInt7569; + return arg2.id - arg0.id; } } } diff --git a/client/src/main/java/Static67.java b/client/src/main/java/Static67.java index 49e0fa0..6f221eb 100644 --- a/client/src/main/java/Static67.java +++ b/client/src/main/java/Static67.java @@ -16,7 +16,7 @@ public static void method6098(@OriginalArg(1) String arg0) { } @OriginalMember(owner = "client!cca", name = "a", descriptor = "(IIZB)I") - public static int method6099(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2) { + public static int getSlotTotal(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2) { @Pc(8) Linkable_Sub22 local8 = Static556.method7303(arg1, arg2); if (local8 == null) { return 0; diff --git a/client/src/main/java/Static673.java b/client/src/main/java/Static673.java index be45963..ae78682 100644 --- a/client/src/main/java/Static673.java +++ b/client/src/main/java/Static673.java @@ -5,7 +5,7 @@ public final class Static673 { @OriginalMember(owner = "client!vf", name = "I", descriptor = "B") - public static byte aByte140; + public static byte minKick; @OriginalMember(owner = "client!vf", name = "F", descriptor = "I") public static int anInt10079 = -1; @@ -15,14 +15,14 @@ public static Class273[] method8787(@OriginalArg(0) Signlink arg0, @OriginalArg( if (!arg0.method8990()) { return new Class273[0]; } - @Pc(15) PrivilegedRequest local15 = arg0.method8984(); + @Pc(15) PrivilegedRequest local15 = arg0.getDisplayModes(); while (local15.state == 0) { Static638.sleep(10L); } if (local15.state == 2) { return new Class273[0]; } - @Pc(38) int[] local38 = (int[]) local15.anObject13; + @Pc(38) int[] local38 = (int[]) local15.result; @Pc(44) Class273[] local44 = new Class273[local38.length >> 2]; for (@Pc(46) int local46 = 0; local46 < local44.length; local46++) { @Pc(51) Class273 local51 = new Class273(); diff --git a/client/src/main/java/Static674.java b/client/src/main/java/Static674.java index ee033da..e736757 100644 --- a/client/src/main/java/Static674.java +++ b/client/src/main/java/Static674.java @@ -14,7 +14,7 @@ public final class Static674 { @OriginalMember(owner = "client!vfa", name = "a", descriptor = "(II)V") public static void method8789(@OriginalArg(0) int arg0) { - if (Static283.gameState == 7 && (Static135.anInt8223 == 0 && Static6.anInt95 == 0)) { + if (Static283.gameState == 7 && (Static135.anInt8223 == 0 && Static6.step == 0)) { Static470.anInt7113 = arg0; Static81.method1586(9); } @@ -23,12 +23,12 @@ public static void method8789(@OriginalArg(0) int arg0) { @OriginalMember(owner = "client!vfa", name = "b", descriptor = "(B)V") public static void method8806() { Static517.method6822(Static400.aClass2_Sub34_28.aPreference_Sub17_1.method5667() == 1); - Static719.aAudioChannel5 = Static638.method8394(Static446.aSignlink6, 0, 22050, Static434.aCanvas7); + Static719.aAudioChannel5 = Static638.create(Static446.aSignlink6, 0, 22050, Static434.canvas); Static697.method9120(Static48.method1100((MidiPcmStream) null)); - Static559.aAudioChannel3 = Static638.method8394(Static446.aSignlink6, 1, 2048, Static434.aCanvas7); + Static559.aAudioChannel3 = Static638.create(Static446.aSignlink6, 1, 2048, Static434.canvas); Static336.aClass2_Sub6_Sub3_1 = new MixerPcmStream(); Static559.aAudioChannel3.method3582(Static336.aClass2_Sub6_Sub3_1); - Static681.aResampler2 = new Resampler(22050, Static686.anInt8944); + Static681.aResampler2 = new Resampler(22050, Static686.sampleRate); Static550.method7266(); } } diff --git a/client/src/main/java/Static678.java b/client/src/main/java/Static678.java index 2e2d6ad..c2abceb 100644 --- a/client/src/main/java/Static678.java +++ b/client/src/main/java/Static678.java @@ -9,14 +9,14 @@ public final class Static678 { @OriginalMember(owner = "client!via", name = "a", descriptor = "(ILclient!ge;)V") public static void method8901(@OriginalArg(0) int arg0, @OriginalArg(1) Packet arg1) { - for (@Pc(1) int local1 = 0; local1 < Static476.anInt7177; local1++) { + for (@Pc(1) int local1 = 0; local1 < Static476.size; local1++) { @Pc(6) int local6 = arg1.gSamrt1or2(); @Pc(10) int local10 = arg1.g2(); if (local10 == 65535) { local10 = -1; } - if (Static106.aClass297_Sub1Array1[local6] != null) { - Static106.aClass297_Sub1Array1[local6].anInt7561 = local10; + if (Static106.worlds[local6] != null) { + Static106.worlds[local6].players = local10; } } if (arg0 != -1) { diff --git a/client/src/main/java/Static68.java b/client/src/main/java/Static68.java index 3cec6fd..11cbb78 100644 --- a/client/src/main/java/Static68.java +++ b/client/src/main/java/Static68.java @@ -13,7 +13,7 @@ public final class Static68 { public static int[] anIntArray316; @OriginalMember(owner = "client!cd", name = "g", descriptor = "I") - public static final int anInt4096 = 16777215; + public static final int defaultLightColorRgb = 16777215; @OriginalMember(owner = "client!cd", name = "a", descriptor = "(JZ)I") public static int method3585(@OriginalArg(0) long arg0) { diff --git a/client/src/main/java/Static681.java b/client/src/main/java/Static681.java index e3d2f40..72111f0 100644 --- a/client/src/main/java/Static681.java +++ b/client/src/main/java/Static681.java @@ -17,7 +17,7 @@ public static boolean method8919(@OriginalArg(1) byte[] arg0) { } @Pc(30) boolean local30 = local8.g1() == 1; if (local30) { - Static300.method4392(local8); + Static300.decodeWorlds(local8); } Static678.method8901(-1, local8); return true; @@ -25,7 +25,7 @@ public static boolean method8919(@OriginalArg(1) byte[] arg0) { @OriginalMember(owner = "client!vk", name = "a", descriptor = "(III)V") public static void method8920(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(16, (long) arg0); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(16, (long) arg0); local9.method202(); local9.anInt197 = arg1; } diff --git a/client/src/main/java/Static682.java b/client/src/main/java/Static682.java index 8950154..7ce0135 100644 --- a/client/src/main/java/Static682.java +++ b/client/src/main/java/Static682.java @@ -8,7 +8,7 @@ public final class Static682 { public static int anInt10295; @OriginalMember(owner = "client!vka", name = "h", descriptor = "B") - public static byte aByte142; + public static byte rank; @OriginalMember(owner = "client!vka", name = "f", descriptor = "Lclient!hc;") public static final Class155 aClass155_43 = new Class155(61); @@ -27,8 +27,8 @@ public static String method8923(@OriginalArg(1) String arg0) { @OriginalMember(owner = "client!vka", name = "b", descriptor = "(II)V") public static void method8926(@OriginalArg(1) int arg0) { - @Pc(17) SecondaryLinkable_Sub2 local17 = Static440.method5963(20, (long) arg0); - local17.method205(); + @Pc(17) SecondaryLinkable_Sub2 local17 = Static440.create(20, (long) arg0); + local17.pushClient(); } @OriginalMember(owner = "client!vka", name = "a", descriptor = "(IIIBI)V") diff --git a/client/src/main/java/Static684.java b/client/src/main/java/Static684.java index 1cce078..ddd6e8c 100644 --- a/client/src/main/java/Static684.java +++ b/client/src/main/java/Static684.java @@ -30,14 +30,14 @@ public static void method8931(@OriginalArg(0) boolean arg0, @OriginalArg(1) int } Static81.method1586(arg2); Static694.method9028(Static163.aClass19_17, LocalizedText.LOADING_PLEASE_WAIT.get(Static51.clientLanguageId), true, Static694.aClass381_13, Static437.aClass14_9); - @Pc(74) int local74 = Static691.anInt10367; - Static691.anInt10367 = (Static62.anInt1465 - (Static720.anInt10859 >> 4)) * 8; - @Pc(85) int local85 = Static116.anInt2270; - Static116.anInt2270 = (Static525.anInt8907 - (Static501.anInt7568 >> 4)) * 8; + @Pc(74) int local74 = Static691.originX; + Static691.originX = (Static62.anInt1465 - (Static720.anInt10859 >> 4)) * 8; + @Pc(85) int local85 = Static116.originZ; + Static116.originZ = (Static525.anInt8907 - (Static501.anInt7568 >> 4)) * 8; Static162.aClass2_Sub2_Sub13_2 = Static30.method5078(Static62.anInt1465 * 8, Static525.anInt8907 * 8); Static42.aClass255_2 = null; - @Pc(109) int local109 = Static691.anInt10367 - local74; - @Pc(113) int local113 = Static116.anInt2270 - local85; + @Pc(109) int local109 = Static691.originX - local74; + @Pc(113) int local113 = Static116.originZ - local85; @Pc(134) int local134; @Pc(136) int local136; @Pc(193) int local193; @@ -51,8 +51,8 @@ public static void method8931(@OriginalArg(0) boolean arg0, @OriginalArg(1) int local318.anIntArray879[local136] -= local109; local318.anIntArray878[local136] -= local113; } - local318.anInt10690 -= local109 * 512; - local318.anInt10694 -= local113 * 512; + local318.xFine -= local109 * 512; + local318.zFine -= local113 * 512; } } } else { @@ -64,9 +64,9 @@ public static void method8931(@OriginalArg(0) boolean arg0, @OriginalArg(1) int @Pc(141) Linkable_Sub45 local141 = Static592.aClass2_Sub45Array1[local136]; if (local141 != null) { @Pc(146) Npc local146 = local141.aClass8_Sub2_Sub1_Sub2_Sub2_2; - local146.anInt10694 -= local113 * 512; - local146.anInt10690 -= local109 * 512; - if (local146.anInt10690 >= 0 && local128 >= local146.anInt10690 && local146.anInt10694 >= 0 && local134 >= local146.anInt10694) { + local146.zFine -= local113 * 512; + local146.xFine -= local109 * 512; + if (local146.xFine >= 0 && local128 >= local146.xFine && local146.zFine >= 0 && local134 >= local146.zFine) { @Pc(191) boolean local191 = true; for (local193 = 0; local193 < local146.anIntArray879.length; local193++) { local146.anIntArray879[local193] -= local109; @@ -101,8 +101,8 @@ public static void method8931(@OriginalArg(0) boolean arg0, @OriginalArg(1) int local389.anIntArray879[local134] -= local109; local389.anIntArray878[local134] -= local113; } - local389.anInt10694 -= local113 * 512; - local389.anInt10690 -= local109 * 512; + local389.zFine -= local113 * 512; + local389.xFine -= local109 * 512; } } @Pc(446) Class254[] local446 = Static527.aClass254Array1; @@ -131,9 +131,9 @@ public static void method8931(@OriginalArg(0) boolean arg0, @OriginalArg(1) int if (Static117.anInt2282 != 4) { for (@Pc(608) Linkable_Sub17 local608 = (Linkable_Sub17) Static497.aHashTable35.head(); local608 != null; local608 = (Linkable_Sub17) Static497.aHashTable35.next()) { @Pc(615) int local615 = (int) (local608.id & 0x3FFFL); - @Pc(619) int local619 = local615 - Static691.anInt10367; + @Pc(619) int local619 = local615 - Static691.originX; local193 = (int) (local608.id >> 14 & 0x3FFFL); - @Pc(632) int local632 = local193 - Static116.anInt2270; + @Pc(632) int local632 = local193 - Static116.originZ; if (local619 < 0 || local632 < 0 || local619 >= Static720.anInt10859 || local632 >= Static501.anInt7568) { local608.unlink(); } @@ -154,7 +154,7 @@ public static void method8931(@OriginalArg(0) boolean arg0, @OriginalArg(1) int if (Math.abs(local109) > Static720.anInt10859 || Math.abs(local113) > Static501.anInt7568) { Static218.method3187(); } - } else if (Static511.anInt7645 == 4) { + } else if (Static511.cameraType == 4) { Static433.anInt6262 -= local109 * 512; Static38.anInt920 -= local113 * 512; Static249.anInt4018 -= local113 * 512; @@ -162,7 +162,7 @@ public static void method8931(@OriginalArg(0) boolean arg0, @OriginalArg(1) int } else { Static693.anInt10383 = -1; Static692.anInt10376 = -1; - Static511.anInt7645 = 1; + Static511.cameraType = 1; } Static533.method7119(); Static244.method3512(); diff --git a/client/src/main/java/Static686.java b/client/src/main/java/Static686.java index 74b3789..394b697 100644 --- a/client/src/main/java/Static686.java +++ b/client/src/main/java/Static686.java @@ -5,7 +5,7 @@ public final class Static686 { @OriginalMember(owner = "client!vn", name = "d", descriptor = "I") - public static int anInt8944; + public static int sampleRate; @OriginalMember(owner = "client!vn", name = "b", descriptor = "[I") public static int[] anIntArray710 = new int[1]; @@ -13,15 +13,15 @@ public final class Static686 { @OriginalMember(owner = "client!vn", name = "a", descriptor = "(JI)V") public static void method7930(@OriginalArg(0) long arg0) { if (Static334.aClass291ArrayArrayArray1 != null) { - if (Static511.anInt7645 == 1 || Static511.anInt7645 == 5) { + if (Static511.cameraType == 1 || Static511.cameraType == 5) { Static604.method7903(arg0); - } else if (Static511.anInt7645 == 4) { + } else if (Static511.cameraType == 4) { Static349.method5121(arg0); } } - Static147.method2421((long) Static333.anInt5455, Static163.aClass19_17); - if (Static377.anInt5930 != -1) { - Static26.method716(Static377.anInt5930); + Static147.method2421((long) Static333.loop, Static163.aClass19_17); + if (Static377.topLevelInterface != -1) { + Static26.method716(Static377.topLevelInterface); } for (@Pc(54) int local54 = 0; local54 < Static122.anInt2339; local54++) { if (Static364.aBooleanArray18[local54]) { @@ -30,12 +30,12 @@ public static void method7930(@OriginalArg(0) long arg0) { Static359.aBooleanArray17[local54] = Static364.aBooleanArray18[local54]; Static364.aBooleanArray18[local54] = false; } - Static171.anInt2880 = Static333.anInt5455; + Static171.anInt2880 = Static333.loop; Static449.method6114(-1, -1, (Component) null); if (105 <= 103) { return; } - if (Static377.anInt5930 != -1) { + if (Static377.topLevelInterface != -1) { Static122.anInt2339 = 0; Static261.method3833(); } @@ -49,8 +49,8 @@ public static void method7930(@OriginalArg(0) long arg0) { local116 = ParticleNode_Sub2_Sub4_Sub1.lb; } Static115.method2136(local116); - @Pc(136) int local136 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method9302((byte) 70) << 8; - Static220.method3198(Static35.anInt800, local136 + Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 - -local136, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144); + @Pc(136) int local136 = Static556.self.method9302((byte) 70) << 8; + Static220.method3198(Static35.anInt800, local136 + Static556.self.zFine, Static556.self.xFine - -local136, Static556.self.plane); Static35.anInt800 = 0; } } diff --git a/client/src/main/java/Static689.java b/client/src/main/java/Static689.java index 6786dc4..fe6bcad 100644 --- a/client/src/main/java/Static689.java +++ b/client/src/main/java/Static689.java @@ -56,7 +56,7 @@ public final class Static689 { public static Class aClass27; @OriginalMember(owner = "client!vq", name = "t", descriptor = "J") - public static volatile long aLong317 = 0L; + public static volatile long breakConnectionsUntil = 0L; @OriginalMember(owner = "client!vq", name = "a", descriptor = "(Ljava/lang/String;ILjava/lang/String;I)Lclient!dm;") public static FileOnDisk method8980(@OriginalArg(0) String arg0, @OriginalArg(1) int arg1, @OriginalArg(2) String arg2) { diff --git a/client/src/main/java/Static691.java b/client/src/main/java/Static691.java index af741df..6d539d7 100644 --- a/client/src/main/java/Static691.java +++ b/client/src/main/java/Static691.java @@ -11,7 +11,7 @@ public final class Static691 { public static VarClientTypeList aVarClientTypeList1; @OriginalMember(owner = "client!vs", name = "o", descriptor = "I") - public static int anInt10367; + public static int originX; @OriginalMember(owner = "client!vs", name = "m", descriptor = "I") public static int anInt10368 = 0; diff --git a/client/src/main/java/Static693.java b/client/src/main/java/Static693.java index b1fef46..a073721 100644 --- a/client/src/main/java/Static693.java +++ b/client/src/main/java/Static693.java @@ -96,14 +96,14 @@ public static void method9012() { Static374.anInt5907 = -1; Static314.anInt5035 = 0; Static197.anInt3260 = -1; - Static511.anInt7645 = 1; + Static511.cameraType = 1; anInt10383 = -1; Static692.anInt10376 = -1; } @OriginalMember(owner = "client!vu", name = "a", descriptor = "(III)V") public static void method9013(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(21) SecondaryLinkable_Sub2 local21 = Static440.method5963(19, (long) arg0 | (long) arg1 << 32); - local21.method205(); + @Pc(21) SecondaryLinkable_Sub2 local21 = Static440.create(19, (long) arg0 | (long) arg1 << 32); + local21.pushClient(); } } diff --git a/client/src/main/java/Static695.java b/client/src/main/java/Static695.java index a291060..f53bd68 100644 --- a/client/src/main/java/Static695.java +++ b/client/src/main/java/Static695.java @@ -8,7 +8,7 @@ public final class Static695 { public static int[] anIntArray868; @OriginalMember(owner = "client!vw", name = "a", descriptor = "(Ljava/lang/String;I)V") - public static void method9265(@OriginalArg(0) String arg0) { + public static void add(@OriginalArg(0) String arg0) { Static44.method1072(arg0, "", 0, "", "", 0); } diff --git a/client/src/main/java/Static698.java b/client/src/main/java/Static698.java index 74faa77..ff50bb1 100644 --- a/client/src/main/java/Static698.java +++ b/client/src/main/java/Static698.java @@ -5,7 +5,7 @@ public final class Static698 { @OriginalMember(owner = "client!wba", name = "f", descriptor = "[I") - public static final int[] anIntArray831 = new int[] { 0, 1, 2, 3, 4, 5, 6, 14 }; + public static final int[] MALE_FEATURES = new int[] { 0, 1, 2, 3, 4, 5, 6, 14 }; @OriginalMember(owner = "client!wba", name = "d", descriptor = "I") public static int anInt10510 = -1; @@ -76,7 +76,7 @@ public static void method9123(@OriginalArg(0) boolean arg0, @OriginalArg(1) int } @OriginalMember(owner = "client!wba", name = "a", descriptor = "(ILjava/lang/String;)V") - public static void method9124(@OriginalArg(1) String arg0) { + public static void join(@OriginalArg(1) String arg0) { if (arg0.equals("")) { return; } diff --git a/client/src/main/java/Static699.java b/client/src/main/java/Static699.java index 8db1b85..502ccbb 100644 --- a/client/src/main/java/Static699.java +++ b/client/src/main/java/Static699.java @@ -3,7 +3,7 @@ public final class Static699 { @OriginalMember(owner = "client!wc", name = "z", descriptor = "I") - public static int anInt10532; + public static int maxId; @OriginalMember(owner = "client!wc", name = "F", descriptor = "I") public static int anInt10540; diff --git a/client/src/main/java/Static700.java b/client/src/main/java/Static700.java index 764d783..974929b 100644 --- a/client/src/main/java/Static700.java +++ b/client/src/main/java/Static700.java @@ -37,7 +37,7 @@ public static void method9152() { @OriginalMember(owner = "client!wca", name = "a", descriptor = "(III)V") public static void method9153(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(17, (long) arg1); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(17, (long) arg1); local9.method202(); local9.anInt197 = arg0; } diff --git a/client/src/main/java/Static703.java b/client/src/main/java/Static703.java index 0798551..b0bbbd0 100644 --- a/client/src/main/java/Static703.java +++ b/client/src/main/java/Static703.java @@ -4,7 +4,7 @@ public final class Static703 { @OriginalMember(owner = "client!we", name = "c", descriptor = "I") - public static int anInt10571 = 0; + public static int runEnergy = 0; @OriginalMember(owner = "client!we", name = "b", descriptor = "Z") public static final boolean aBoolean798 = true; diff --git a/client/src/main/java/Static706.java b/client/src/main/java/Static706.java index a632d52..fa0789c 100644 --- a/client/src/main/java/Static706.java +++ b/client/src/main/java/Static706.java @@ -11,7 +11,7 @@ public final class Static706 { public static Class178[] aClass178Array3; @OriginalMember(owner = "client!wfa", name = "T", descriptor = "I") - public static int anInt10633; + public static int size; @OriginalMember(owner = "client!wfa", name = "a", descriptor = "(IILclient!gp;III)V") public static void method9220(@OriginalArg(0) int arg0, @OriginalArg(2) Class150 arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { @@ -67,11 +67,11 @@ public static boolean method9224(@OriginalArg(0) int arg0, @OriginalArg(2) int a } @OriginalMember(owner = "client!wfa", name = "a", descriptor = "(Ljava/lang/String;Z)V") - public static void method9225(@OriginalArg(0) String arg0) { + public static void add(@OriginalArg(0) String arg0) { if (arg0 == null) { return; } - if (Static327.anInt5392 >= 200 && !Static126.aBoolean200 || Static327.anInt5392 >= 200) { + if (Static327.size >= 200 && !Static126.playerMember || Static327.size >= 200) { Static67.method6098(LocalizedText.FRIENDS_FULL.get(Static51.clientLanguageId)); return; } @@ -80,7 +80,7 @@ public static void method9225(@OriginalArg(0) String arg0) { return; } @Pc(81) String local81; - for (@Pc(40) int local40 = 0; local40 < Static327.anInt5392; local40++) { + for (@Pc(40) int local40 = 0; local40 < Static327.size; local40++) { @Pc(47) String local47 = Static390.method5492(Static330.aStringArray25[local40]); if (local47 != null && local47.equals(local34)) { Static67.method6098(arg0 + LocalizedText.FRIEND_ALREADY_ADDED.get(Static51.clientLanguageId)); @@ -94,7 +94,7 @@ public static void method9225(@OriginalArg(0) String arg0) { } } } - for (@Pc(115) int local115 = 0; local115 < Static436.anInt3849; local115++) { + for (@Pc(115) int local115 = 0; local115 < Static436.size; local115++) { local81 = Static390.method5492(Static632.aStringArray44[local115]); if (local81 != null && local81.equals(local34)) { Static67.method6098(LocalizedText.IGNORE_REMOVE_PRE.get(Static51.clientLanguageId) + arg0 + LocalizedText.IGNORE_REMOVE_POST.get(Static51.clientLanguageId)); @@ -108,7 +108,7 @@ public static void method9225(@OriginalArg(0) String arg0) { } } } - if (Static390.method5492(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2).equals(local34)) { + if (Static390.method5492(Static556.self.username).equals(local34)) { Static67.method6098(LocalizedText.FRIEND_CANNOT_ADD_SELF.get(Static51.clientLanguageId)); return; } diff --git a/client/src/main/java/Static709.java b/client/src/main/java/Static709.java index 8cb46ae..6d0ba7d 100644 --- a/client/src/main/java/Static709.java +++ b/client/src/main/java/Static709.java @@ -82,8 +82,8 @@ public static void method9252() { @OriginalMember(owner = "client!wh", name = "i", descriptor = "(I)V") public static void method9254() { - if (Static249.anInt4008 > 1) { - Static249.anInt4008--; + if (Static249.rebootTimer > 1) { + Static249.rebootTimer--; Static321.anInt5111 = Static642.anInt9599; } if (Connection.gameConnection.aBoolean278) { @@ -254,17 +254,17 @@ public static void method9254() { local179 = OutboundPacket.create(Static600.aClientProt108, Connection.gameConnection.random); local179.buffer.p1(0); local181 = local179.buffer.pos; - @Pc(810) Packet local810 = Static400.aClass2_Sub34_28.method5110(); + @Pc(810) Packet local810 = Static400.aClass2_Sub34_28.encode(); local179.buffer.pdata(local810.data, 0, local810.pos); local179.buffer.psize1(local179.buffer.pos - local181); Connection.gameConnection.queue(local179); Static503.aBoolean578 = true; } if (Static334.aClass291ArrayArrayArray1 != null) { - if (Static511.anInt7645 == 2) { - Static592.method7761(); - } else if (Static511.anInt7645 == 3) { - Static583.method7659(); + if (Static511.cameraType == 2) { + Static592.updateLockedCamera(); + } else if (Static511.cameraType == 3) { + Static583.updateLoginScreenCamera(); } } if (Static494.aBoolean563) { @@ -300,12 +300,12 @@ public static void method9254() { if (Static1.anInt10798 == 2 && Static283.gameState != 12) { Static25.aHashTable4.clear(); Static440.anInt6680 = 0; - Static607.anInt9251 = Static333.anInt5455; + Static607.anInt9251 = Static333.loop; Static1.anInt10798 = 3; Static457.method6231(); } if (Static1.anInt10798 == 3) { - local80 = Static333.anInt5455 - Static607.anInt9251; + local80 = Static333.loop - Static607.anInt9251; if (Static401.aClass39Array1.length > Static440.anInt6680) { do { @Pc(982) Class39 local982 = Static401.aClass39Array1[Static440.anInt6680]; @@ -343,32 +343,32 @@ public static void method9254() { Static624.aBoolean727 |= Static118.aBooleanArray4[(int) local660]; Static278.anIntArray350[Static52.anInt1065++ & 0x1F] = (int) local660; } else if (local541 == 2) { - Static37.aStringArray4[(int) local660] = local1099.aString1; + Static37.varcstrs[(int) local660] = local1099.aString1; Static268.anIntArray332[Static455.anInt6917++ & 0x1F] = (int) local660; } else { @Pc(1143) Component local1143; if (local541 == 3) { - local1143 = Static145.method2412((int) local660); - if (!local1099.aString1.equals(local1143.aString44)) { - local1143.aString44 = local1099.aString1; - Static178.method2729(local1143); + local1143 = Static145.getComponent((int) local660); + if (!local1099.aString1.equals(local1143.text)) { + local1143.text = local1099.aString1; + Static178.redraw(local1143); } } else { @Pc(1739) int local1739; if (local541 == 4) { - local1143 = Static145.method2412((int) local660); + local1143 = Static145.getComponent((int) local660); local288 = local1099.anInt197; local300 = local1099.anInt195; local1739 = local1099.anInt192; - if (local288 != local1143.anInt3823 || local300 != local1143.anInt3831 || local1739 != local1143.anInt3738) { + if (local288 != local1143.modelType || local300 != local1143.modelId || local1739 != local1143.anInt3738) { local1143.anInt3738 = local1739; - local1143.anInt3823 = local288; - local1143.anInt3831 = local300; - Static178.method2729(local1143); + local1143.modelType = local288; + local1143.modelId = local300; + Static178.redraw(local1143); } } else if (local541 == 5) { - local1143 = Static145.method2412((int) local660); - if (local1143.anInt3789 != local1099.anInt197) { + local1143 = Static145.getComponent((int) local660); + if (local1143.modelSeqId != local1099.anInt197) { if (local1099.anInt197 == -1) { local1143.aClass152_6 = null; } else { @@ -377,8 +377,8 @@ public static void method9254() { } local1143.aClass152_6.method9113(true, local1099.anInt197); } - local1143.anInt3789 = local1099.anInt197; - Static178.method2729(local1143); + local1143.modelSeqId = local1099.anInt197; + Static178.redraw(local1143); } } else if (local541 == 6) { local282 = local1099.anInt197; @@ -386,95 +386,95 @@ public static void method9254() { local300 = local282 >> 5 & 0x1F; local1739 = local282 & 0x1F; @Pc(1751) int local1751 = (local300 << 11) + (local288 << 19) + (local1739 << 3); - @Pc(1756) Component local1756 = Static145.method2412((int) local660); - if (local1756.anInt3779 != local1751) { - local1756.anInt3779 = local1751; - Static178.method2729(local1756); + @Pc(1756) Component local1756 = Static145.getComponent((int) local660); + if (local1756.color != local1751) { + local1756.color = local1751; + Static178.redraw(local1756); } } else if (local541 == 7) { - local1143 = Static145.method2412((int) local660); + local1143 = Static145.getComponent((int) local660); @Pc(1701) boolean local1701 = local1099.anInt197 == 1; - if (local1701 != local1143.aBoolean284) { - local1143.aBoolean284 = local1701; - Static178.method2729(local1143); + if (local1701 != local1143.hidden) { + local1143.hidden = local1701; + Static178.redraw(local1143); } } else if (local541 == 8) { - local1143 = Static145.method2412((int) local660); - if (local1099.anInt197 != local1143.anInt3807 || local1099.anInt195 != local1143.anInt3811 || local1143.anInt3793 != local1099.anInt192) { - local1143.anInt3807 = local1099.anInt197; - local1143.anInt3811 = local1099.anInt195; - local1143.anInt3793 = local1099.anInt192; - if (local1143.anInt3760 != -1) { + local1143 = Static145.getComponent((int) local660); + if (local1099.anInt197 != local1143.modelXAngle || local1099.anInt195 != local1143.modelYAngle || local1143.modelZoom != local1099.anInt192) { + local1143.modelXAngle = local1099.anInt197; + local1143.modelYAngle = local1099.anInt195; + local1143.modelZoom = local1099.anInt192; + if (local1143.objId != -1) { if (local1143.anInt3800 > 0) { - local1143.anInt3793 = local1143.anInt3793 * 32 / local1143.anInt3800; - } else if (local1143.anInt3744 > 0) { - local1143.anInt3793 = local1143.anInt3793 * 32 / local1143.anInt3744; + local1143.modelZoom = local1143.modelZoom * 32 / local1143.anInt3800; + } else if (local1143.baseWidth > 0) { + local1143.modelZoom = local1143.modelZoom * 32 / local1143.baseWidth; } } - Static178.method2729(local1143); + Static178.redraw(local1143); } } else if (local541 == 9) { - local1143 = Static145.method2412((int) local660); - if (local1099.anInt197 != local1143.anInt3760 || local1099.anInt195 != local1143.anInt3817) { - local1143.anInt3817 = local1099.anInt195; - local1143.anInt3760 = local1099.anInt197; - Static178.method2729(local1143); + local1143 = Static145.getComponent((int) local660); + if (local1099.anInt197 != local1143.objId || local1099.anInt195 != local1143.objCount) { + local1143.objCount = local1099.anInt195; + local1143.objId = local1099.anInt197; + Static178.redraw(local1143); } } else if (local541 == 10) { - local1143 = Static145.method2412((int) local660); - if (local1099.anInt197 != local1143.anInt3736 || local1143.anInt3804 != local1099.anInt195 || local1099.anInt192 != local1143.anInt3737) { - local1143.anInt3736 = local1099.anInt197; - local1143.anInt3804 = local1099.anInt195; - local1143.anInt3737 = local1099.anInt192; - Static178.method2729(local1143); + local1143 = Static145.getComponent((int) local660); + if (local1099.anInt197 != local1143.modelXOffset || local1143.modelZOffset != local1099.anInt195 || local1099.anInt192 != local1143.modelYOffset) { + local1143.modelXOffset = local1099.anInt197; + local1143.modelZOffset = local1099.anInt195; + local1143.modelYOffset = local1099.anInt192; + Static178.redraw(local1143); } } else if (local541 == 11) { - local1143 = Static145.method2412((int) local660); - local1143.aByte64 = 0; - local1143.anInt3784 = local1143.anInt3808 = local1099.anInt195; - local1143.anInt3735 = local1143.anInt3826 = local1099.anInt197; - local1143.aByte61 = 0; - Static178.method2729(local1143); + local1143 = Static145.getComponent((int) local660); + local1143.xMode = 0; + local1143.y = local1143.baseY = local1099.anInt195; + local1143.x = local1143.baseX = local1099.anInt197; + local1143.yMode = 0; + Static178.redraw(local1143); } else if (local541 == 12) { - local1143 = Static145.method2412((int) local660); + local1143 = Static145.getComponent((int) local660); local288 = local1099.anInt197; - if (local1143 != null && local1143.anInt3820 == 0) { - if (local288 > local1143.anInt3742 - local1143.anInt3746) { - local288 = local1143.anInt3742 - local1143.anInt3746; + if (local1143 != null && local1143.type == 0) { + if (local288 > local1143.scrollMaxV - local1143.height) { + local288 = local1143.scrollMaxV - local1143.height; } if (local288 < 0) { local288 = 0; } - if (local1143.anInt3768 != local288) { - local1143.anInt3768 = local288; - Static178.method2729(local1143); + if (local1143.scrollY != local288) { + local1143.scrollY = local288; + Static178.redraw(local1143); } } } else if (local541 == 14) { - local1143 = Static145.method2412((int) local660); - local1143.anInt3810 = local1099.anInt197; + local1143 = Static145.getComponent((int) local660); + local1143.spriteId = local1099.anInt197; } else if (local541 == 15) { Static212.anInt3466 = local1099.anInt195; Static266.aBoolean583 = true; Static675.anInt10156 = local1099.anInt197; } else if (local541 == 16) { - local1143 = Static145.method2412((int) local660); - local1143.anInt3781 = local1099.anInt197; + local1143 = Static145.getComponent((int) local660); + local1143.font = local1099.anInt197; } else if (local541 == 20) { - local1143 = Static145.method2412((int) local660); + local1143 = Static145.getComponent((int) local660); local1143.aBoolean299 = local1099.anInt197 == 1; } else if (local541 == 21) { - local1143 = Static145.method2412((int) local660); + local1143 = Static145.getComponent((int) local660); local1143.aBoolean295 = local1099.anInt197 == 1; } else if (local541 == 17) { - local1143 = Static145.method2412((int) local660); + local1143 = Static145.getComponent((int) local660); local1143.anInt3745 = local1099.anInt197; } else if (local541 == 18) { - local1143 = Static145.method2412((int) local660); + local1143 = Static145.getComponent((int) local660); local288 = (int) (local660 >> 32); local1143.method3406((short) local1099.anInt195, local288, (short) local1099.anInt197); } else if (local541 == 19) { - local1143 = Static145.method2412((int) local660); + local1143 = Static145.getComponent((int) local660); local288 = (int) (local660 >> 32); local1143.method3388((short) local1099.anInt197, local288, (short) local1099.anInt195); } @@ -491,7 +491,7 @@ public static void method9254() { if (Static67.aComponent10 != null) { Static499.anInt7501++; if (Static499.anInt7501 >= 15) { - Static178.method2729(Static67.aComponent10); + Static178.redraw(Static67.aComponent10); Static67.aComponent10 = null; } } @@ -516,15 +516,15 @@ public static void method9254() { @Pc(2026) Component local2026; @Pc(2011) Component local2011; do { - local2006 = (Linkable_Sub42) Static618.aLinkedList68.removeHead(); + local2006 = (Linkable_Sub42) Static618.highPriorityRequests.removeHead(); if (local2006 == null) { while (true) { do { - local2006 = (Linkable_Sub42) Static59.aLinkedList33.removeHead(); + local2006 = (Linkable_Sub42) Static59.mediumPriorityRequests.removeHead(); if (local2006 == null) { while (true) { do { - local2006 = (Linkable_Sub42) Static521.aLinkedList44.removeHead(); + local2006 = (Linkable_Sub42) Static521.lowPriorityRequests.removeHead(); if (local2006 == null) { if (Static210.aComponent4 == null) { Static460.anInt6964 = 0; @@ -532,14 +532,14 @@ public static void method9254() { if (Static109.aComponent3 != null) { Static603.method7899(); } - if (Static608.anInt9290 > 0 && Static334.aKeyboard1.method8479(82) && Static334.aKeyboard1.method8479(81) && Static611.anInt9341 != 0) { - local541 = Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144 - Static611.anInt9341; + if (Static608.staffModLevel > 0 && Static334.aKeyboard1.method8479(82) && Static334.aKeyboard1.method8479(81) && Static611.anInt9341 != 0) { + local541 = Static556.self.plane - Static611.anInt9341; if (local541 < 0) { local541 = 0; } else if (local541 > 3) { local541 = 3; } - Static624.method8331(local541, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray878[0] + Static116.anInt2270, Static691.anInt10367 - -Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray879[0]); + Static624.method8331(local541, Static556.self.anIntArray878[0] + Static116.originZ, Static691.originX - -Static556.self.anIntArray879[0]); } Static320.method4598(); for (local541 = 0; local541 < 5; local541++) { @@ -635,29 +635,29 @@ public static void method9254() { } } local2011 = local2006.aComponent14; - if (local2011.anInt3741 < 0) { + if (local2011.createdComponentId < 0) { break; } - local2026 = Static145.method2412(local2011.anInt3743); - } while (local2026 == null || local2026.aComponentArray2 == null || local2026.aComponentArray2.length <= local2011.anInt3741 || local2011 != local2026.aComponentArray2[local2011.anInt3741]); + local2026 = Static145.getComponent(local2011.overlayer); + } while (local2026 == null || local2026.createdComponents == null || local2026.createdComponents.length <= local2011.createdComponentId || local2011 != local2026.createdComponents[local2011.createdComponentId]); Static472.method6420(local2006); } } local2011 = local2006.aComponent14; - if (local2011.anInt3741 < 0) { + if (local2011.createdComponentId < 0) { break; } - local2026 = Static145.method2412(local2011.anInt3743); - } while (local2026 == null || local2026.aComponentArray2 == null || local2011.anInt3741 >= local2026.aComponentArray2.length || local2026.aComponentArray2[local2011.anInt3741] != local2011); + local2026 = Static145.getComponent(local2011.overlayer); + } while (local2026 == null || local2026.createdComponents == null || local2011.createdComponentId >= local2026.createdComponents.length || local2026.createdComponents[local2011.createdComponentId] != local2011); Static472.method6420(local2006); } } local2011 = local2006.aComponent14; - if (local2011.anInt3741 < 0) { + if (local2011.createdComponentId < 0) { break; } - local2026 = Static145.method2412(local2011.anInt3743); - } while (local2026 == null || local2026.aComponentArray2 == null || local2026.aComponentArray2.length <= local2011.anInt3741 || local2026.aComponentArray2[local2011.anInt3741] != local2011); + local2026 = Static145.getComponent(local2011.overlayer); + } while (local2026 == null || local2026.createdComponents == null || local2026.createdComponents.length <= local2011.createdComponentId || local2026.createdComponents[local2011.createdComponentId] != local2011); Static472.method6420(local2006); } } diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java index 27d28b5..9f27177 100644 --- a/client/src/main/java/Static71.java +++ b/client/src/main/java/Static71.java @@ -21,40 +21,40 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 Static163.aClass19_17.KA(arg3, arg4, arg8, arg5); for (@Pc(13) int local13 = 0; local13 < arg2.length; local13++) { @Pc(19) Component local19 = arg2[local13]; - if (local19 != null && (arg0 == local19.anInt3743 || arg0 == -1412584499 && Static109.aComponent3 == local19)) { - @Pc(49) int local49 = local19.anInt3735 + arg1; - @Pc(54) int local54 = arg9 + local19.anInt3784; - @Pc(61) int local61 = local19.anInt3802 + local49 + 1; - @Pc(69) int local69 = local54 + local19.anInt3746 + 1; + if (local19 != null && (arg0 == local19.overlayer || arg0 == -1412584499 && Static109.aComponent3 == local19)) { + @Pc(49) int local49 = local19.x + arg1; + @Pc(54) int local54 = arg9 + local19.y; + @Pc(61) int local61 = local19.width + local49 + 1; + @Pc(69) int local69 = local54 + local19.height + 1; @Pc(74) int local74; if (arg6 == -1) { - TextureOpSquareWaveform.aRectangleArray1[Static122.anInt2339].setBounds(local19.anInt3735 + arg1, arg9 + local19.anInt3784, local19.anInt3802, local19.anInt3746); + TextureOpSquareWaveform.aRectangleArray1[Static122.anInt2339].setBounds(local19.x + arg1, arg9 + local19.y, local19.width, local19.height); local74 = Static122.anInt2339++; } else { local74 = arg6; } local19.anInt3752 = local74; - local19.anInt3813 = Static333.anInt5455; + local19.anInt3813 = Static333.loop; if (!Static84.method1660(local19)) { - if (local19.anInt3806 != 0) { + if (local19.clientCode != 0) { Static523.method3449(local19); } - @Pc(125) int local125 = arg1 + local19.anInt3735; - @Pc(130) int local130 = arg9 + local19.anInt3784; + @Pc(125) int local125 = arg1 + local19.x; + @Pc(130) int local130 = arg9 + local19.y; @Pc(132) int local132 = 0; @Pc(134) int local134 = 0; if (Static137.aBoolean210) { local132 = Static130.method2283(); local134 = Static422.method5771(); } - @Pc(145) int local145 = local19.anInt3780; - if (Static103.aBoolean195 && (Static84.method1661(local19).anInt6909 != 0 || local19.anInt3820 == 0) && local145 > 127) { + @Pc(145) int local145 = local19.alpha; + if (Static103.aBoolean195 && (Static84.getServerActiveProperties(local19).events != 0 || local19.type == 0) && local145 > 127) { local145 = 127; } @Pc(216) int local216; @Pc(222) int local222; if (Static109.aComponent3 == local19) { - if (arg0 != -1412584499 && (Static237.anInt6524 == local19.anInt3830 || Static351.anInt5719 == local19.anInt3830)) { + if (arg0 != -1412584499 && (Static237.anInt6524 == local19.dragRenderBehavior || Static351.anInt5719 == local19.dragRenderBehavior)) { Static101.anInt2098 = arg9; Static438.aComponentArray3 = arg2; Static213.anInt3475 = arg1; @@ -71,16 +71,16 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 if (local222 < Static169.anInt2853) { local222 = Static169.anInt2853; } - if (Static123.anInt2341 + Static354.aComponent8.anInt3802 < local216 - -local19.anInt3802) { - local216 = Static123.anInt2341 + Static354.aComponent8.anInt3802 - local19.anInt3802; + if (Static123.anInt2341 + Static354.aComponent8.width < local216 - -local19.width) { + local216 = Static123.anInt2341 + Static354.aComponent8.width - local19.width; } local125 = local216; - if (Static169.anInt2853 + Static354.aComponent8.anInt3746 < local222 + local19.anInt3746) { - local222 = Static169.anInt2853 + Static354.aComponent8.anInt3746 - local19.anInt3746; + if (Static169.anInt2853 + Static354.aComponent8.height < local222 + local19.height) { + local222 = Static169.anInt2853 + Static354.aComponent8.height - local19.height; } local130 = local222; } - if (local19.anInt3830 == Static351.anInt5719) { + if (local19.dragRenderBehavior == Static351.anInt5719) { local145 = 128; } } @@ -88,15 +88,15 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 @Pc(371) int local371; @Pc(317) int local317; @Pc(323) int local323; - if (local19.anInt3820 == 2) { + if (local19.type == 2) { local216 = arg3; local371 = arg5; local222 = arg4; local359 = arg8; } else { - local317 = local125 + local19.anInt3802; - local323 = local130 + local19.anInt3746; - if (local19.anInt3820 == 9) { + local317 = local125 + local19.width; + local323 = local130 + local19.height; + if (local19.type == 9) { local323++; local317++; } @@ -112,17 +112,17 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 @Pc(936) int local936; @Pc(938) int local938; @Pc(779) int local779; - if (local19.anInt3806 != 0) { - if (local19.anInt3806 == Static188.anInt3104 || local19.anInt3806 == Static190.anInt3113) { + if (local19.clientCode != 0) { + if (local19.clientCode == Static188.anInt3104 || local19.clientCode == Static190.anInt3113) { Static449.method6114(local130, local125, local19); if (!Static137.aBoolean210) { - Static294.method4339(local130, local19.anInt3806 == Static190.anInt3113, local19.anInt3802, local19.anInt3746, local125); + Static294.method4339(local130, local19.clientCode == Static190.anInt3113, local19.width, local19.height, local125); Static163.aClass19_17.KA(arg3, arg4, arg8, arg5); } Static364.aBooleanArray18[local74] = true; continue; } - if (local19.anInt3806 == Static496.anInt7433 && Static1.anInt10798 == 0) { + if (local19.clientCode == Static496.anInt7433 && Static1.anInt10798 == 0) { if (local19.method3393(Static163.aClass19_17) != null) { Static557.method7331(); Static28.method746(local130, Static163.aClass19_17, local19, local125); @@ -138,15 +138,15 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 } continue; } - if (local19.anInt3806 == Static149.anInt2630) { + if (local19.clientCode == Static149.anInt2630) { Static212.method3136(local19, local125, local130, Static163.aClass19_17); continue; } - if (local19.anInt3806 == Static343.anInt5612) { - Static393.method5509(Static163.aClass19_17, local19.anInt3779 % 64, local19, local125, local130); + if (local19.clientCode == Static343.anInt5612) { + Static393.method5509(Static163.aClass19_17, local19.color % 64, local19, local125, local130); continue; } - if (local19.anInt3806 == Static206.anInt3421) { + if (local19.clientCode == Static206.anInt3421) { if (local19.method3393(Static163.aClass19_17) != null) { Static646.method8454(local19, local125, local130); Static469.aBooleanArray23[local74] = true; @@ -161,23 +161,23 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 } continue; } - if (local19.anInt3806 == Static58.anInt1177) { - Static93.method1832(local19.anInt3746, local125, local130, Static56.anInterface4_3, Static163.aClass19_17, local19.anInt3802); + if (local19.clientCode == Static58.anInt1177) { + Static93.method1832(local19.height, local125, local130, Static56.anInterface4_3, Static163.aClass19_17, local19.width); Static364.aBooleanArray18[local74] = true; Static163.aClass19_17.KA(arg3, arg4, arg8, arg5); continue; } - if (local19.anInt3806 == Static146.anInt2567) { - Static515.method6801(local19.anInt3802, Static163.aClass19_17, local19.anInt3746, local125, local130); + if (local19.clientCode == Static146.anInt2567) { + Static515.method6801(local19.width, Static163.aClass19_17, local19.height, local125, local130); Static364.aBooleanArray18[local74] = true; Static163.aClass19_17.KA(arg3, arg4, arg8, arg5); continue; } - if (local19.anInt3806 == Static697.anInt10507) { + if (local19.clientCode == Static697.anInt10507) { if (!Static105.aBoolean196 && !Static354.aBoolean440) { continue; } - local317 = local125 + local19.anInt3802; + local317 = local125 + local19.width; local323 = local130 + 15; if (Static137.aBoolean210) { if (arg7) { @@ -251,19 +251,19 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 } @Pc(1255) int local1255; @Pc(1214) SubInterface local1214; - if (local19.anInt3820 == 0) { - if (local19.anInt3806 == Static362.anInt5831 && Static163.aClass19_17.method8014()) { - Static163.aClass19_17.method7959(local125, local130, local19.anInt3802, local19.anInt3746); + if (local19.type == 0) { + if (local19.clientCode == Static362.anInt5831 && Static163.aClass19_17.method8014()) { + Static163.aClass19_17.method7959(local125, local130, local19.width, local19.height); } - method1522(local19.anInt3812, local125 - local19.anInt3809, arg2, local216, local222, local371, local74, arg7, local359, local130 - local19.anInt3768); + method1522(local19.id, local125 - local19.scrollX, arg2, local216, local222, local371, local74, arg7, local359, local130 - local19.scrollY); if (local19.aComponentArray1 != null) { - method1522(local19.anInt3812, local125 - local19.anInt3809, local19.aComponentArray1, local216, local222, local371, local74, arg7, local359, local130 - local19.anInt3768); + method1522(local19.id, local125 - local19.scrollX, local19.aComponentArray1, local216, local222, local371, local74, arg7, local359, local130 - local19.scrollY); } - local1214 = (SubInterface) Static548.aHashTable40.get((long) local19.anInt3812); + local1214 = (SubInterface) Static548.openInterfaces.get((long) local19.id); if (local1214 != null) { - Static534.method7120(local1214.anInt147, local216, local359, local222, local130, local74, local125, local371); + Static534.method7120(local1214.interfaceId, local216, local359, local222, local130, local74, local125, local371); } - if (local19.anInt3806 == Static362.anInt5831) { + if (local19.clientCode == Static362.anInt5831) { if (Static163.aClass19_17.method8014()) { Static163.aClass19_17.method7974(); } @@ -272,8 +272,8 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 local744 = Static337.anInt5556; local1255 = Static186.anInt3059; local777 = Static622.anInt7737; - if (Static333.anInt5455 < Static4.anInt84) { - @Pc(1276) float local1276 = (float) (Static333.anInt5455 - Static115.anInt2259) / (float) (Static4.anInt84 - Static115.anInt2259); + if (Static333.loop < Static4.anInt84) { + @Pc(1276) float local1276 = (float) (Static333.loop - Static115.anInt2259) / (float) (Static4.anInt84 - Static115.anInt2259); local744 = (int) ((float) Static582.anInt8628 * (1.0F - local1276) + local1276 * (float) Static337.anInt5556); local1255 = (int) (local1276 * (float) Static186.anInt3059 + (float) Static493.anInt7370 * (1.0F - local1276)); local323 = (int) (local1276 * (float) Static399.anInt6215 + (1.0F - local1276) * (float) Static323.anInt5120); @@ -287,17 +287,17 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 Static163.aClass19_17.KA(arg3, arg4, arg8, arg5); } if (Static359.aBooleanArray17[local74] || Static18.anInt251 > 1) { - if (local19.anInt3820 == 3) { + if (local19.type == 3) { if (local145 == 0) { - if (local19.aBoolean294) { - Static163.aClass19_17.aa(local125, local130, local19.anInt3802, local19.anInt3746, local19.anInt3779, 0); + if (local19.filled) { + Static163.aClass19_17.aa(local125, local130, local19.width, local19.height, local19.color, 0); } else { - Static163.aClass19_17.method7976(local125, local130, local19.anInt3802, local19.anInt3746, local19.anInt3779, 0); + Static163.aClass19_17.method7976(local125, local130, local19.width, local19.height, local19.color, 0); } - } else if (local19.aBoolean294) { - Static163.aClass19_17.aa(local125, local130, local19.anInt3802, local19.anInt3746, 255 - (local145 & 0xFF) << 24 | local19.anInt3779 & 0xFFFFFF, 1); + } else if (local19.filled) { + Static163.aClass19_17.aa(local125, local130, local19.width, local19.height, 255 - (local145 & 0xFF) << 24 | local19.color & 0xFFFFFF, 1); } else { - Static163.aClass19_17.method7976(local125, local130, local19.anInt3802, local19.anInt3746, 255 - (local145 & 0xFF) << 24 | local19.anInt3779 & 0xFFFFFF, 1); + Static163.aClass19_17.method7976(local125, local130, local19.width, local19.height, 255 - (local145 & 0xFF) << 24 | local19.color & 0xFFFFFF, 1); } if (Static137.aBoolean210) { if (arg7) { @@ -308,19 +308,19 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 } } else { @Pc(1543) ObjType local1543; - if (local19.anInt3820 == 4) { + if (local19.type == 4) { @Pc(1514) Class14 local1514 = local19.method3403(Static163.aClass19_17); if (local1514 != null) { - local323 = local19.anInt3779; - @Pc(1533) String local1533 = local19.aString44; - if (local19.anInt3760 != -1) { - local1543 = ObjTypeList.objTypes.method2486(local19.anInt3760); + local323 = local19.color; + @Pc(1533) String local1533 = local19.text; + if (local19.objId != -1) { + local1543 = ObjTypeList.objTypes.method2486(local19.objId); local1533 = local1543.aString118; if (local1533 == null) { local1533 = "null"; } - if ((local1543.anInt10115 == 1 || local19.anInt3817 != 1) && local19.anInt3817 != -1) { - local1533 = "" + local1533 + " x" + Static360.method5233(local19.anInt3817); + if ((local1543.anInt10115 == 1 || local19.objCount != 1) && local19.objCount != -1) { + local1533 = "" + local1533 + " x" + Static360.method5233(local19.objCount); } } if (local19.anInt3745 != -1) { @@ -331,20 +331,20 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 } if (local19 == Static390.aComponent9) { local1533 = LocalizedText.PLEASE_WAIT.get(Static51.clientLanguageId); - local323 = local19.anInt3779; + local323 = local19.color; } if (Static376.aBoolean452) { - Static163.aClass19_17.T(local125, local130, local125 + local19.anInt3802, local19.anInt3746 + local130); + Static163.aClass19_17.T(local125, local130, local125 + local19.width, local19.height + local130); } - local1514.method8830(local19.anInt3814, local323 | 255 - (local145 & 0xFF) << 24, local19.aBoolean286 ? 255 - (local145 & 0xFF) << 24 : -1, Static679.aSoftwareIndexedSpriteArray14, local19.anInt3788, 0, local130, local19.anInt3746, 0, (Class1) null, local19.anInt3748, local19.anInt3802, local125, local19.anInt3818, (int[]) null, local1533); + local1514.method8830(local19.valign, local323 | 255 - (local145 & 0xFF) << 24, local19.shadowed ? 255 - (local145 & 0xFF) << 24 : -1, Static679.aSoftwareIndexedSpriteArray14, local19.anInt3788, 0, local130, local19.height, 0, (Class1) null, local19.vpadding, local19.width, local125, local19.halign, (int[]) null, local1533); if (Static376.aBoolean452) { Static163.aClass19_17.KA(arg3, arg4, arg8, arg5); } if (local1533.trim().length() > 0) { if (!Static376.aBoolean452) { - @Pc(1730) Class381 local1730 = Static275.method3980(local19.anInt3781, Static163.aClass19_17); - local777 = local1730.method8741(Static679.aSoftwareIndexedSpriteArray14, local1533, local19.anInt3802); - local779 = local1730.method8745(local19.anInt3802, local19.anInt3748, local1533, Static679.aSoftwareIndexedSpriteArray14); + @Pc(1730) Class381 local1730 = Static275.method3980(local19.font, Static163.aClass19_17); + local777 = local1730.method8741(Static679.aSoftwareIndexedSpriteArray14, local1533, local19.width); + local779 = local1730.method8745(local19.width, local19.vpadding, local1533, Static679.aSoftwareIndexedSpriteArray14); if (Static137.aBoolean210) { if (arg7) { Static682.method8927(local130, local130 + local779, local125, local125 + local777); @@ -361,14 +361,14 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 } } } else if (Static544.aBoolean624) { - Static178.method2729(local19); + Static178.redraw(local19); } - } else if (local19.anInt3820 == 5) { + } else if (local19.type == 5) { if (local19.anInt3824 < 0) { @Pc(1816) SoftwareIndexedSprite local1816; - if (local19.anInt3760 != -1) { - @Pc(1836) PlayerAppearance local1836 = local19.aBoolean288 ? Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 : null; - local1816 = ObjTypeList.objTypes.method2483(local1836, Static163.aClass19_17, local19.anInt3757, local19.anInt3760, local19.anInt3773, local19.anInt3817, local19.anInt3798 | 0xFF000000); + if (local19.objId != -1) { + @Pc(1836) PlayerAppearance local1836 = local19.aBoolean288 ? Static556.self.aPlayerAppearance1 : null; + local1816 = ObjTypeList.objTypes.method2483(local1836, Static163.aClass19_17, local19.anInt3757, local19.objId, local19.outlineThickness, local19.objCount, local19.shadowColor | 0xFF000000); } else if (local19.anInt3745 == -1) { local1816 = local19.method3383(Static163.aClass19_17); } else { @@ -377,47 +377,47 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 if (local1816 != null) { local323 = local1816.method8203(); local744 = local1816.method8192(); - local1255 = 255 - (local145 & 0xFF) << 24 | (local19.anInt3779 == 0 ? 16777215 : local19.anInt3779 & 0xFFFFFF); + local1255 = 255 - (local145 & 0xFF) << 24 | (local19.color == 0 ? 16777215 : local19.color & 0xFFFFFF); if (local19.aBoolean301) { - Static163.aClass19_17.T(local125, local130, local125 + local19.anInt3802, local130 - -local19.anInt3746); - if (local19.anInt3765 != 0) { - local777 = (local19.anInt3802 + local323 - 1) / local323; - local779 = (local744 + local19.anInt3746 - 1) / local744; + Static163.aClass19_17.T(local125, local130, local125 + local19.width, local130 - -local19.height); + if (local19.angle2d != 0) { + local777 = (local19.width + local323 - 1) / local323; + local779 = (local744 + local19.height - 1) / local744; for (local792 = 0; local792 < local777; local792++) { for (local936 = 0; local936 < local779; local936++) { - if (local19.anInt3779 == 0) { - local1816.method8186((float) (local792 * local323 + local125) + (float) local323 / 2.0F, (float) (local130 + local744 * local936) + (float) local744 / 2.0F, 4096, local19.anInt3765); + if (local19.color == 0) { + local1816.method8186((float) (local792 * local323 + local125) + (float) local323 / 2.0F, (float) (local130 + local744 * local936) + (float) local744 / 2.0F, 4096, local19.angle2d); } else { - local1816.method8187((float) (local792 * local323 + local125) + (float) local323 / 2.0F, (float) local744 / 2.0F + (float) (local936 * local744 + local130), 4096, local19.anInt3765, local1255); + local1816.method8187((float) (local792 * local323 + local125) + (float) local323 / 2.0F, (float) local744 / 2.0F + (float) (local936 * local744 + local130), 4096, local19.angle2d, local1255); } } } - } else if (local19.anInt3779 == 0 && local145 == 0) { - local1816.method8198(local125, local130, local19.anInt3802, local19.anInt3746); + } else if (local19.color == 0 && local145 == 0) { + local1816.method8198(local125, local130, local19.width, local19.height); } else { - local1816.method8189(local125, local130, local19.anInt3802, local19.anInt3746, 0, local1255, 1); + local1816.method8189(local125, local130, local19.width, local19.height, 0, local1255, 1); } Static163.aClass19_17.KA(arg3, arg4, arg8, arg5); - } else if (local19.anInt3779 == 0 && local145 == 0) { - if (local19.anInt3765 != 0) { - local1816.method8186((float) local19.anInt3802 / 2.0F + (float) local125, (float) local130 + (float) local19.anInt3746 / 2.0F, local19.anInt3802 * 4096 / local323, local19.anInt3765); - } else if (local323 == local19.anInt3802 && local19.anInt3746 == local744) { + } else if (local19.color == 0 && local145 == 0) { + if (local19.angle2d != 0) { + local1816.method8186((float) local19.width / 2.0F + (float) local125, (float) local130 + (float) local19.height / 2.0F, local19.width * 4096 / local323, local19.angle2d); + } else if (local323 == local19.width && local19.height == local744) { local1816.method8202(local125, local130); } else { - local1816.method8206(local125, local130, local19.anInt3802, local19.anInt3746); + local1816.method8206(local125, local130, local19.width, local19.height); } - } else if (local19.anInt3765 != 0) { - local1816.method8187((float) local19.anInt3802 / 2.0F + (float) local125, (float) local19.anInt3746 / 2.0F + (float) local130, local19.anInt3802 * 4096 / local323, local19.anInt3765, local1255); - } else if (local323 == local19.anInt3802 && local19.anInt3746 == local744) { + } else if (local19.angle2d != 0) { + local1816.method8187((float) local19.width / 2.0F + (float) local125, (float) local19.height / 2.0F + (float) local130, local19.width * 4096 / local323, local19.angle2d, local1255); + } else if (local323 == local19.width && local19.height == local744) { local1816.method8197(local125, local130, 0, local1255, 1); } else { - local1816.method8205(local125, local130, local19.anInt3802, local19.anInt3746, 0, local1255, 1); + local1816.method8205(local125, local130, local19.width, local19.height, 0, local1255, 1); } } else if (Static544.aBoolean624) { - Static178.method2729(local19); + Static178.redraw(local19); } } else { - local19.method3405(Static99.aSkyBoxSphereTypeList1, Static324.aSkyBoxTypeList1).method3162(Static163.aClass19_17, local130, local125, local19.anInt3802, local19.anInt3815 << 3, local19.anInt3786 << 3, local19.anInt3746); + local19.method3405(Static99.aSkyBoxSphereTypeList1, Static324.aSkyBoxTypeList1).method3162(Static163.aClass19_17, local130, local125, local19.width, local19.anInt3815 << 3, local19.anInt3786 << 3, local19.height); } if (Static137.aBoolean210) { if (arg7) { @@ -426,59 +426,59 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 Static595.method7810(local54, local61, local69, local49); } } - } else if (local19.anInt3820 == 6) { + } else if (local19.type == 6) { Static104.method2033(); Class386 local1215 = null; @Pc(2313) Model local2313 = null; local744 = 0; - if (local19.anInt3760 != -1) { - local1543 = ObjTypeList.objTypes.method2486(local19.anInt3760); + if (local19.objId != -1) { + local1543 = ObjTypeList.objTypes.method2486(local19.objId); if (local1543 != null) { - local1543 = local1543.method8790(local19.anInt3817); - local2313 = local1543.method8805(local19.aClass152_6, 2048, local19.aBoolean288 ? Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 : null, 1, Static163.aClass19_17); + local1543 = local1543.method8790(local19.objCount); + local2313 = local1543.method8805(local19.aClass152_6, 2048, local19.aBoolean288 ? Static556.self.aPlayerAppearance1 : null, 1, Static163.aClass19_17); if (local2313 == null) { - Static178.method2729(local19); + Static178.redraw(local19); } else { local744 = -local2313.fa() >> 1; } } - } else if (local19.anInt3823 == 5) { - local1255 = local19.anInt3831; + } else if (local19.modelType == 5) { + local1255 = local19.modelId; if (local1255 >= 0 && local1255 < 2048) { @Pc(2341) Player local2341 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local1255]; - if (local2341 != null && (local1255 == Static312.anInt5000 || Static214.method3157(local2341.name2) == local19.anInt3738)) { + if (local2341 != null && (local1255 == Static312.anInt5000 || Static214.method3157(local2341.username) == local19.anInt3738)) { local2313 = local2341.aPlayerAppearance1.method4546(ObjTypeList.objTypes, local19.aClass152_6, Static574.aBasTypeList2, Static25.aSeqTypeList1, 2048, (int[]) null, Static125.aClass388_1, Static68.aIdkTypeList3, Static163.aClass19_17, Static690.aNpcTypeList2, (Class152[]) null, 0, (Class152) null, Static34.aClass304_1); } } - } else if (local19.anInt3823 == 8 || local19.anInt3823 == 9) { - @Pc(2468) Linkable_Sub22 local2468 = Static556.method7303(local19.anInt3831, false); + } else if (local19.modelType == 8 || local19.modelType == 9) { + @Pc(2468) Linkable_Sub22 local2468 = Static556.method7303(local19.modelId, false); if (local2468 != null) { - local2313 = local2468.method3078(local19.anInt3738, Static163.aClass19_17, local19.anInt3823 == 9, local19.aClass152_6, local19.aBoolean288 ? Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1 : null); + local2313 = local2468.method3078(local19.anInt3738, Static163.aClass19_17, local19.modelType == 9, local19.aClass152_6, local19.aBoolean288 ? Static556.self.aPlayerAppearance1 : null); } } else if (local19.aClass152_6 != null && local19.aClass152_6.method9109()) { - local2313 = local19.method3401(Static163.aClass19_17, local19.aClass152_6, Static574.aBasTypeList2, Static68.aIdkTypeList3, Static25.aSeqTypeList1, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1, Static34.aClass304_1, Static690.aNpcTypeList2, ObjTypeList.objTypes, 2048, local1215); + local2313 = local19.method3401(Static163.aClass19_17, local19.aClass152_6, Static574.aBasTypeList2, Static68.aIdkTypeList3, Static25.aSeqTypeList1, Static556.self.aPlayerAppearance1, Static34.aClass304_1, Static690.aNpcTypeList2, ObjTypeList.objTypes, 2048, local1215); if (local2313 == null && Static544.aBoolean624) { - Static178.method2729(local19); + Static178.redraw(local19); } } else { - local2313 = local19.method3401(Static163.aClass19_17, (Class152) null, Static574.aBasTypeList2, Static68.aIdkTypeList3, Static25.aSeqTypeList1, Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aPlayerAppearance1, Static34.aClass304_1, Static690.aNpcTypeList2, ObjTypeList.objTypes, 2048, local1215); + local2313 = local19.method3401(Static163.aClass19_17, (Class152) null, Static574.aBasTypeList2, Static68.aIdkTypeList3, Static25.aSeqTypeList1, Static556.self.aPlayerAppearance1, Static34.aClass304_1, Static690.aNpcTypeList2, ObjTypeList.objTypes, 2048, local1215); if (local2313 == null && Static544.aBoolean624) { - Static178.method2729(local19); + Static178.redraw(local19); } } if (local2313 != null) { if (local19.anInt3800 <= 0) { local1255 = 512; } else { - local1255 = (local19.anInt3802 << 9) / local19.anInt3800; + local1255 = (local19.width << 9) / local19.anInt3800; } if (local19.anInt3825 <= 0) { local777 = 512; } else { - local777 = (local19.anInt3746 << 9) / local19.anInt3825; + local777 = (local19.height << 9) / local19.anInt3825; } - local779 = local19.anInt3802 / 2 + local125; - local792 = local19.anInt3746 / 2 + local130; + local779 = local19.width / 2 + local125; + local792 = local19.height / 2 + local130; if (!local19.aBoolean302) { local779 += local19.anInt3755 * local1255 >> 9; local792 += local19.anInt3799 * local777 >> 9; @@ -491,33 +491,33 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 Static163.aClass19_17.C(false); } if (local19.aBoolean302) { - Static59.aClass73_5.method7136(local19.anInt3807); - Static59.aClass73_5.method7127(local19.anInt3811); - Static59.aClass73_5.method7139(local19.anInt3737); + Static59.aClass73_5.method7136(local19.modelXAngle); + Static59.aClass73_5.method7127(local19.modelYAngle); + Static59.aClass73_5.method7139(local19.modelYOffset); Static59.aClass73_5.method7134(local19.anInt3755, local19.anInt3799, local19.anInt3821); } else { - local936 = Model.anIntArray741[local19.anInt3807 << 3] * (local19.anInt3793 << 2) >> 14; - local938 = Model.anIntArray740[local19.anInt3807 << 3] * (local19.anInt3793 << 2) >> 14; - Static59.aClass73_5.method7132(-local19.anInt3737 << 3); - Static59.aClass73_5.method7127(local19.anInt3811 << 3); - Static59.aClass73_5.method7134(local19.anInt3736 << 2, local744 + (local19.anInt3804 << 2) + local936, (local19.anInt3804 << 2) + local938); - Static59.aClass73_5.method7130(local19.anInt3807 << 3); + local936 = Model.anIntArray741[local19.modelXAngle << 3] * (local19.modelZoom << 2) >> 14; + local938 = Model.anIntArray740[local19.modelXAngle << 3] * (local19.modelZoom << 2) >> 14; + Static59.aClass73_5.method7132(-local19.modelYOffset << 3); + Static59.aClass73_5.method7127(local19.modelYAngle << 3); + Static59.aClass73_5.method7134(local19.modelXOffset << 2, local744 + (local19.modelZOffset << 2) + local936, (local19.modelZOffset << 2) + local938); + Static59.aClass73_5.method7130(local19.modelXAngle << 3); } - local19.method3384(Static163.aClass19_17, local2313, Static59.aClass73_5, Static333.anInt5455); + local19.method3384(Static163.aClass19_17, local2313, Static59.aClass73_5, Static333.loop); if (Static376.aBoolean452) { - Static163.aClass19_17.T(local125, local130, local125 + local19.anInt3802, local19.anInt3746 + local130); + Static163.aClass19_17.T(local125, local130, local125 + local19.width, local19.height + local130); } if (local19.aBoolean302) { - if (local19.aBoolean285) { - local2313.method7484(Static59.aClass73_5, (ParticleNode_Sub6) null, local19.anInt3793, 1); + if (local19.modelOrtho) { + local2313.method7484(Static59.aClass73_5, (ParticleNode_Sub6) null, local19.modelZoom, 1); } else { local2313.method7473(Static59.aClass73_5, (ParticleNode_Sub6) null, 1); if (local19.aClass8_Sub5_4 != null) { Static163.aClass19_17.method8021(local19.aClass8_Sub5_4.method3650()); } } - } else if (local19.aBoolean285) { - local2313.method7484(Static59.aClass73_5, (ParticleNode_Sub6) null, local19.anInt3793 << 2, 1); + } else if (local19.modelOrtho) { + local2313.method7484(Static59.aClass73_5, (ParticleNode_Sub6) null, local19.modelZoom << 2, 1); } else { local2313.method7473(Static59.aClass73_5, (ParticleNode_Sub6) null, 1); if (local19.aClass8_Sub5_4 != null) { @@ -538,20 +538,20 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 Static595.method7810(local54, local61, local69, local49); } } - } else if (local19.anInt3820 == 9) { + } else if (local19.type == 9) { if (local19.aBoolean287) { - local323 = local19.anInt3746 + local130; + local323 = local19.height + local130; local1255 = local130; - local744 = local125 + local19.anInt3802; + local744 = local125 + local19.width; } else { - local1255 = local19.anInt3746 + local130; + local1255 = local19.height + local130; local323 = local130; - local744 = local125 + local19.anInt3802; + local744 = local125 + local19.width; } - if (local19.anInt3778 == 1) { - Static163.aClass19_17.method7951(local125, local323, local744, local1255, local19.anInt3779, 0); + if (local19.lineWidth == 1) { + Static163.aClass19_17.method7951(local125, local323, local744, local1255, local19.color, 0); } else { - Static163.aClass19_17.method7947(local125, local323, local744, local1255, local19.anInt3779, local19.anInt3778); + Static163.aClass19_17.method7947(local125, local323, local744, local1255, local19.color, local19.lineWidth); } if (Static137.aBoolean210) { if (arg7) { @@ -571,8 +571,8 @@ public static void method1522(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1 @OriginalMember(owner = "client!cea", name = "a", descriptor = "(IB)V") public static void method1523(@OriginalArg(0) int arg0) { - @Pc(18) SecondaryLinkable_Sub2 local18 = Static440.method5963(21, (long) arg0); - local18.method205(); + @Pc(18) SecondaryLinkable_Sub2 local18 = Static440.create(21, (long) arg0); + local18.pushClient(); } @OriginalMember(owner = "client!cea", name = "a", descriptor = "(ILjava/lang/String;)Z") @@ -580,7 +580,7 @@ public static boolean method1524(@OriginalArg(1) String arg0) { if (arg0 == null) { return false; } - for (@Pc(16) int local16 = 0; local16 < Static436.anInt3849; local16++) { + for (@Pc(16) int local16 = 0; local16 < Static436.size; local16++) { if (arg0.equalsIgnoreCase(Static446.aStringArray35[local16])) { return true; } diff --git a/client/src/main/java/Static710.java b/client/src/main/java/Static710.java index 65cba47..63313a6 100644 --- a/client/src/main/java/Static710.java +++ b/client/src/main/java/Static710.java @@ -16,12 +16,12 @@ public final class Static710 { @OriginalMember(owner = "client!wha", name = "a", descriptor = "(ILclient!hda;Lclient!hda;)V") public static void method6710(@OriginalArg(1) Component arg0, @OriginalArg(2) Component arg1) { @Pc(15) OutboundPacket local15 = OutboundPacket.create(Static671.aClientProt117, Connection.gameConnection.random); - local15.buffer.p2(arg1.anInt3760); - local15.buffer.ip2(arg0.anInt3741); - local15.buffer.p2_alt2(arg0.anInt3760); - local15.buffer.p4_alt2(arg0.anInt3812); - local15.buffer.ip2(arg1.anInt3741); - local15.buffer.p4_alt3(arg1.anInt3812); + local15.buffer.p2(arg1.objId); + local15.buffer.ip2(arg0.createdComponentId); + local15.buffer.p2_alt2(arg0.objId); + local15.buffer.p4_alt2(arg0.id); + local15.buffer.ip2(arg1.createdComponentId); + local15.buffer.p4_alt3(arg1.id); Connection.gameConnection.queue(local15); } diff --git a/client/src/main/java/Static712.java b/client/src/main/java/Static712.java index fe811b4..4d80186 100644 --- a/client/src/main/java/Static712.java +++ b/client/src/main/java/Static712.java @@ -58,21 +58,21 @@ public static void method9329(@OriginalArg(0) byte arg0) { local101 = false; } } - Static434.aCanvas7.setSize(Static680.anInt10289, Static380.anInt5979); + Static434.canvas.setSize(Static680.anInt10289, Static380.anInt5979); if (Static163.aClass19_17 != null) { if (Static137.aBoolean210) { - Static575.method7606(Static434.aCanvas7); + Static575.method7606(Static434.canvas); } else { - Static163.aClass19_17.method7935(Static434.aCanvas7, Static680.anInt10289, Static380.anInt5979); + Static163.aClass19_17.method7935(Static434.canvas, Static680.anInt10289, Static380.anInt5979); } } if (local22 == Static353.aFrame10) { local44 = Static353.aFrame10.getInsets(); - Static434.aCanvas7.setLocation(local44.left + Static134.anInt10329, local44.top + Static241.anInt3962); + Static434.canvas.setLocation(local44.left + Static134.anInt10329, local44.top + Static241.anInt3962); } else { - Static434.aCanvas7.setLocation(Static134.anInt10329, Static241.anInt3962); + Static434.canvas.setLocation(Static134.anInt10329, Static241.anInt3962); } - if (Static377.anInt5930 != -1) { + if (Static377.topLevelInterface != -1) { Static640.method8435(true); } Static288.method4182(); diff --git a/client/src/main/java/Static715.java b/client/src/main/java/Static715.java index 39ce909..e6b81f4 100644 --- a/client/src/main/java/Static715.java +++ b/client/src/main/java/Static715.java @@ -11,7 +11,7 @@ public final class Static715 { public static int anInt10805 = 0; @OriginalMember(owner = "client!wla", name = "p", descriptor = "[I") - public static final int[] anIntArray881 = new int[200]; + public static final int[] ranks = new int[200]; @OriginalMember(owner = "client!wla", name = "a", descriptor = "(BLclient!ge;)Lclient!rk;") public static Class138_Sub1 method9346(@OriginalArg(1) Packet arg0) { diff --git a/client/src/main/java/Static716.java b/client/src/main/java/Static716.java index e79b6f4..9fe9fc9 100644 --- a/client/src/main/java/Static716.java +++ b/client/src/main/java/Static716.java @@ -35,6 +35,6 @@ public static synchronized void method9349() { @OriginalMember(owner = "client!wm", name = "a", descriptor = "(IILclient!cg;BIII)V") public static void method9350(@OriginalArg(2) PathingEntity arg0, @OriginalArg(4) int arg1, @OriginalArg(5) int arg2, @OriginalArg(6) int arg3) { - Static418.method7860(arg0.aByte144, arg0.anInt10694, arg2, arg0.anInt10690, 0); + Static418.method7860(arg0.plane, arg0.zFine, arg2, arg0.xFine, 0); } } diff --git a/client/src/main/java/Static719.java b/client/src/main/java/Static719.java index eb4c4de..ecd5b6b 100644 --- a/client/src/main/java/Static719.java +++ b/client/src/main/java/Static719.java @@ -34,7 +34,7 @@ public static void method9117(@OriginalArg(0) Interface4 arg0, @OriginalArg(1) C @Pc(77) int[] local77 = new int[3]; @Pc(79) int local79 = -1; @Pc(81) int local81 = -1; - if (Static30.aClass2_Sub2_Sub13_3.method4088(local77, Static116.anInt2270 + (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 >> 9), Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aByte144, (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 >> 9) + Static691.anInt10367)) { + if (Static30.aClass2_Sub2_Sub13_3.method4088(local77, Static116.originZ + (Static556.self.zFine >> 9), Static556.self.plane, (Static556.self.xFine >> 9) + Static691.originX)) { local79 = local77[1] - Static30.anInt5655; local81 = local77[2] - Static30.anInt5648; } @@ -112,7 +112,7 @@ public static void method9117(@OriginalArg(0) Interface4 arg0, @OriginalArg(1) C if (!Static30.aJs574.isGroupReady(Static30.aClass2_Sub2_Sub13_3.aString48 + "_staticelements")) { return; } - Static30.aClass255_3 = Static284.method4103(Static174.aBoolean249, Static30.aJs574, Static30.aClass2_Sub2_Sub13_3.aString48 + "_staticelements"); + Static30.aClass255_3 = Static284.method4103(Static174.mapMembers, Static30.aJs574, Static30.aClass2_Sub2_Sub13_3.aString48 + "_staticelements"); } else { Static30.aClass255_3 = new Class255(0); } @@ -121,42 +121,42 @@ public static void method9117(@OriginalArg(0) Interface4 arg0, @OriginalArg(1) C Static314.method4568(true); Static199.method2977(); } else if (Static273.anInt4403 == 70) { - Static559.aWorldMapFont7 = new WorldMapFont(arg1, 11, true, Static434.aCanvas7); + Static559.aWorldMapFont7 = new WorldMapFont(arg1, 11, true, Static434.canvas); Static273.anInt4403 = 73; Static314.method4568(true); Static199.method2977(); } else if (Static273.anInt4403 == 73) { - Static484.aWorldMapFont6 = new WorldMapFont(arg1, 12, true, Static434.aCanvas7); + Static484.aWorldMapFont6 = new WorldMapFont(arg1, 12, true, Static434.canvas); Static273.anInt4403 = 76; Static314.method4568(true); Static199.method2977(); } else if (Static273.anInt4403 == 76) { - Static142.aWorldMapFont1 = new WorldMapFont(arg1, 14, true, Static434.aCanvas7); + Static142.aWorldMapFont1 = new WorldMapFont(arg1, 14, true, Static434.canvas); Static273.anInt4403 = 79; Static314.method4568(true); Static199.method2977(); } else if (Static273.anInt4403 == 79) { - Static651.aWorldMapFont8 = new WorldMapFont(arg1, 17, true, Static434.aCanvas7); + Static651.aWorldMapFont8 = new WorldMapFont(arg1, 17, true, Static434.canvas); Static273.anInt4403 = 82; Static314.method4568(true); Static199.method2977(); } else if (Static273.anInt4403 == 82) { - Static275.aWorldMapFont2 = new WorldMapFont(arg1, 19, true, Static434.aCanvas7); + Static275.aWorldMapFont2 = new WorldMapFont(arg1, 19, true, Static434.canvas); Static273.anInt4403 = 85; Static314.method4568(true); Static199.method2977(); } else if (Static273.anInt4403 == 85) { - Static390.aWorldMapFont5 = new WorldMapFont(arg1, 22, true, Static434.aCanvas7); + Static390.aWorldMapFont5 = new WorldMapFont(arg1, 22, true, Static434.canvas); Static273.anInt4403 = 88; Static314.method4568(true); Static199.method2977(); } else if (Static273.anInt4403 == 88) { - Static364.aWorldMapFont4 = new WorldMapFont(arg1, 26, true, Static434.aCanvas7); + Static364.aWorldMapFont4 = new WorldMapFont(arg1, 26, true, Static434.canvas); Static273.anInt4403 = 91; Static314.method4568(true); Static199.method2977(); } else { - Static359.aWorldMapFont3 = new WorldMapFont(arg1, 30, true, Static434.aCanvas7); + Static359.aWorldMapFont3 = new WorldMapFont(arg1, 30, true, Static434.canvas); Static273.anInt4403 = 100; Static314.method4568(true); Static199.method2977(); diff --git a/client/src/main/java/Static720.java b/client/src/main/java/Static720.java index fbb5c61..0cee340 100644 --- a/client/src/main/java/Static720.java +++ b/client/src/main/java/Static720.java @@ -56,12 +56,12 @@ public static Preferences method9398() { @Pc(13) FileOnDisk local13 = null; @Pc(19) Preferences local19 = new Preferences(Static392.clientModeGame, 0); try { - @Pc(25) PrivilegedRequest local25 = Static446.aSignlink6.method8981(""); + @Pc(25) PrivilegedRequest local25 = Static446.aSignlink6.openPreferences(""); while (local25.state == 0) { Static638.sleep(1L); } if (local25.state == 1) { - local13 = (FileOnDisk) local25.anObject13; + local13 = (FileOnDisk) local25.result; @Pc(51) byte[] local51 = new byte[(int) local13.method2161()]; @Pc(66) int local66; for (@Pc(53) int local53 = 0; local53 < local51.length; local53 += local66) { diff --git a/client/src/main/java/Static723.java b/client/src/main/java/Static723.java index 07fafac..7571245 100644 --- a/client/src/main/java/Static723.java +++ b/client/src/main/java/Static723.java @@ -13,7 +13,7 @@ public final class Static723 { public static volatile boolean aBoolean827 = false; @OriginalMember(owner = "client!wu", name = "z", descriptor = "Ljava/lang/String;") - public static String aString129 = null; + public static String name = null; @OriginalMember(owner = "client!wu", name = "e", descriptor = "(I)V") public static void method9450() { diff --git a/client/src/main/java/Static724.java b/client/src/main/java/Static724.java index 04e5ee4..6ca4018 100644 --- a/client/src/main/java/Static724.java +++ b/client/src/main/java/Static724.java @@ -9,7 +9,7 @@ public final class Static724 { @OriginalMember(owner = "client!wv", name = "a", descriptor = "(B)Lclient!pq;") public static World method9452() { Static59.anInt5936 = 0; - return Static557.method7333(); + return Static557.getNextWorld(); } @OriginalMember(owner = "client!wv", name = "a", descriptor = "(II)V") diff --git a/client/src/main/java/Static726.java b/client/src/main/java/Static726.java index 49fefbb..a110d75 100644 --- a/client/src/main/java/Static726.java +++ b/client/src/main/java/Static726.java @@ -8,7 +8,7 @@ public final class Static726 { public static Class280 aClass280_7; @OriginalMember(owner = "client!za", name = "a", descriptor = "(Ljava/lang/String;Z)V") - public static void method9463(@OriginalArg(0) String arg0) { + public static void remove(@OriginalArg(0) String arg0) { if (arg0 == null) { return; } @@ -16,12 +16,12 @@ public static void method9463(@OriginalArg(0) String arg0) { if (local11 == null) { return; } - for (@Pc(25) int local25 = 0; local25 < Static436.anInt3849; local25++) { + for (@Pc(25) int local25 = 0; local25 < Static436.size; local25++) { @Pc(30) String local30 = Static632.aStringArray44[local25]; @Pc(34) String local34 = Static390.method5492(local30); if (Static585.method7682(arg0, local34, local30, local11)) { - Static436.anInt3849--; - for (@Pc(47) int local47 = local25; local47 < Static436.anInt3849; local47++) { + Static436.size--; + for (@Pc(47) int local47 = local25; local47 < Static436.size; local47++) { Static632.aStringArray44[local47] = Static632.aStringArray44[local47 + 1]; Static446.aStringArray35[local47] = Static446.aStringArray35[local47 + 1]; Static10.aStringArray1[local47] = Static10.aStringArray1[local47 + 1]; diff --git a/client/src/main/java/Static73.java b/client/src/main/java/Static73.java index 0ed6624..ae86dc5 100644 --- a/client/src/main/java/Static73.java +++ b/client/src/main/java/Static73.java @@ -95,16 +95,16 @@ public static void method9312(@OriginalArg(0) byte[][] arg0, @OriginalArg(2) Cla @Pc(20) Packet local20 = new Packet(local13); local26 = Static89.anIntArray169[local8] >> 8; @Pc(32) int local32 = Static89.anIntArray169[local8] & 0xFF; - @Pc(38) int local38 = local26 * 64 - Static691.anInt10367; - @Pc(45) int local45 = local32 * 64 - Static116.anInt2270; + @Pc(38) int local38 = local26 * 64 - Static691.originX; + @Pc(45) int local45 = local32 * 64 - Static116.originZ; Static557.method7331(); - arg1.method7879(local20, local45, Static577.aClass110Array1, Static116.anInt2270, Static691.anInt10367, local38); + arg1.method7879(local20, local45, Static577.aClass110Array1, Static116.originZ, Static691.originX, local38); arg1.method7893(local45, local20, local38, Static163.aClass19_17); } } for (@Pc(78) int local78 = 0; local78 < local6; local78++) { - @Pc(90) int local90 = (Static89.anIntArray169[local78] >> 8) * 64 - Static691.anInt10367; - local26 = (Static89.anIntArray169[local78] & 0xFF) * 64 - Static116.anInt2270; + @Pc(90) int local90 = (Static89.anIntArray169[local78] >> 8) * 64 - Static691.originX; + local26 = (Static89.anIntArray169[local78] & 0xFF) * 64 - Static116.originZ; @Pc(105) byte[] local105 = arg0[local78]; if (local105 == null && Static525.anInt8907 < 800) { Static557.method7331(); diff --git a/client/src/main/java/Static76.java b/client/src/main/java/Static76.java index c4e7f07..bf6f278 100644 --- a/client/src/main/java/Static76.java +++ b/client/src/main/java/Static76.java @@ -30,42 +30,42 @@ public static void method1552(@OriginalArg(1) Player arg0) { @OriginalMember(owner = "client!cha", name = "b", descriptor = "(B)V") public static void method1555() { - if (Static6.anInt95 == 0) { + if (Static6.step == 0) { return; } try { if (++Static654.anInt9739 > 2000) { Connection.lobbyConnection.close(); if (Static720.anInt10865 >= 2) { - Static6.anInt95 = 0; + Static6.step = 0; Static580.anInt8621 = -5; return; } Static660.aClass229_4.method5260(); - Static6.anInt95 = 1; + Static6.step = 1; Static654.anInt9739 = 0; Static720.anInt10865++; } - if (Static6.anInt95 == 1) { + if (Static6.step == 1) { Connection.lobbyConnection.aPrivilegedRequest1 = Static660.aClass229_4.method5263(Static446.aSignlink6); - Static6.anInt95 = 2; + Static6.step = 2; } - if (Static6.anInt95 == 2) { + if (Static6.step == 2) { if (Connection.lobbyConnection.aPrivilegedRequest1.state == 2) { throw new IOException(); } if (Connection.lobbyConnection.aPrivilegedRequest1.state != 1) { return; } - Connection.lobbyConnection.aClass348_1 = Static99.method1975((Socket) Connection.lobbyConnection.aPrivilegedRequest1.anObject13); + Connection.lobbyConnection.aClass348_1 = Static99.method1975((Socket) Connection.lobbyConnection.aPrivilegedRequest1.result); Connection.lobbyConnection.aPrivilegedRequest1 = null; Connection.lobbyConnection.method3273(); - Static6.anInt95 = 4; + Static6.step = 4; } - if (Static6.anInt95 == 4 && Connection.lobbyConnection.aClass348_1.method7932(1)) { + if (Static6.step == 4 && Connection.lobbyConnection.aClass348_1.method7932(1)) { Connection.lobbyConnection.aClass348_1.method7929(Connection.lobbyConnection.inboundPacket.data, 1, 0); @Pc(139) int local139 = Connection.lobbyConnection.inboundPacket.data[0] & 0xFF; - Static6.anInt95 = 0; + Static6.step = 0; Static580.anInt8621 = local139; Connection.lobbyConnection.close(); } @@ -75,9 +75,9 @@ public static void method1555() { Static660.aClass229_4.method5260(); Static720.anInt10865++; Static654.anInt9739 = 0; - Static6.anInt95 = 1; + Static6.step = 1; } else { - Static6.anInt95 = 0; + Static6.step = 0; Static580.anInt8621 = -4; } } diff --git a/client/src/main/java/Static77.java b/client/src/main/java/Static77.java index efec887..d2ec062 100644 --- a/client/src/main/java/Static77.java +++ b/client/src/main/java/Static77.java @@ -14,12 +14,12 @@ public final class Static77 { public static int anInt1614 = -1; @OriginalMember(owner = "client!ci", name = "a", descriptor = "(IZ)V") - public static void method1557() { + public static void closeWidget() { @Pc(13) OutboundPacket local13 = OutboundPacket.create(Static317.aClientProt62, Connection.gameConnection.random); Connection.gameConnection.queue(local13); - for (@Pc(22) SubInterface local22 = (SubInterface) Static548.aHashTable40.head(); local22 != null; local22 = (SubInterface) Static548.aHashTable40.next()) { + for (@Pc(22) SubInterface local22 = (SubInterface) Static548.openInterfaces.head(); local22 != null; local22 = (SubInterface) Static548.openInterfaces.next()) { if (!local22.isLinked()) { - local22 = (SubInterface) Static548.aHashTable40.head(); + local22 = (SubInterface) Static548.openInterfaces.head(); if (local22 == null) { break; } @@ -29,15 +29,15 @@ public static void method1557() { } } if (Static390.aComponent9 != null) { - Static178.method2729(Static390.aComponent9); + Static178.redraw(Static390.aComponent9); Static390.aComponent9 = null; } } @OriginalMember(owner = "client!ci", name = "b", descriptor = "(IZ)V") - public static void method1558(@OriginalArg(0) int arg0) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(8, (long) arg0); - local9.method205(); + public static void setComponentModelAngleClient(@OriginalArg(0) int arg0) { + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(8, (long) arg0); + local9.pushClient(); } @OriginalMember(owner = "client!ci", name = "a", descriptor = "(I)Z") diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java index 0c6cc49..eda800b 100644 --- a/client/src/main/java/Static78.java +++ b/client/src/main/java/Static78.java @@ -17,17 +17,17 @@ public final class Static78 { public static boolean aBoolean139 = false; @OriginalMember(owner = "client!cj", name = "a", descriptor = "(IBII)I") - public static int method1570(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { + public static int interpolatedNoise(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { @Pc(7) int local7 = arg0 / arg1; @Pc(13) int local13 = arg0 & arg1 - 1; @Pc(17) int local17 = arg2 / arg1; @Pc(23) int local23 = arg2 & arg1 - 1; - @Pc(30) int local30 = Static343.method5036(local17, local7); - @Pc(39) int local39 = Static343.method5036(local17, local7 + 1); - @Pc(46) int local46 = Static343.method5036(local17 + 1, local7); - @Pc(64) int local64 = Static343.method5036(local17 + 1, local7 + 1); - @Pc(73) int local73 = Static398.method5560(arg1, local30, local39, local13); - @Pc(80) int local80 = Static398.method5560(arg1, local46, local64, local13); - return Static398.method5560(arg1, local73, local80, local23); + @Pc(30) int local30 = Static343.smoothNoise(local17, local7); + @Pc(39) int local39 = Static343.smoothNoise(local17, local7 + 1); + @Pc(46) int local46 = Static343.smoothNoise(local17 + 1, local7); + @Pc(64) int local64 = Static343.smoothNoise(local17 + 1, local7 + 1); + @Pc(73) int local73 = Static398.interpolate(arg1, local30, local39, local13); + @Pc(80) int local80 = Static398.interpolate(arg1, local46, local64, local13); + return Static398.interpolate(arg1, local73, local80, local23); } } diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java index 2ce5d4b..c243d3f 100644 --- a/client/src/main/java/Static80.java +++ b/client/src/main/java/Static80.java @@ -12,7 +12,7 @@ public final class Static80 { @OriginalMember(owner = "client!ck", name = "a", descriptor = "(II)V") public static void method1583(@OriginalArg(1) int arg0) { - @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.method5963(17, (long) arg0); - local9.method205(); + @Pc(9) SecondaryLinkable_Sub2 local9 = Static440.create(17, (long) arg0); + local9.pushClient(); } } diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java index f5b2973..328e875 100644 --- a/client/src/main/java/Static81.java +++ b/client/src/main/java/Static81.java @@ -23,10 +23,10 @@ public static void method1586(@OriginalArg(0) int arg0) { Static467.aClass348_2 = null; } if (arg0 == 3) { - Static456.method6228(Static65.aClass3_1.anInt88 != Static377.anInt5930); + Static456.method6228(Static65.aClass3_1.anInt88 != Static377.topLevelInterface); } if (arg0 == 7) { - Static25.method688(Static65.aClass3_1.anInt82 != Static377.anInt5930); + Static25.method688(Static65.aClass3_1.anInt82 != Static377.topLevelInterface); } if (arg0 == 5 || arg0 == 13) { Static369.method3852(); @@ -58,7 +58,7 @@ public static void method1586(@OriginalArg(0) int arg0) { client.configSpot.discardUnpacked = 1; } if (arg0 == 12 || arg0 == 3) { - Static314.method4562(); + Static314.topBannerRefresh(); } @Pc(213) boolean local213 = arg0 == 2 || Static41.method1027(arg0) || Static620.isInLobby(arg0); @Pc(235) boolean local235 = Static283.gameState == 2 || Static41.method1027(Static283.gameState) || Static620.isInLobby(Static283.gameState); @@ -120,7 +120,7 @@ public static void method1591(@OriginalArg(0) String arg0, @OriginalArg(1) int a @Pc(38) int[] local38 = Static664.method8652(local8); @Pc(42) int local42 = local8.buffer.pos; local8.buffer.pjstr(arg0); - local8.buffer.p2(Static323.anInt5121); + local8.buffer.p2(Static323.affiliate); local8.buffer.pjstr(arg2); local8.buffer.p8(Static416.aLong208); local8.buffer.p1(Static51.clientLanguageId); @@ -140,7 +140,7 @@ public static void method1591(@OriginalArg(0) String arg0, @OriginalArg(1) int a Static720.anInt10865 = 0; Static580.anInt8621 = -3; Static654.anInt9739 = 0; - Static6.anInt95 = 1; + Static6.step = 1; if (arg1 < 13) { Static477.aBoolean543 = true; Static358.method9190(); diff --git a/client/src/main/java/Static84.java b/client/src/main/java/Static84.java index 654b207..eb2e87c 100644 --- a/client/src/main/java/Static84.java +++ b/client/src/main/java/Static84.java @@ -41,13 +41,13 @@ public static void method1652() { } @Pc(68) int local68 = local36.method9302((byte) 81); if ((local68 & 0x1) == 0) { - if ((local36.anInt10690 & 0x1FF) == 0 && (local36.anInt10694 & 0x1FF) == 0) { + if ((local36.xFine & 0x1FF) == 0 && (local36.zFine & 0x1FF) == 0) { continue; } - } else if ((local36.anInt10690 & 0x1FF) == 256 && (local36.anInt10694 & 0x1FF) == 256) { + } else if ((local36.xFine & 0x1FF) == 256 && (local36.zFine & 0x1FF) == 256) { continue; } - local36.anInt10691 = Static102.method2025(local36.aByte144, -29754, local36.anInt10694, local36.anInt10690); + local36.anInt10691 = Static102.method2025(local36.plane, -29754, local36.zFine, local36.xFine); Static102.method2026(local36, true); } } @@ -76,7 +76,7 @@ public static void method1654(@OriginalArg(0) int arg0) { } else { local36 = ((Linkable_Sub45) Static18.aHashTable2.get((long) Static103.anIntArray187[local21 - local1])).aClass8_Sub2_Sub1_Sub2_Sub2_2; } - if (local36.aByte144 != arg0) { + if (local36.plane != arg0) { continue; } if (local36.anInt10739 < 0) { @@ -87,11 +87,11 @@ public static void method1654(@OriginalArg(0) int arg0) { local36.anInt10735 = 0; @Pc(80) int local80 = local36.method9302((byte) 121); if ((local80 & 0x1) == 0) { - if ((local36.anInt10690 & 0x1FF) != 0 || (local36.anInt10694 & 0x1FF) != 0) { + if ((local36.xFine & 0x1FF) != 0 || (local36.zFine & 0x1FF) != 0) { local36.aBoolean816 = false; continue; } - } else if ((local36.anInt10690 & 0x1FF) != 256 || (local36.anInt10694 & 0x1FF) != 256) { + } else if ((local36.xFine & 0x1FF) != 256 || (local36.zFine & 0x1FF) != 256) { local36.aBoolean816 = false; continue; } @@ -100,8 +100,8 @@ public static void method1654(@OriginalArg(0) int arg0) { @Pc(140) int local140; @Pc(166) int local166; if (local80 == 1) { - local135 = local36.anInt10690 >> 9; - local140 = local36.anInt10694 >> 9; + local135 = local36.xFine >> 9; + local140 = local36.zFine >> 9; if (local36.anInt10739 != Static341.anIntArrayArray133[local135][local140]) { local36.aBoolean816 = true; continue; @@ -113,10 +113,10 @@ public static void method1654(@OriginalArg(0) int arg0) { } } else { local135 = (local80 - 1) * 256 + 252; - local140 = local36.anInt10690 - local135 >> 9; - @Pc(196) int local196 = local36.anInt10694 - local135 >> 9; - @Pc(203) int local203 = local36.anInt10690 + local135 >> 9; - @Pc(210) int local210 = local36.anInt10694 + local135 >> 9; + local140 = local36.xFine - local135 >> 9; + @Pc(196) int local196 = local36.zFine - local135 >> 9; + @Pc(203) int local203 = local36.xFine + local135 >> 9; + @Pc(210) int local210 = local36.zFine + local135 >> 9; if (!Static426.method1017(local203, local210, local140, local196, local36.anInt10739)) { for (@Pc(221) int local221 = local140; local221 <= local203; local221++) { for (@Pc(224) int local224 = local196; local224 <= local210; local224++) { @@ -131,7 +131,7 @@ public static void method1654(@OriginalArg(0) int arg0) { } } local36.aBoolean816 = false; - local36.anInt10691 = Static102.method2025(local36.aByte144, -29754, local36.anInt10694, local36.anInt10690); + local36.anInt10691 = Static102.method2025(local36.plane, -29754, local36.zFine, local36.xFine); Static102.method2026(local36, true); } } @@ -153,14 +153,14 @@ public static void method1655() { local39.method9294(); if (local39.aShort131 >= 0 && local39.aShort132 >= 0 && local39.aShort134 < Static720.anInt10859 && local39.aShort133 < Static501.anInt7568) { local39.aBoolean129 = local39.aBoolean817 ? local30 : false; - if (local39 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2) { + if (local39 == Static556.self) { local39.anInt10739 = Integer.MAX_VALUE; } else { local103 = 0; if (!local39.aBoolean816) { local103++; } - if (local39.anInt10747 > Static333.anInt5455) { + if (local39.anInt10747 > Static333.loop) { local103 += 2; } local103 += 5 - local39.method9302((byte) 67) << 2; @@ -190,7 +190,7 @@ public static void method1655() { if (!local166.aBoolean816) { local213++; } - if (local166.anInt10747 > Static333.anInt5455) { + if (local166.anInt10747 > Static333.loop) { local213 += 2; } local213 += 5 - local166.method9302((byte) 88) << 2; @@ -233,7 +233,7 @@ public static void method1655() { } } else if (local292.anInt6363 == 10) { @Pc(333) Player local333 = Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local292.anInt6366]; - if (local333 != null && local333 != Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 && local333.anInt10739 >= 0) { + if (local333 != null && local333 != Static556.self && local333.anInt10739 >= 0) { local333.anInt10739 += 2048; } } @@ -243,12 +243,12 @@ public static void method1655() { @OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!hda;)Lclient!hda;") public static Component method1657(@OriginalArg(0) Component arg0) { - @Pc(4) int local4 = method1661(arg0).method6218(); + @Pc(4) int local4 = getServerActiveProperties(arg0).getDragDepth(); if (local4 == 0) { return null; } for (@Pc(11) int local11 = 0; local11 < local4; local11++) { - arg0 = Static145.method2412(arg0.anInt3743); + arg0 = Static145.getComponent(arg0.overlayer); if (arg0 == null) { return null; } @@ -259,19 +259,19 @@ public static Component method1657(@OriginalArg(0) Component arg0) { @OriginalMember(owner = "client!client", name = "b", descriptor = "(Lclient!hda;)Z") public static boolean method1660(@OriginalArg(0) Component arg0) { if (Static103.aBoolean195) { - if (method1661(arg0).anInt6909 != 0) { + if (getServerActiveProperties(arg0).events != 0) { return false; } - if (arg0.anInt3820 == 0) { + if (arg0.type == 0) { return false; } } - return arg0.aBoolean284; + return arg0.hidden; } @OriginalMember(owner = "client!client", name = "c", descriptor = "(Lclient!hda;)Lclient!ofa;") - public static ServerActiveProperties method1661(@OriginalArg(0) Component arg0) { - @Pc(13) ServerActiveProperties local13 = (ServerActiveProperties) Static291.aHashTable24.get(((long) arg0.anInt3812 << 32) + (long) arg0.anInt3741); + public static ServerActiveProperties getServerActiveProperties(@OriginalArg(0) Component arg0) { + @Pc(13) ServerActiveProperties local13 = (ServerActiveProperties) Static291.aHashTable24.get(((long) arg0.id << 32) + (long) arg0.createdComponentId); return local13 == null ? arg0.aClass2_Sub41_2 : local13; } @@ -312,32 +312,32 @@ public static void method1663(@OriginalArg(0) Component[] arg0, @OriginalArg(2) for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) { @Pc(11) Component local11 = arg0[local1]; if (local11 != null) { - if (local11.anInt3820 == 0) { + if (local11.type == 0) { if (local11.aComponentArray1 != null) { method1663(local11.aComponentArray1, arg1); } - @Pc(38) SubInterface local38 = (SubInterface) Static548.aHashTable40.get((long) local11.anInt3812); + @Pc(38) SubInterface local38 = (SubInterface) Static548.openInterfaces.get((long) local11.id); if (local38 != null) { - Static145.method2411(arg1, local38.anInt147); + Static145.method2411(arg1, local38.interfaceId); } } @Pc(58) Linkable_Sub42 local58; - if (arg1 == 0 && local11.anObjectArray20 != null) { + if (arg1 == 0 && local11.onDialogAbort != null) { local58 = new Linkable_Sub42(); local58.aComponent14 = local11; - local58.anObjectArray36 = local11.anObjectArray20; + local58.anObjectArray36 = local11.onDialogAbort; Static472.method6420(local58); } - if (arg1 == 1 && local11.anObjectArray6 != null) { - if (local11.anInt3741 >= 0) { - @Pc(88) Component local88 = Static145.method2412(local11.anInt3812); - if (local88 == null || local88.aComponentArray2 == null || local88.aComponentArray2.length <= local11.anInt3741 || local88.aComponentArray2[local11.anInt3741] != local11) { + if (arg1 == 1 && local11.onWidgetsOpenClose != null) { + if (local11.createdComponentId >= 0) { + @Pc(88) Component local88 = Static145.getComponent(local11.id); + if (local88 == null || local88.createdComponents == null || local88.createdComponents.length <= local11.createdComponentId || local88.createdComponents[local11.createdComponentId] != local11) { continue; } } local58 = new Linkable_Sub42(); local58.aComponent14 = local11; - local58.anObjectArray36 = local11.anObjectArray6; + local58.anObjectArray36 = local11.onWidgetsOpenClose; Static472.method6420(local58); } } @@ -351,9 +351,9 @@ public static void method1664() { @Pc(14) Npc local14 = ((Linkable_Sub45) Static18.aHashTable2.get((long) Static103.anIntArray187[local3])).aClass8_Sub2_Sub1_Sub2_Sub2_2; if (local14.aBoolean816 && local14.method9304((byte) -123) != -1) { @Pc(34) int local34 = (local14.method9302((byte) 63) - 1) * 256 + 252; - @Pc(41) int local41 = local14.anInt10690 - local34 >> 9; - @Pc(48) int local48 = local14.anInt10694 - local34 >> 9; - @Pc(55) PathingEntity local55 = Static184.method2798(local41, local48, local14.aByte144); + @Pc(41) int local41 = local14.xFine - local34 >> 9; + @Pc(48) int local48 = local14.zFine - local34 >> 9; + @Pc(55) PathingEntity local55 = Static184.method2798(local41, local48, local14.plane); if (local55 != null) { @Pc(60) int local60 = local55.anInt10740; if (local55 instanceof Npc) { @@ -389,24 +389,24 @@ public static void method1665() { public static void method1669(@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, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11) { label908: for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) { @Pc(6) Component local6 = arg0[local1]; - if (local6 != null && local6.anInt3743 == arg1) { - @Pc(19) int local19 = local6.anInt3735 + arg6; - @Pc(24) int local24 = local6.anInt3784 + arg7; + if (local6 != null && local6.overlayer == arg1) { + @Pc(19) int local19 = local6.x + arg6; + @Pc(24) int local24 = local6.y + arg7; @Pc(30) int local30; @Pc(32) int local32; @Pc(34) int local34; @Pc(36) int local36; @Pc(42) int local42; @Pc(47) int local47; - if (local6.anInt3820 == 2) { + if (local6.type == 2) { local30 = arg2; local32 = arg3; local34 = arg4; local36 = arg5; } else { - local42 = local19 + local6.anInt3802; - local47 = local24 + local6.anInt3746; - if (local6.anInt3820 == 9) { + local42 = local19 + local6.width; + local47 = local24 + local6.height; + if (local6.type == 9) { local42++; local47++; } @@ -415,7 +415,7 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) local34 = local42 < arg4 ? local42 : arg4; local36 = local47 < arg5 ? local47 : arg5; } - if (local6.anInt3820 == 0 || local6.aBoolean297 || method1661(local6).anInt6909 != 0 || local6 == Static354.aComponent8 || local6.anInt3806 == Static496.anInt7433 || local6.anInt3806 == Static625.anInt9471 || local6.anInt3806 == Static188.anInt3104 || local6.anInt3806 == Static190.anInt3113) { + if (local6.type == 0 || local6.aBoolean297 || getServerActiveProperties(local6).events != 0 || local6 == Static354.aComponent8 || local6.clientCode == Static496.anInt7433 || local6.clientCode == Static625.anInt9471 || local6.clientCode == Static188.anInt3104 || local6.clientCode == Static190.anInt3113) { if (!method1660(local6)) { local42 = 0; local47 = 0; @@ -430,7 +430,7 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) } if (local6.aBoolean296 || local30 < local34 && local32 < local36) { if (local6.aBoolean300 && arg10 >= local30 && arg11 >= local32 && arg10 < local34 && arg11 < local36) { - for (@Pc(220) Linkable_Sub42 local220 = (Linkable_Sub42) Static521.aLinkedList44.head(); local220 != null; local220 = (Linkable_Sub42) Static521.aLinkedList44.next()) { + for (@Pc(220) Linkable_Sub42 local220 = (Linkable_Sub42) Static521.lowPriorityRequests.head(); local220 != null; local220 = (Linkable_Sub42) Static521.lowPriorityRequests.next()) { if (local220.aBoolean544) { local220.unlink(); local220.aComponent14.aBoolean298 = false; @@ -447,13 +447,13 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) Static79.method1578(); } } - @Pc(308) boolean local308 = local6.aBoolean295 && local6.anInt3820 == 5 && local6.anInt3780 == 0 && local6.anInt3824 < 0 && local6.anInt3760 == -1 && local6.anInt3745 == -1 && !local6.aBoolean301 && local6.anInt3765 == 0; + @Pc(308) boolean local308 = local6.aBoolean295 && local6.type == 5 && local6.alpha == 0 && local6.anInt3824 < 0 && local6.objId == -1 && local6.anInt3745 == -1 && !local6.aBoolean301 && local6.angle2d == 0; @Pc(310) boolean local310 = false; @Pc(402) int local402; if (Static189.aMouse1.method8853() + local42 >= local30 && Static189.aMouse1.method8854() + local47 >= local32 && Static189.aMouse1.method8853() + local42 < local34 && Static189.aMouse1.method8854() + local47 < local36) { if (local308) { @Pc(353) Class159 local353 = local6.method3393(Static163.aClass19_17); - if (local353 != null && local353.anInt3832 == local6.anInt3802 && local353.anInt3833 == local6.anInt3746) { + if (local353 != null && local353.anInt3832 == local6.width && local353.anInt3833 == local6.height) { @Pc(380) int local380 = Static189.aMouse1.method8853() + local42 - local19; @Pc(388) int local388 = Static189.aMouse1.method8854() + local47 - local24; if (local388 >= 0 && local388 < local353.anIntArray303.length) { @@ -492,7 +492,7 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) if (local479 != null && local479.method5328() == 0 && local479.method5331() >= local30 && local479.method5333() >= local32 && local479.method5331() < local34 && local479.method5333() < local36) { if (local308) { local524 = local6.method3393(Static163.aClass19_17); - if (local524 != null && local524.anInt3832 == local6.anInt3802 && local524.anInt3833 == local6.anInt3746) { + if (local524 != null && local524.anInt3832 == local6.width && local524.anInt3833 == local6.height) { local549 = local479.method5331() - local19; local555 = local479.method5333() - local24; if (local555 >= 0 && local555 < local524.anIntArray303.length) { @@ -511,20 +511,20 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) if (local6.aByteArray37 != null && !Static607.method8163()) { for (local402 = 0; local402 < local6.aByteArray37.length; local402++) { if (Static334.aKeyboard1.method8479(local6.aByteArray37[local402])) { - if (local6.anIntArray294 == null || Static333.anInt5455 >= local6.anIntArray294[local402]) { + if (local6.anIntArray294 == null || Static333.loop >= local6.anIntArray294[local402]) { @Pc(634) byte local634 = local6.aByteArray36[local402]; if (local634 == 0 || ((local634 & 0x8) == 0 || !Static334.aKeyboard1.method8479(86) && !Static334.aKeyboard1.method8479(82) && !Static334.aKeyboard1.method8479(81)) && ((local634 & 0x2) == 0 || Static334.aKeyboard1.method8479(86)) && ((local634 & 0x1) == 0 || Static334.aKeyboard1.method8479(82)) && ((local634 & 0x4) == 0 || Static334.aKeyboard1.method8479(81))) { if (local402 < 10) { - Static120.method2193(local6.anInt3812, -1, "", local402 + 1); + Static120.method2193(local6.id, -1, "", local402 + 1); } else if (local402 == 10) { Static470.method6384(); - @Pc(726) ServerActiveProperties local726 = method1661(local6); - Static389.method5476(local726.method6216(), local6, local726.anInt6904); + @Pc(726) ServerActiveProperties local726 = getServerActiveProperties(local6); + Static389.method5476(local726.getTargetMask(), local6, local726.targetParam); Static153.aString27 = Static380.method5359(local6); if (Static153.aString27 == null) { Static153.aString27 = "Null"; } - Static128.aString108 = local6.aString41 + ""; + Static128.aString108 = local6.optionBase + ""; } local555 = local6.anIntArray293[local402]; if (local6.anIntArray294 == null) { @@ -533,7 +533,7 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) if (local555 == 0) { local6.anIntArray294[local402] = Integer.MAX_VALUE; } else { - local6.anIntArray294[local402] = Static333.anInt5455 + local555; + local6.anIntArray294[local402] = Static333.loop + local555; } } } @@ -545,7 +545,7 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) if (local474) { Static597.method7824(local47 + local479.method5333() - local24, local6, local42 + local479.method5331() - local19); } - if (Static109.aComponent3 != null && Static109.aComponent3 != local6 && local310 && method1661(local6).method6220()) { + if (Static109.aComponent3 != null && Static109.aComponent3 != local6 && local310 && getServerActiveProperties(local6).isDragTarget()) { Static327.aComponent7 = local6; } if (local6 == Static354.aComponent8) { @@ -553,31 +553,31 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) Static123.anInt2341 = local19; Static169.anInt2853 = local24; } - if (local6.aBoolean297 || local6.anInt3806 != 0) { + if (local6.aBoolean297 || local6.clientCode != 0) { @Pc(877) Linkable_Sub42 local877; - if (local310 && Static611.anInt9341 != 0 && local6.anObjectArray11 != null) { + if (local310 && Static611.anInt9341 != 0 && local6.onScroll != null) { local877 = new Linkable_Sub42(); local877.aBoolean544 = true; local877.aComponent14 = local6; local877.anInt7214 = Static611.anInt9341; - local877.anObjectArray36 = local6.anObjectArray11; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onScroll; + Static521.lowPriorityRequests.addTail(local877); } if (Static109.aComponent3 != null) { local474 = false; local462 = false; - } else if (Static400.aBoolean622 || local6.anInt3806 != Static58.anInt1177 && Static460.anInt6964 > 0) { + } else if (Static400.aBoolean622 || local6.clientCode != Static58.anInt1177 && Static460.anInt6964 > 0) { local474 = false; local462 = false; local310 = false; } - if (local6.anInt3806 != 0) { - if (local6.anInt3806 == Static188.anInt3104 || local6.anInt3806 == Static190.anInt3113) { + if (local6.clientCode != 0) { + if (local6.clientCode == Static188.anInt3104 || local6.clientCode == Static190.anInt3113) { Static610.aComponent16 = local6; if (Static456.aClass148_3 != null) { - Static456.aClass148_3.method3168(Static400.aClass2_Sub34_28.aPreference_Sub2_1.method1989(), local6.anInt3746, Static163.aClass19_17); + Static456.aClass148_3.method3168(Static400.aClass2_Sub34_28.aPreference_Sub2_1.method1989(), local6.height, Static163.aClass19_17); } - if (local6.anInt3806 == Static188.anInt3104) { + if (local6.clientCode == Static188.anInt3104) { if (Static400.aBoolean622 || arg10 < local30 || arg11 < local32 || arg10 >= local34 || arg11 >= local36) { continue; } @@ -595,7 +595,7 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) } } } - if (local6.anInt3806 == Static496.anInt7433) { + if (local6.clientCode == Static496.anInt7433) { local524 = local6.method3393(Static163.aClass19_17); if (local524 == null || Static578.anInt8595 != 0 && Static578.anInt8595 != 3 || Static400.aBoolean622 || arg10 < local30 || arg11 < local32 || arg10 >= local34 || arg11 >= local36) { continue; @@ -606,17 +606,17 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) if (local549 < local569 || local549 > local569 + local524.anIntArray302[local555]) { continue; } - local549 -= local6.anInt3802 / 2; - local555 -= local6.anInt3746 / 2; + local549 -= local6.width / 2; + local555 -= local6.height / 2; @Pc(1125) int local1125; - if (Static511.anInt7645 == 4) { + if (Static511.cameraType == 4) { local1125 = (int) Static171.aFloat64 & 0x3FFF; } else { local1125 = (int) Static171.aFloat64 + Static29.anInt723 & 0x3FFF; } @Pc(1137) int local1137 = Model.anIntArray741[local1125]; @Pc(1141) int local1141 = Model.anIntArray740[local1125]; - if (Static511.anInt7645 != 4) { + if (Static511.cameraType != 4) { local1137 = local1137 * (Static660.anInt9835 + 256) >> 8; local1141 = local1141 * (Static660.anInt9835 + 256) >> 8; } @@ -624,20 +624,20 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) @Pc(1180) int local1180 = local555 * local1141 - local549 * local1137 >> 14; @Pc(1191) int local1191; @Pc(1199) int local1199; - if (Static511.anInt7645 == 4) { + if (Static511.cameraType == 4) { local1191 = (Static433.anInt6262 >> 9) + (local1170 >> 2); local1199 = (Static249.anInt4018 >> 9) - (local1180 >> 2); } else { - @Pc(1208) int local1208 = (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.method9302((byte) 83) - 1) * 256; - local1191 = (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10690 - local1208 >> 9) + (local1170 >> 2); - local1199 = (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anInt10694 - local1208 >> 9) - (local1180 >> 2); + @Pc(1208) int local1208 = (Static556.self.method9302((byte) 83) - 1) * 256; + local1191 = (Static556.self.xFine - local1208 >> 9) + (local1170 >> 2); + local1199 = (Static556.self.zFine - local1208 >> 9) - (local1180 >> 2); } if (Static156.aBoolean223 && (Static717.anInt10822 & 0x40) != 0) { @Pc(1243) Component local1243 = Static15.method186(Static77.anInt1614, Static450.anInt6819); if (local1243 == null) { Static470.method6384(); } else { - Static416.method5707(false, local6.anInt3760, 1L, local1191, local1199, Static153.aString27, 21, true, Static369.anInt4263, " ->", (long) (local6.anInt3741 << 0 | local6.anInt3812), true); + Static416.method5707(false, local6.objId, 1L, local1191, local1199, Static153.aString27, 21, true, Static369.anInt4263, " ->", (long) (local6.createdComponentId << 0 | local6.id), true); } continue; } @@ -647,14 +647,14 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) Static416.method5707(false, -1, 1L, local1191, local1199, Static331.aString52, 58, true, Static331.anInt5439, "", 0L, true); continue; } - if (local6.anInt3806 == Static58.anInt1177) { + if (local6.clientCode == Static58.anInt1177) { Static210.aComponent4 = local6; if (local310) { Static95.aBoolean184 = true; } if (local474) { - local402 = (int) ((double) (local42 + local479.method5331() - local19 - local6.anInt3802 / 2) * 2.0D / (double) Static30.aFloat105); - local549 = (int) -((double) (local47 + local479.method5333() - local24 - local6.anInt3746 / 2) * 2.0D / (double) Static30.aFloat105); + local402 = (int) ((double) (local42 + local479.method5331() - local19 - local6.width / 2) * 2.0D / (double) Static30.aFloat105); + local549 = (int) -((double) (local47 + local479.method5333() - local24 - local6.height / 2) * 2.0D / (double) Static30.aFloat105); local555 = Static164.anInt2809 + local402 + Static30.anInt5655; local569 = Static615.anInt9389 + local549 + Static30.anInt5648; @Pc(1383) Map local1383 = Static186.method2819(); @@ -664,7 +664,7 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) @Pc(1388) int[] local1388 = new int[3]; local1383.method4091(local569, local555, local1388); if (local1388 != null) { - if (Static334.aKeyboard1.method8479(82) && Static608.anInt9290 > 0) { + if (Static334.aKeyboard1.method8479(82) && Static608.staffModLevel > 0) { Static624.method8331(local1388[0], local1388[2], local1388[1]); continue; } @@ -702,114 +702,114 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) Static460.anInt6964 = 0; continue; } - if (local6.anInt3806 == Static146.anInt2567) { + if (local6.clientCode == Static146.anInt2567) { if (local462) { - Static203.method3069(local6.anInt3802, local42 + Static189.aMouse1.method8853() - local19, local47 + Static189.aMouse1.method8854() - local24, local6.anInt3746); + Static203.method3069(local6.width, local42 + Static189.aMouse1.method8853() - local19, local47 + Static189.aMouse1.method8854() - local24, local6.height); } continue; } - if (local6.anInt3806 == Static625.anInt9471) { + if (local6.clientCode == Static625.anInt9471) { Static65.method1473(local19, local24, local6); continue; } } if (!local6.aBoolean290 && local474) { local6.aBoolean290 = true; - if (local6.anObjectArray17 != null) { + if (local6.onClickRepeat != null) { local877 = new Linkable_Sub42(); local877.aBoolean544 = true; local877.aComponent14 = local6; local877.anInt7218 = local42 + local479.method5331() - local19; local877.anInt7214 = local47 + local479.method5333() - local24; - local877.anObjectArray36 = local6.anObjectArray17; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onClickRepeat; + Static521.lowPriorityRequests.addTail(local877); } } - if (local6.aBoolean290 && local462 && local6.anObjectArray24 != null) { + if (local6.aBoolean290 && local462 && local6.onDrag != null) { local877 = new Linkable_Sub42(); local877.aBoolean544 = true; local877.aComponent14 = local6; local877.anInt7218 = local42 + Static189.aMouse1.method8853() - local19; local877.anInt7214 = local47 + Static189.aMouse1.method8854() - local24; - local877.anObjectArray36 = local6.anObjectArray24; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onDrag; + Static521.lowPriorityRequests.addTail(local877); } if (local6.aBoolean290 && !local462) { local6.aBoolean290 = false; - if (local6.anObjectArray1 != null) { + if (local6.onRelease != null) { local877 = new Linkable_Sub42(); local877.aBoolean544 = true; local877.aComponent14 = local6; local877.anInt7218 = local42 + Static189.aMouse1.method8853() - local19; local877.anInt7214 = local47 + Static189.aMouse1.method8854() - local24; - local877.anObjectArray36 = local6.anObjectArray1; - Static59.aLinkedList33.addTail(local877); + local877.anObjectArray36 = local6.onRelease; + Static59.mediumPriorityRequests.addTail(local877); } } - if (local462 && local6.anObjectArray32 != null) { + if (local462 && local6.onHold != null) { local877 = new Linkable_Sub42(); local877.aBoolean544 = true; local877.aComponent14 = local6; local877.anInt7218 = local42 + Static189.aMouse1.method8853() - local19; local877.anInt7214 = local47 + Static189.aMouse1.method8854() - local24; - local877.anObjectArray36 = local6.anObjectArray32; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onHold; + Static521.lowPriorityRequests.addTail(local877); } if (!local6.aBoolean298 && local310) { local6.aBoolean298 = true; - if (local6.anObjectArray4 != null) { + if (local6.onMouseOver != null) { local877 = new Linkable_Sub42(); local877.aBoolean544 = true; local877.aComponent14 = local6; local877.anInt7218 = local42 + Static189.aMouse1.method8853() - local19; local877.anInt7214 = local47 + Static189.aMouse1.method8854() - local24; - local877.anObjectArray36 = local6.anObjectArray4; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onMouseOver; + Static521.lowPriorityRequests.addTail(local877); } } - if (local6.aBoolean298 && local310 && local6.anObjectArray28 != null) { + if (local6.aBoolean298 && local310 && local6.onMouseRepeat != null) { local877 = new Linkable_Sub42(); local877.aBoolean544 = true; local877.aComponent14 = local6; local877.anInt7218 = local42 + Static189.aMouse1.method8853() - local19; local877.anInt7214 = local47 + Static189.aMouse1.method8854() - local24; - local877.anObjectArray36 = local6.anObjectArray28; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onMouseRepeat; + Static521.lowPriorityRequests.addTail(local877); } if (local6.aBoolean298 && !local310) { local6.aBoolean298 = false; - if (local6.anObjectArray26 != null) { + if (local6.onMouseLeave != null) { local877 = new Linkable_Sub42(); local877.aBoolean544 = true; local877.aComponent14 = local6; local877.anInt7218 = local42 + Static189.aMouse1.method8853() - local19; local877.anInt7214 = local47 + Static189.aMouse1.method8854() - local24; - local877.anObjectArray36 = local6.anObjectArray26; - Static59.aLinkedList33.addTail(local877); + local877.anObjectArray36 = local6.onMouseLeave; + Static59.mediumPriorityRequests.addTail(local877); } } - if (local6.anObjectArray3 != null) { + if (local6.onTimer != null) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray3; - Static618.aLinkedList68.addTail(local877); + local877.anObjectArray36 = local6.onTimer; + Static618.highPriorityRequests.addTail(local877); } @Pc(2022) Linkable_Sub42 local2022; - if (local6.anObjectArray2 != null && Static52.anInt1065 > local6.anInt3805) { - if (local6.anIntArray298 == null || Static52.anInt1065 - local6.anInt3805 > 32) { + if (local6.onVarcTransmit != null && Static52.anInt1065 > local6.anInt3805) { + if (local6.varcTriggers == null || Static52.anInt1065 - local6.anInt3805 > 32) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray2; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onVarcTransmit; + Static521.lowPriorityRequests.addTail(local877); } else { label768: for (local402 = local6.anInt3805; local402 < Static52.anInt1065; local402++) { local549 = Static278.anIntArray350[local402 & 0x1F]; - for (local555 = 0; local555 < local6.anIntArray298.length; local555++) { - if (local6.anIntArray298[local555] == local549) { + for (local555 = 0; local555 < local6.varcTriggers.length; local555++) { + if (local6.varcTriggers[local555] == local549) { local2022 = new Linkable_Sub42(); local2022.aComponent14 = local6; - local2022.anObjectArray36 = local6.anObjectArray2; - Static521.aLinkedList44.addTail(local2022); + local2022.anObjectArray36 = local6.onVarcTransmit; + Static521.lowPriorityRequests.addTail(local2022); break label768; } } @@ -817,21 +817,21 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) } local6.anInt3805 = Static52.anInt1065; } - if (local6.anObjectArray18 != null && Static455.anInt6917 > local6.anInt3801) { - if (local6.anIntArray296 == null || Static455.anInt6917 - local6.anInt3801 > 32) { + if (local6.onVarcstrTransmit != null && Static455.anInt6917 > local6.anInt3801) { + if (local6.varcstrTriggers == null || Static455.anInt6917 - local6.anInt3801 > 32) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray18; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onVarcstrTransmit; + Static521.lowPriorityRequests.addTail(local877); } else { label744: for (local402 = local6.anInt3801; local402 < Static455.anInt6917; local402++) { local549 = Static268.anIntArray332[local402 & 0x1F]; - for (local555 = 0; local555 < local6.anIntArray296.length; local555++) { - if (local6.anIntArray296[local555] == local549) { + for (local555 = 0; local555 < local6.varcstrTriggers.length; local555++) { + if (local6.varcstrTriggers[local555] == local549) { local2022 = new Linkable_Sub42(); local2022.aComponent14 = local6; - local2022.anObjectArray36 = local6.anObjectArray18; - Static521.aLinkedList44.addTail(local2022); + local2022.anObjectArray36 = local6.onVarcstrTransmit; + Static521.lowPriorityRequests.addTail(local2022); break label744; } } @@ -839,21 +839,21 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) } local6.anInt3801 = Static455.anInt6917; } - if (local6.anObjectArray25 != null && Static635.anInt9525 > local6.anInt3761) { - if (local6.anIntArray300 == null || Static635.anInt9525 - local6.anInt3761 > 32) { + if (local6.onVarpTransmit != null && Static635.anInt9525 > local6.anInt3761) { + if (local6.varpTriggers == null || Static635.anInt9525 - local6.anInt3761 > 32) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray25; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onVarpTransmit; + Static521.lowPriorityRequests.addTail(local877); } else { label720: for (local402 = local6.anInt3761; local402 < Static635.anInt9525; local402++) { local549 = Static142.anIntArray225[local402 & 0x1F]; - for (local555 = 0; local555 < local6.anIntArray300.length; local555++) { - if (local6.anIntArray300[local555] == local549) { + for (local555 = 0; local555 < local6.varpTriggers.length; local555++) { + if (local6.varpTriggers[local555] == local549) { local2022 = new Linkable_Sub42(); local2022.aComponent14 = local6; - local2022.anObjectArray36 = local6.anObjectArray25; - Static521.aLinkedList44.addTail(local2022); + local2022.anObjectArray36 = local6.onVarpTransmit; + Static521.lowPriorityRequests.addTail(local2022); break label720; } } @@ -861,21 +861,21 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) } local6.anInt3761 = Static635.anInt9525; } - if (local6.anObjectArray8 != null && Static451.anInt6851 > local6.anInt3775) { - if (local6.anIntArray299 == null || Static451.anInt6851 - local6.anInt3775 > 32) { + if (local6.onInvTransmit != null && Static451.anInt6851 > local6.anInt3775) { + if (local6.inventoryTriggers == null || Static451.anInt6851 - local6.anInt3775 > 32) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray8; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onInvTransmit; + Static521.lowPriorityRequests.addTail(local877); } else { label696: for (local402 = local6.anInt3775; local402 < Static451.anInt6851; local402++) { local549 = Static322.anIntArray889[local402 & 0x1F]; - for (local555 = 0; local555 < local6.anIntArray299.length; local555++) { - if (local6.anIntArray299[local555] == local549) { + for (local555 = 0; local555 < local6.inventoryTriggers.length; local555++) { + if (local6.inventoryTriggers[local555] == local549) { local2022 = new Linkable_Sub42(); local2022.aComponent14 = local6; - local2022.anObjectArray36 = local6.anObjectArray8; - Static521.aLinkedList44.addTail(local2022); + local2022.anObjectArray36 = local6.onInvTransmit; + Static521.lowPriorityRequests.addTail(local2022); break label696; } } @@ -883,21 +883,21 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) } local6.anInt3775 = Static451.anInt6851; } - if (local6.anObjectArray21 != null && Static366.anInt5858 > local6.anInt3803) { - if (local6.anIntArray295 == null || Static366.anInt5858 - local6.anInt3803 > 32) { + if (local6.onStatTransmit != null && Static366.anInt5858 > local6.anInt3803) { + if (local6.statTriggers == null || Static366.anInt5858 - local6.anInt3803 > 32) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray21; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onStatTransmit; + Static521.lowPriorityRequests.addTail(local877); } else { label672: for (local402 = local6.anInt3803; local402 < Static366.anInt5858; local402++) { local549 = Static395.anIntArray833[local402 & 0x1F]; - for (local555 = 0; local555 < local6.anIntArray295.length; local555++) { - if (local6.anIntArray295[local555] == local549) { + for (local555 = 0; local555 < local6.statTriggers.length; local555++) { + if (local6.statTriggers[local555] == local549) { local2022 = new Linkable_Sub42(); local2022.aComponent14 = local6; - local2022.anObjectArray36 = local6.anObjectArray21; - Static521.aLinkedList44.addTail(local2022); + local2022.anObjectArray36 = local6.onStatTransmit; + Static521.lowPriorityRequests.addTail(local2022); break label672; } } @@ -910,7 +910,7 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) local877 = new Linkable_Sub42(); local877.aComponent14 = local6; local877.anObjectArray36 = local6.anObjectArray33; - Static521.aLinkedList44.addTail(local877); + Static521.lowPriorityRequests.addTail(local877); } else { label648: for (local402 = local6.anInt3791; local402 < Static710.anInt7554; local402++) { local549 = Static265.anIntArray328[local402 & 0x1F]; @@ -919,7 +919,7 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) local2022 = new Linkable_Sub42(); local2022.aComponent14 = local6; local2022.anObjectArray36 = local6.anObjectArray33; - Static521.aLinkedList44.addTail(local2022); + Static521.lowPriorityRequests.addTail(local2022); break label648; } } @@ -927,81 +927,81 @@ public static void method1669(@OriginalArg(0) Component[] arg0, @OriginalArg(1) } local6.anInt3791 = Static710.anInt7554; } - if (Static716.anInt10815 > local6.lb && local6.anObjectArray7 != null) { + if (Static716.anInt10815 > local6.lb && local6.onMsg != null) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray7; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onMsg; + Static521.lowPriorityRequests.addTail(local877); } - if (Static344.anInt5621 > local6.lb && local6.anObjectArray29 != null) { + if (Static344.anInt5621 > local6.lb && local6.onFriendTransmit != null) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray29; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onFriendTransmit; + Static521.lowPriorityRequests.addTail(local877); } - if (Static352.anInt5754 > local6.lb && local6.anObjectArray27 != null) { + if (Static352.anInt5754 > local6.lb && local6.onClanTransmit != null) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray27; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onClanTransmit; + Static521.lowPriorityRequests.addTail(local877); } if (Static400.anInt8102 > local6.lb && local6.anObjectArray23 != null) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; local877.anObjectArray36 = local6.anObjectArray23; - Static521.aLinkedList44.addTail(local877); + Static521.lowPriorityRequests.addTail(local877); } if (Static39.anInt949 > local6.lb && local6.anObjectArray12 != null) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; local877.anObjectArray36 = local6.anObjectArray12; - Static521.aLinkedList44.addTail(local877); + Static521.lowPriorityRequests.addTail(local877); } - if (Static526.anInt8067 > local6.lb && local6.anObjectArray9 != null) { + if (Static526.anInt8067 > local6.lb && local6.onStockTransmit != null) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray9; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onStockTransmit; + Static521.lowPriorityRequests.addTail(local877); } - if (Static321.anInt5111 > local6.lb && local6.anObjectArray34 != null) { + if (Static321.anInt5111 > local6.lb && local6.onMiscTransmit != null) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray34; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onMiscTransmit; + Static521.lowPriorityRequests.addTail(local877); } local6.lb = Static642.anInt9599; - if (local6.anObjectArray22 != null) { + if (local6.onKey != null) { for (local402 = 0; local402 < Static671.anInt10026; local402++) { @Pc(2682) Linkable_Sub42 local2682 = new Linkable_Sub42(); local2682.aComponent14 = local6; local2682.anInt7216 = Static194.anInterface27Array1[local402].method2664(); local2682.anInt7221 = Static194.anInterface27Array1[local402].method2666(); - local2682.anObjectArray36 = local6.anObjectArray22; - Static521.aLinkedList44.addTail(local2682); + local2682.anObjectArray36 = local6.onKey; + Static521.lowPriorityRequests.addTail(local2682); } } - if (Static272.aBoolean337 && local6.anObjectArray31 != null) { + if (Static272.aBoolean337 && local6.onMinimapUnlock != null) { local877 = new Linkable_Sub42(); local877.aComponent14 = local6; - local877.anObjectArray36 = local6.anObjectArray31; - Static521.aLinkedList44.addTail(local877); + local877.anObjectArray36 = local6.onMinimapUnlock; + Static521.lowPriorityRequests.addTail(local877); } } - if (local6.anInt3820 == 5 && local6.anInt3824 != -1) { - local6.method3405(Static99.aSkyBoxSphereTypeList1, Static324.aSkyBoxTypeList1).method3168(Static400.aClass2_Sub34_28.aPreference_Sub2_1.method1989(), local6.anInt3746, Static163.aClass19_17); + if (local6.type == 5 && local6.anInt3824 != -1) { + local6.method3405(Static99.aSkyBoxSphereTypeList1, Static324.aSkyBoxTypeList1).method3168(Static400.aClass2_Sub34_28.aPreference_Sub2_1.method1989(), local6.height, Static163.aClass19_17); } Static542.method7202(local6); - if (local6.anInt3820 == 0) { - method1669(arg0, local6.anInt3812, local30, local32, local34, local36, local19 - local6.anInt3809, local24 - local6.anInt3768, arg8, arg9, arg10, arg11); + if (local6.type == 0) { + method1669(arg0, local6.id, local30, local32, local34, local36, local19 - local6.scrollX, local24 - local6.scrollY, arg8, arg9, arg10, arg11); if (local6.aComponentArray1 != null) { - method1669(local6.aComponentArray1, local6.anInt3812, local30, local32, local34, local36, local19 - local6.anInt3809, local24 - local6.anInt3768, arg8, arg9, arg10, arg11); + method1669(local6.aComponentArray1, local6.id, local30, local32, local34, local36, local19 - local6.scrollX, local24 - local6.scrollY, arg8, arg9, arg10, arg11); } - @Pc(2824) SubInterface local2824 = (SubInterface) Static548.aHashTable40.get((long) local6.anInt3812); + @Pc(2824) SubInterface local2824 = (SubInterface) Static548.openInterfaces.get((long) local6.id); if (local2824 != null) { if (Static392.clientModeGame == ModeGame.GAME_RUNESCAPE && local2824.anInt146 == 0 && !Static400.aBoolean622 && local310 && !Static103.aBoolean195) { Static79.method1578(); } - Static431.method5822(local36, local24, local32, arg9, arg11, local34, local19, local2824.anInt147, arg8, arg10, local30); + Static431.method5822(local36, local24, local32, arg9, arg11, local34, local19, local2824.interfaceId, arg8, arg10, local30); } } } @@ -1037,24 +1037,24 @@ public static void method1670(@OriginalArg(0) int arg0) { } else { local31 = ((Linkable_Sub45) Static18.aHashTable2.get((long) Static103.anIntArray187[local16 - local1])).aClass8_Sub2_Sub1_Sub2_Sub2_2; } - if (local31.aByte144 != arg0 || local31.anInt10739 < 0) { + if (local31.plane != arg0 || local31.anInt10739 < 0) { continue; } } @Pc(69) int local69 = local31.method9302((byte) 102); if ((local69 & 0x1) == 0) { - if ((local31.anInt10690 & 0x1FF) != 0 || (local31.anInt10694 & 0x1FF) != 0) { + if ((local31.xFine & 0x1FF) != 0 || (local31.zFine & 0x1FF) != 0) { continue; } - } else if ((local31.anInt10690 & 0x1FF) != 256 || (local31.anInt10694 & 0x1FF) != 256) { + } else if ((local31.xFine & 0x1FF) != 256 || (local31.zFine & 0x1FF) != 256) { continue; } @Pc(113) int local113; @Pc(118) int local118; @Pc(155) int local155; if (local69 == 1) { - local113 = local31.anInt10690 >> 9; - local118 = local31.anInt10694 >> 9; + local113 = local31.xFine >> 9; + local118 = local31.zFine >> 9; if (local31.anInt10739 > Static341.anIntArrayArray133[local113][local118]) { Static341.anIntArrayArray133[local113][local118] = local31.anInt10739; Static148.anIntArrayArray64[local113][local118] = 1; @@ -1063,10 +1063,10 @@ public static void method1670(@OriginalArg(0) int arg0) { } } else { local113 = (local69 - 1) * 256 + 60; - local118 = local31.anInt10690 - local113 >> 9; - @Pc(182) int local182 = local31.anInt10694 - local113 >> 9; - @Pc(189) int local189 = local31.anInt10690 + local113 >> 9; - @Pc(196) int local196 = local31.anInt10694 + local113 >> 9; + local118 = local31.xFine - local113 >> 9; + @Pc(182) int local182 = local31.zFine - local113 >> 9; + @Pc(189) int local189 = local31.xFine + local113 >> 9; + @Pc(196) int local196 = local31.zFine + local113 >> 9; for (@Pc(198) int local198 = local118; local198 <= local189; local198++) { for (@Pc(201) int local201 = local182; local201 <= local196; local201++) { if (local31.anInt10739 > Static341.anIntArrayArray133[local198][local201]) { diff --git a/client/src/main/java/Static85.java b/client/src/main/java/Static85.java index d74b1e1..c73ed1d 100644 --- a/client/src/main/java/Static85.java +++ b/client/src/main/java/Static85.java @@ -9,8 +9,8 @@ public final class Static85 { @OriginalMember(owner = "client!cm", name = "a", descriptor = "(II)V") public static void method9262(@OriginalArg(1) int arg0) { - @Pc(11) SecondaryLinkable_Sub2 local11 = Static440.method5963(2, (long) arg0); - local11.method205(); + @Pc(11) SecondaryLinkable_Sub2 local11 = Static440.create(2, (long) arg0); + local11.pushClient(); } @OriginalMember(owner = "client!cm", name = "a", descriptor = "(IIIIILclient!ha;)V") diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index 05c7219..930ce99 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -5,7 +5,7 @@ public final class Static87 { @OriginalMember(owner = "client!cn", name = "i", descriptor = "[Lclient!mga;") - public static Class241[] aClass241Array1; + public static Class241[] members; @OriginalMember(owner = "client!cn", name = "c", descriptor = "I") public static int anInt1810; diff --git a/client/src/main/java/Static92.java b/client/src/main/java/Static92.java index f30cf45..99edb18 100644 --- a/client/src/main/java/Static92.java +++ b/client/src/main/java/Static92.java @@ -11,9 +11,9 @@ public final class Static92 { public static void method1757(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @Pc(18) Class367 local18 = Static665.aClass367ArrayArray1[arg0][arg1]; if (local18 != null) { - Static344.anInt5617 = local18.anInt9535; - Static331.anInt5441 = local18.anInt9534; - Static417.anInt6400 = local18.anInt9533; + Static344.anInt5617 = local18.lightX; + Static331.anInt5441 = local18.lightZ; + Static417.anInt6400 = local18.lightY; } Static588.method7713(); } diff --git a/client/src/main/java/Static94.java b/client/src/main/java/Static94.java index fbb2f94..897d250 100644 --- a/client/src/main/java/Static94.java +++ b/client/src/main/java/Static94.java @@ -30,14 +30,14 @@ public static void method1841() { Static524.aConnection3.lastPacketType2 = null; Static524.aConnection3.lastPacketType = null; Static524.aConnection3.anInt3648 = 0; - Static249.anInt4008 = 0; + Static249.rebootTimer = 0; Static524.aConnection3.aServerProt_92 = null; Static533.method7119(); Static605.method7914(); for (@Pc(36) int local36 = 0; local36 < 2048; local36++) { Static621.aClass8_Sub2_Sub1_Sub2_Sub1Array3[local36] = null; } - Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 = null; + Static556.self = null; for (@Pc(49) int local49 = 0; local49 < Static416.anInt6378; local49++) { @Pc(55) Npc local55 = Static592.aClass2_Sub45Array1[local49].aClass8_Sub2_Sub1_Sub2_Sub2_2; if (local55 != null) { @@ -45,7 +45,7 @@ public static void method1841() { } } Static576.method7614(); - Static511.anInt7645 = 1; + Static511.cameraType = 1; Static693.anInt10383 = -1; Static692.anInt10376 = -1; Static81.method1586(11); diff --git a/client/src/main/java/Static96.java b/client/src/main/java/Static96.java index d32cacf..ea97273 100644 --- a/client/src/main/java/Static96.java +++ b/client/src/main/java/Static96.java @@ -12,8 +12,8 @@ public final class Static96 { @OriginalMember(owner = "client!da", name = "b", descriptor = "(II)V") public static void method8819(@OriginalArg(1) int arg0) { - @Pc(18) SecondaryLinkable_Sub2 local18 = Static440.method5963(4, (long) arg0); - local18.method205(); + @Pc(18) SecondaryLinkable_Sub2 local18 = Static440.create(4, (long) arg0); + local18.pushClient(); } @OriginalMember(owner = "client!da", name = "a", descriptor = "(IIIIB)V") diff --git a/client/src/main/java/SubInterface.java b/client/src/main/java/SubInterface.java index d149d96..9012009 100644 --- a/client/src/main/java/SubInterface.java +++ b/client/src/main/java/SubInterface.java @@ -8,5 +8,5 @@ public final class SubInterface extends Linkable { public int anInt146; @OriginalMember(owner = "client!aha", name = "n", descriptor = "I") - public int anInt147; + public int interfaceId; } diff --git a/client/src/main/java/TextureOpCurve.java b/client/src/main/java/TextureOpCurve.java index 533107a..e4e8e36 100644 --- a/client/src/main/java/TextureOpCurve.java +++ b/client/src/main/java/TextureOpCurve.java @@ -73,7 +73,7 @@ public int[] method9411(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { } } if (arg0 <= 107) { - Static706.anInt10633 = 6; + Static706.size = 6; } return local11; } diff --git a/client/src/main/java/TextureOpKaleidoscope.java b/client/src/main/java/TextureOpKaleidoscope.java index 5c49903..c6ff4e1 100644 --- a/client/src/main/java/TextureOpKaleidoscope.java +++ b/client/src/main/java/TextureOpKaleidoscope.java @@ -79,7 +79,7 @@ public int[][] method9414(@OriginalArg(0) int arg0) { @Override public int[] method9411(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { if (arg0 <= 107) { - Static666.method8693(90); + Static666.write(90); } @Pc(18) int[] local18 = super.aMonochromeImageCache41.method3935(arg1); if (super.aMonochromeImageCache41.aBoolean338) { diff --git a/client/src/main/java/TextureOpMonochromeFill.java b/client/src/main/java/TextureOpMonochromeFill.java index a75f9c5..46b9fe2 100644 --- a/client/src/main/java/TextureOpMonochromeFill.java +++ b/client/src/main/java/TextureOpMonochromeFill.java @@ -36,7 +36,7 @@ public void method9416(@OriginalArg(0) boolean arg0, @OriginalArg(1) Packet arg1 @Override public int[] method9411(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { if (arg0 < 107) { - Static379.anInt5968 = -76; + Static379.checksum = -76; } @Pc(16) int[] local16 = super.aMonochromeImageCache41.method3935(arg1); if (super.aMonochromeImageCache41.aBoolean338) { diff --git a/client/src/main/java/Win32Callback.java b/client/src/main/java/Win32Callback.java index 589f4c2..5c21dc8 100644 --- a/client/src/main/java/Win32Callback.java +++ b/client/src/main/java/Win32Callback.java @@ -55,12 +55,12 @@ private synchronized int callback(@OriginalArg(0) int arg0, @OriginalArg(1) int } @OriginalMember(owner = "client!ow", name = "a", descriptor = "(III)V") - public void method6431(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { + public void moveMouse(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { User32.SetCursorPos(arg0, arg1); } @OriginalMember(owner = "client!ow", name = "a", descriptor = "(ZLjava/awt/Component;B)V") - public void method6432(@OriginalArg(0) boolean arg0, @OriginalArg(1) Component arg1) { + public void showCursor(@OriginalArg(0) boolean arg0, @OriginalArg(1) Component arg1) { try { Method getPeer = Component.class.getDeclaredMethod("getPeer"); getPeer.setAccessible(true); diff --git a/client/src/main/java/World.java b/client/src/main/java/World.java index 42c2879..4cbc62d 100644 --- a/client/src/main/java/World.java +++ b/client/src/main/java/World.java @@ -5,19 +5,19 @@ public final class World extends AbstractWorld { @OriginalMember(owner = "client!pq", name = "q", descriptor = "Ljava/lang/String;") - public String aString90; + public String hostname; @OriginalMember(owner = "client!pq", name = "n", descriptor = "I") - public int anInt7569; + public int id; @OriginalMember(owner = "client!pq", name = "y", descriptor = "Ljava/lang/String;") - public String aString91; + public String activity; @OriginalMember(owner = "client!pq", name = "r", descriptor = "I") public int anInt7570 = -1; @OriginalMember(owner = "client!pq", name = "a", descriptor = "(B)Lclient!ci;") - public Country method6717() { - return Static511.aCountryArray1[super.anInt7564]; + public Country getWorldInfo() { + return Static511.countries[super.country]; } } diff --git a/client/src/main/java/WorldMapFont.java b/client/src/main/java/WorldMapFont.java index 87647bb..cec3e27 100644 --- a/client/src/main/java/WorldMapFont.java +++ b/client/src/main/java/WorldMapFont.java @@ -23,7 +23,7 @@ public final class WorldMapFont { private int anInt8498; @OriginalMember(owner = "client!rt", name = "f", descriptor = "Z") - private boolean aBoolean653 = false; + private boolean grayscale = false; @OriginalMember(owner = "client!rt", name = "c", descriptor = "[I") private final int[] anIntArray680 = new int[4]; @@ -46,25 +46,25 @@ public final class WorldMapFont { @OriginalMember(owner = "client!rt", name = "", descriptor = "(Lclient!ha;IZLjava/awt/Component;)V") public WorldMapFont(@OriginalArg(0) Class19 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) Component arg3) { - this.aBoolean653 = false; + this.grayscale = false; this.aSoftwareIndexedSpriteArray13 = new SoftwareIndexedSprite[256]; this.anIntArray678 = new int[256]; @Pc(32) Font local32 = new Font("Helvetica", 1, arg1); @Pc(36) FontMetrics local36 = arg3.getFontMetrics(local32); - for (@Pc(38) int local38 = 0; local38 < Static568.anInt8497; local38++) { - this.method7541(arg0, local32, local36, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ÄËÏÖÜäëïöüÿßÁÀÉÈÍÌÓÒÚÙáàéèíìóòúùÂÊÎÔÛâêîôûÆæãÃõÕçÇ".charAt(local38), local38, false); + for (@Pc(38) int local38 = 0; local38 < Static568.ALPHABET_SIZE; local38++) { + this.preRenderGlyph(arg0, local32, local36, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ÄËÏÖÜäëïöüÿßÁÀÉÈÍÌÓÒÚÙáàéèíìóòúùÂÊÎÔÛâêîôûÆæãÃõÕçÇ".charAt(local38), local38, false); } - if (this.aBoolean653) { - this.aBoolean653 = false; + if (this.grayscale) { + this.grayscale = false; local32 = new Font("Helvetica", 0, arg1); local36 = arg3.getFontMetrics(local32); - for (@Pc(78) int local78 = 0; local78 < Static568.anInt8497; local78++) { - this.method7541(arg0, local32, local36, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ÄËÏÖÜäëïöüÿßÁÀÉÈÍÌÓÒÚÙáàéèíìóòúùÂÊÎÔÛâêîôûÆæãÃõÕçÇ".charAt(local78), local78, false); + for (@Pc(78) int local78 = 0; local78 < Static568.ALPHABET_SIZE; local78++) { + this.preRenderGlyph(arg0, local32, local36, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ÄËÏÖÜäëïöüÿßÁÀÉÈÍÌÓÒÚÙáàéèíìóòúùÂÊÎÔÛâêîôûÆæãÃõÕçÇ".charAt(local78), local78, false); } - if (!this.aBoolean653) { - this.aBoolean653 = false; - for (@Pc(103) int local103 = 0; local103 < Static568.anInt8497; local103++) { - this.method7541(arg0, local32, local36, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ÄËÏÖÜäëïöüÿßÁÀÉÈÍÌÓÒÚÙáàéèíìóòúùÂÊÎÔÛâêîôûÆæãÃõÕçÇ".charAt(local103), local103, true); + if (!this.grayscale) { + this.grayscale = false; + for (@Pc(103) int local103 = 0; local103 < Static568.ALPHABET_SIZE; local103++) { + this.preRenderGlyph(arg0, local32, local36, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ÄËÏÖÜäëïöüÿßÁÀÉÈÍÌÓÒÚÙáàéèíìóòúùÂÊÎÔÛâêîôûÆæãÃõÕçÇ".charAt(local103), local103, true); } } } @@ -116,7 +116,7 @@ public void method7540(@OriginalArg(0) Class19 arg0, @OriginalArg(1) String arg1 } @OriginalMember(owner = "client!rt", name = "a", descriptor = "(Lclient!ha;Ljava/awt/Font;Ljava/awt/FontMetrics;CIZ)V") - private void method7541(@OriginalArg(0) Class19 arg0, @OriginalArg(1) Font arg1, @OriginalArg(2) FontMetrics arg2, @OriginalArg(3) char arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5) { + private void preRenderGlyph(@OriginalArg(0) Class19 arg0, @OriginalArg(1) Font arg1, @OriginalArg(2) FontMetrics arg2, @OriginalArg(3) char arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5) { @Pc(3) int local3 = arg2.charWidth(arg3); @Pc(5) int local5 = local3; if (arg5) { @@ -133,7 +133,7 @@ private void method7541(@OriginalArg(0) Class19 arg0, @OriginalArg(1) Font arg1, @Pc(67) int local67 = arg2.getMaxAscent(); @Pc(73) int local73 = arg2.getMaxAscent() + arg2.getMaxDescent(); @Pc(76) int local76 = arg2.getHeight(); - @Pc(81) Image local81 = Static434.aCanvas7.createImage(local3, local73); + @Pc(81) Image local81 = Static434.canvas.createImage(local3, local73); @Pc(84) Graphics local84 = local81.getGraphics(); local84.setColor(Color.black); local84.fillRect(0, 0, local3, local73); diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index 96537b7..f80b628 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -149,17 +149,17 @@ public static void main(@OriginalArg(0) String[] arg0) { } else { Static426.method1016("game"); } - Static323.anInt5121 = 0; + Static323.affiliate = 0; Static715.anInt10805 = 0; Static29.aBoolean61 = false; Static508.aBoolean582 = true; - Static126.aBoolean200 = true; + Static126.playerMember = true; Static473.aBoolean539 = false; Static389.aString64 = null; Static338.anInt5562 = Static392.clientModeGame.id; Static150.aString26 = ""; Static265.aByteArray44 = null; - Static584.anInt8634 = 0; + Static584.country = 0; Static416.aLong208 = 0L; @Pc(241) client local241 = new client(); Static295.aClient1 = local241; @@ -415,7 +415,7 @@ public static int method3448() { Static30.method5065(worldMapData, Static467.aFloTypeList3, Static540.aFluTypeList6, Static354.aLocTypeList4, Static577.aMelTypeList4, Static720.aMsiTypeList4, Static34.aClass304_1); } if (Static198.aClass140_17 == Static473.aClass140_22) { - Static37.aStringArray4 = new String[Static718.aVarClientStrTypeList1.anInt4266]; + Static37.varcstrs = new String[Static718.aVarClientStrTypeList1.anInt4266]; Static511.anIntArray614 = new int[Static691.aVarClientTypeList1.anInt5473]; Static118.aBooleanArray4 = new boolean[Static691.aVarClientTypeList1.anInt5473]; for (local12 = 0; local12 < Static691.aVarClientTypeList1.anInt5473; local12++) { @@ -441,13 +441,13 @@ public static int method3448() { configSpot.discardUnpacked = 2; } if (Static473.aClass140_22 == Static198.aClass140_18) { - if (!Static571.method7566(Static65.aClass3_1.anInt88)) { + if (!Static571.load(Static65.aClass3_1.anInt88)) { return 0; } local184 = true; - for (local74 = 0; local74 < Static453.aComponentArrayArray2[Static65.aClass3_1.anInt88].length; local74++) { - @Pc(1315) Component local1315 = Static453.aComponentArrayArray2[Static65.aClass3_1.anInt88][local74]; - if (local1315.anInt3820 == 5 && local1315.anInt3810 != -1 && !sprites.isFileReady(local1315.anInt3810, 0)) { + for (local74 = 0; local74 < Static453.components[Static65.aClass3_1.anInt88].length; local74++) { + @Pc(1315) Component local1315 = Static453.components[Static65.aClass3_1.anInt88][local74]; + if (local1315.type == 5 && local1315.spriteId != -1 && !sprites.isFileReady(local1315.spriteId, 0)) { local184 = false; } } @@ -479,7 +479,7 @@ public static int method3448() { } else if (Static400.aClass2_Sub34_28.aPreference_Sub29_2.aBoolean674 && Static292.aClass2_Sub43_2.anInt7610 < 512 && Static292.aClass2_Sub43_2.anInt7610 != 0) { Static400.aClass2_Sub34_28.method5104(0, Static400.aClass2_Sub34_28.aPreference_Sub29_2); } - Static666.method8693(1); + Static666.write(1); if (Static3.aBoolean4) { Static32.method880(0, false); } else { @@ -497,13 +497,13 @@ public static int method3448() { @OriginalMember(owner = "client!client", name = "i", descriptor = "(I)V") @Override public synchronized void method1641() { - if (Static166.anApplet1 != null && Static434.aCanvas7 == null && !Static446.aSignlink6.aBoolean779) { + if (Static166.anApplet1 != null && Static434.canvas == null && !Static446.aSignlink6.aBoolean779) { try { @Pc(25) Class local25 = Static166.anApplet1.getClass(); @Pc(31) Field local31 = local25.getDeclaredField("canvas"); - Static434.aCanvas7 = (Canvas) local31.get(Static166.anApplet1); + Static434.canvas = (Canvas) local31.get(Static166.anApplet1); local31.set(Static166.anApplet1, (Object) null); - if (Static434.aCanvas7 != null) { + if (Static434.canvas != null) { return; } } catch (@Pc(45) Exception local45) { @@ -592,8 +592,8 @@ private void method1656() { } if (Static92.anInt1874 == 1) { if (Static514.aPrivilegedRequest6.state == 2) { - if (Static514.aPrivilegedRequest6.anObject13 != null) { - Static376.aString62 = (String) Static514.aPrivilegedRequest6.anObject13; + if (Static514.aPrivilegedRequest6.result != null) { + Static376.aString62 = (String) Static514.aPrivilegedRequest6.result; } this.method1667(1000); return; @@ -603,7 +603,7 @@ private void method1656() { } } if (Static92.anInt1874 == 2) { - Static672.aClientStream2 = new ClientStream((Socket) Static514.aPrivilegedRequest6.anObject13, Static446.aSignlink6, 25000); + Static672.aClientStream2 = new ClientStream((Socket) Static514.aPrivilegedRequest6.result, Static446.aSignlink6, 25000); @Pc(251) Packet local251 = new Packet(5); local251.p1(Static572.aLoginProt54.opcode); local251.p4(667); @@ -646,8 +646,8 @@ private void method1656() { private void method1658() { @Pc(46) int local46; if (Static283.gameState == 7 && !Static242.method3500() || Static283.gameState == 9 && Static169.anInt2855 == 42) { - if (Static249.anInt4008 > 1) { - Static249.anInt4008--; + if (Static249.rebootTimer > 1) { + Static249.rebootTimer--; Static321.anInt5111 = Static642.anInt9599; } if (!Static400.aBoolean622) { @@ -684,7 +684,7 @@ private void method1658() { } else if (local203 > Static501.anInt7568 - local114 - 1) { local203 = Static501.anInt7568 - local114 - 1; } - @Pc(258) int local258 = Static521.method6870(local203, local114, true, 0, local97.anIntArray879[0], local114, Static480.anIntArray583, local114, local97.anIntArray878[0], -1, Static577.aClass110Array1[local97.aByte144], Static70.anIntArray147, local166, 0); + @Pc(258) int local258 = Static521.method6870(local203, local114, true, 0, local97.anIntArray879[0], local114, Static480.anIntArray583, local114, local97.anIntArray878[0], -1, Static577.aClass110Array1[local97.plane], Static70.anIntArray147, local166, 0); if (local258 > 0) { if (local258 > 9) { local258 = 9; @@ -707,11 +707,11 @@ private void method1658() { } } } - if ((Static283.gameState == 3 || Static283.gameState == 9 || Static283.gameState == 7) && (!Static242.method3500() || Static283.gameState == 9 && Static169.anInt2855 == 42) && Static6.anInt95 == 0) { - if (Static511.anInt7645 == 2) { - Static592.method7761(); + if ((Static283.gameState == 3 || Static283.gameState == 9 || Static283.gameState == 7) && (!Static242.method3500() || Static283.gameState == 9 && Static169.anInt2855 == 42) && Static6.step == 0) { + if (Static511.cameraType == 2) { + Static592.updateLockedCamera(); } else { - Static583.method7659(); + Static583.updateLoginScreenCamera(); } if (Static170.anInt2864 >> 9 < 14 || Static170.anInt2864 >> 9 >= Static720.anInt10859 - 14 || Static110.anInt2186 >> 9 < 14 || Static110.anInt2186 >> 9 >= Static501.anInt7568 - 14) { Static54.method1179(); @@ -722,21 +722,21 @@ private void method1658() { @Pc(458) Component local458; @Pc(470) Component local470; do { - local453 = (Linkable_Sub42) Static618.aLinkedList68.removeHead(); + local453 = (Linkable_Sub42) Static618.highPriorityRequests.removeHead(); if (local453 == null) { while (true) { do { - local453 = (Linkable_Sub42) Static59.aLinkedList33.removeHead(); + local453 = (Linkable_Sub42) Static59.mediumPriorityRequests.removeHead(); if (local453 == null) { while (true) { do { - local453 = (Linkable_Sub42) Static521.aLinkedList44.removeHead(); + local453 = (Linkable_Sub42) Static521.lowPriorityRequests.removeHead(); if (local453 == null) { if (Static109.aComponent3 != null) { Static603.method7899(); } - if (Static333.anInt5455 % 1500 == 0) { - Static314.method4562(); + if (Static333.loop % 1500 == 0) { + Static314.topBannerRefresh(); } if (Static283.gameState == 7 && !Static242.method3500() || Static283.gameState == 9 && Static169.anInt2855 == 42) { Static320.method4598(); @@ -783,29 +783,29 @@ private void method1658() { return; } local458 = local453.aComponent14; - if (local458.anInt3741 < 0) { + if (local458.createdComponentId < 0) { break; } - local470 = Static145.method2412(local458.anInt3743); - } while (local470 == null || local470.aComponentArray2 == null || local470.aComponentArray2.length <= local458.anInt3741 || local470.aComponentArray2[local458.anInt3741] != local458); + local470 = Static145.getComponent(local458.overlayer); + } while (local470 == null || local470.createdComponents == null || local470.createdComponents.length <= local458.createdComponentId || local470.createdComponents[local458.createdComponentId] != local458); Static472.method6420(local453); } } local458 = local453.aComponent14; - if (local458.anInt3741 < 0) { + if (local458.createdComponentId < 0) { break; } - local470 = Static145.method2412(local458.anInt3743); - } while (local470 == null || local470.aComponentArray2 == null || local470.aComponentArray2.length <= local458.anInt3741 || local458 != local470.aComponentArray2[local458.anInt3741]); + local470 = Static145.getComponent(local458.overlayer); + } while (local470 == null || local470.createdComponents == null || local470.createdComponents.length <= local458.createdComponentId || local458 != local470.createdComponents[local458.createdComponentId]); Static472.method6420(local453); } } local458 = local453.aComponent14; - if (local458.anInt3741 < 0) { + if (local458.createdComponentId < 0) { break; } - local470 = Static145.method2412(local458.anInt3743); - } while (local470 == null || local470.aComponentArray2 == null || local470.aComponentArray2.length <= local458.anInt3741 || local458 != local470.aComponentArray2[local458.anInt3741]); + local470 = Static145.getComponent(local458.overlayer); + } while (local470 == null || local470.createdComponents == null || local470.createdComponents.length <= local458.createdComponentId || local458 != local470.createdComponents[local458.createdComponentId]); Static472.method6420(local453); } } @@ -968,9 +968,9 @@ private void method1666() { if (Static666.aBoolean766) { Static614.method8245(); } - if (Static400.aClass2_Sub34_28.aPreference_Sub10_1.method3519() == 1 && Static283.gameState == 3 && Static377.anInt5930 != -1) { + if (Static400.aClass2_Sub34_28.aPreference_Sub10_1.method3519() == 1 && Static283.gameState == 3 && Static377.topLevelInterface != -1) { Static400.aClass2_Sub34_28.method5104(0, Static400.aClass2_Sub34_28.aPreference_Sub10_1); - Static666.method8693(1); + Static666.write(1); } } @@ -1006,8 +1006,8 @@ private void method1668() { if (Static283.gameState == 16) { return; } - Static333.anInt5455++; - if (Static333.anInt5455 % 1000 == 1) { + Static333.loop++; + if (Static333.loop % 1000 == 1) { @Pc(27) GregorianCalendar local27 = new GregorianCalendar(); Static178.anInt2947 = local27.get(11) * 600 + local27.get(12) * 10 + local27.get(13) / 6; Static493.aRandom1.setSeed((long) Static178.anInt2947); @@ -1089,7 +1089,7 @@ private void method1668() { Static673.anInt10079 = Static356.anInt5780; Static383.anInt6001 = Static329.anInt1749; if (Static718.aBoolean823) { - Static430.method5817(Static459.aClass229_2.worldId, Static459.aClass229_2.aString60); + Static430.hopWorld(Static459.aClass229_2.worldId, Static459.aClass229_2.aString60); Connection.gameConnection.aClass348_1 = null; Static81.method1586(14); } else { @@ -1146,8 +1146,8 @@ protected void method1647() { Static175.aClipboard1 = Static295.aClient1.getToolkit().getSystemClipboard(); } catch (@Pc(183) Exception local183) { } - Static334.aKeyboard1 = Static681.method8921(Static434.aCanvas7); - Static189.aMouse1 = Static70.method1513(Static434.aCanvas7); + Static334.aKeyboard1 = Static681.method8921(Static434.canvas); + Static189.aMouse1 = Static70.method1513(Static434.canvas); try { if (Static446.aSignlink6.aFileOnDisk2 != null) { cacheData = new BufferedFile(Static446.aSignlink6.aFileOnDisk2, 5200, 0); @@ -1179,9 +1179,9 @@ protected void method1647() { public String method1648() { @Pc(5) String local5 = null; try { - local5 = "[1)" + Static691.anInt10367 + "," + Static116.anInt2270 + "," + Static720.anInt10859 + "," + Static501.anInt7568 + "|"; - if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 != null) { - local5 = local5 + "2)" + Static394.anInt6176 + "," + (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray879[0] + Static691.anInt10367) + "," + (Static116.anInt2270 + Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.anIntArray878[0]) + "|"; + local5 = "[1)" + Static691.originX + "," + Static116.originZ + "," + Static720.anInt10859 + "," + Static501.anInt7568 + "|"; + if (Static556.self != null) { + local5 = local5 + "2)" + Static394.anInt6176 + "," + (Static556.self.anIntArray879[0] + Static691.originX) + "," + (Static116.originZ + Static556.self.anIntArray878[0]) + "|"; } local5 = local5 + "3)" + Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915() + "|4)" + Static400.aClass2_Sub34_28.aPreference_Sub13_2.method4373() + "|5)" + Static36.method978(3) + "|6)" + Static680.anInt10289 + "," + Static380.anInt5979 + "|"; local5 = local5 + "7)" + Static400.aClass2_Sub34_28.aPreference_Sub24_1.method7082() + "|"; @@ -1288,9 +1288,9 @@ public void init() { } } try { - Static323.anInt5121 = Integer.parseInt(this.getParameter("affid")); + Static323.affiliate = Integer.parseInt(this.getParameter("affid")); } catch (@Pc(247) Exception local247) { - Static323.anInt5121 = 0; + Static323.affiliate = 0; } Static360.aString59 = this.getParameter("quiturl"); Static150.aString26 = this.getParameter("settings"); @@ -1301,9 +1301,9 @@ public void init() { @Pc(281) String local281 = this.getParameter("country"); if (local281 != null) { try { - Static584.anInt8634 = Integer.parseInt(local281); + Static584.country = Integer.parseInt(local281); } catch (@Pc(288) Exception local288) { - Static584.anInt8634 = 0; + Static584.country = 0; } } Static338.anInt5562 = Integer.parseInt(this.getParameter("colourid")); @@ -1312,7 +1312,7 @@ public void init() { } if (Integer.parseInt(this.getParameter("sitesettings_member")) == 1) { Static508.aBoolean582 = true; - Static126.aBoolean200 = true; + Static126.playerMember = true; } @Pc(336) String local336 = this.getParameter("frombilling"); if (local336 != null && local336.equals("true")) {