diff --git a/client/src/main/java/AudioChannel.java b/client/src/main/java/AudioChannel.java index 9cb45f8..6190c8a 100644 --- a/client/src/main/java/AudioChannel.java +++ b/client/src/main/java/AudioChannel.java @@ -26,10 +26,10 @@ public class AudioChannel { private final int anInt4087 = 32; @OriginalMember(owner = "client!cd", name = "w", descriptor = "Z") - private boolean aBoolean319 = false; + private boolean isClosed = false; @OriginalMember(owner = "client!cd", name = "e", descriptor = "J") - private long aLong128 = Static588.method7715(); + private long aLong128 = Static588.currentTimeWithDrift(); @OriginalMember(owner = "client!cd", name = "h", descriptor = "J") private long aLong129 = 0L; @@ -79,28 +79,28 @@ private void method3584() { } @OriginalMember(owner = "client!cd", name = "c", descriptor = "(I)V") - public final synchronized void method3586() { + public final synchronized void close() { if (Static232.aAudioThread1 != null) { - @Pc(11) boolean local11 = true; - for (@Pc(13) int local13 = 0; local13 < 2; local13++) { - if (Static232.aAudioThread1.aAudioChannelArray1[local13] == this) { - Static232.aAudioThread1.aAudioChannelArray1[local13] = 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.aAudioThread1.aAudioChannelArray1[local13] != null) { - local11 = false; + if (Static232.aAudioThread1.aAudioChannelArray1[i] != null) { + allChannelsClosed = false; } } - if (local11) { - Static232.aAudioThread1.aBoolean241 = true; - while (Static232.aAudioThread1.aBoolean242) { - Static638.method8395(50L); + if (allChannelsClosed) { + Static232.aAudioThread1.allChannelsClosed = true; + while (Static232.aAudioThread1.isRunning) { + Static638.sleep(50L); } Static232.aAudioThread1 = null; } } this.method3596(); this.anIntArray315 = null; - this.aBoolean319 = true; + this.isClosed = true; } @OriginalMember(owner = "client!cd", name = "d", descriptor = "()I") @@ -136,7 +136,7 @@ public final synchronized void method3592() { this.method3583(); } catch (@Pc(19) Exception local19) { this.method3596(); - this.aLong129 = Static588.method7715() + 2000L; + this.aLong129 = Static588.currentTimeWithDrift() + 2000L; } } @@ -146,10 +146,10 @@ public void method3593(@OriginalArg(0) Component arg0) throws Exception { @OriginalMember(owner = "client!cd", name = "b", descriptor = "(B)V") public final synchronized void method3594() { - if (this.aBoolean319) { + if (this.isClosed) { return; } - @Pc(11) long local11 = Static588.method7715(); + @Pc(11) long local11 = Static588.currentTimeWithDrift(); try { if (this.aLong128 + 6000L < local11) { this.aLong128 = local11 - 6000L; @@ -157,7 +157,7 @@ public final synchronized void method3594() { while (local11 > this.aLong128 + 5000L) { this.method3584(); this.aLong128 += (long) (256000 / Static686.anInt8944); - local11 = Static588.method7715(); + local11 = Static588.currentTimeWithDrift(); } } catch (@Pc(54) Exception local54) { this.aLong128 = local11; @@ -316,7 +316,7 @@ private void method3595(@OriginalArg(0) int[] arg0) { if (this.aClass2_Sub6_6 != null) { this.aClass2_Sub6_6.method9131(arg0, 0, 256); } - this.aLong128 = Static588.method7715(); + this.aLong128 = Static588.currentTimeWithDrift(); } @OriginalMember(owner = "client!cd", name = "c", descriptor = "()V") diff --git a/client/src/main/java/AudioThread.java b/client/src/main/java/AudioThread.java index 8c5e83c..ab4613a 100644 --- a/client/src/main/java/AudioThread.java +++ b/client/src/main/java/AudioThread.java @@ -12,31 +12,31 @@ public final class AudioThread implements Runnable { public final AudioChannel[] aAudioChannelArray1 = new AudioChannel[2]; @OriginalMember(owner = "client!faa", name = "h", descriptor = "Z") - public volatile boolean aBoolean241 = false; + public volatile boolean allChannelsClosed = false; @OriginalMember(owner = "client!faa", name = "e", descriptor = "Z") - public volatile boolean aBoolean242 = false; + public volatile boolean isRunning = false; @OriginalMember(owner = "client!faa", name = "run", descriptor = "()V") @Override public void run() { - this.aBoolean242 = true; + this.isRunning = true; try { - while (!this.aBoolean241) { + while (!this.allChannelsClosed) { for (@Pc(12) int local12 = 0; local12 < 2; local12++) { @Pc(21) AudioChannel local21 = this.aAudioChannelArray1[local12]; if (local21 != null) { local21.method3594(); } } - Static638.method8395(10L); + Static638.sleep(10L); Static61.method1312(this.aSignlink2, (Object) null); } } catch (@Pc(49) Exception local49) { Static240.method3496(local49, (String) null); } finally { @Pc(59) Object local59 = null; - this.aBoolean242 = false; + this.isRunning = false; } } } diff --git a/client/src/main/java/BrokenInputStream.java b/client/src/main/java/BrokenInputStream.java index 0d04f65..fd1046c 100644 --- a/client/src/main/java/BrokenInputStream.java +++ b/client/src/main/java/BrokenInputStream.java @@ -8,7 +8,7 @@ public final class BrokenInputStream extends InputStream { @OriginalMember(owner = "client!saa", name = "read", descriptor = "()I") @Override public int read() { - Static638.method8395(30000L); + Static638.sleep(30000L); return -1; } } diff --git a/client/src/main/java/BrokenInputStream2.java b/client/src/main/java/BrokenInputStream2.java index 0ea60b9..9f3129e 100644 --- a/client/src/main/java/BrokenInputStream2.java +++ b/client/src/main/java/BrokenInputStream2.java @@ -8,7 +8,7 @@ public final class BrokenInputStream2 extends InputStream { @OriginalMember(owner = "client!mo", name = "read", descriptor = "()I") @Override public int read() { - Static638.method8395(30000L); + Static638.sleep(30000L); return -1; } } diff --git a/client/src/main/java/BufferedFile.java b/client/src/main/java/BufferedFile.java index 0188c98..8b6aaca 100644 --- a/client/src/main/java/BufferedFile.java +++ b/client/src/main/java/BufferedFile.java @@ -242,7 +242,7 @@ public void method5565(@OriginalArg(0) byte[] arg0) throws IOException { @OriginalMember(owner = "client!mj", name = "d", descriptor = "(I)V") public void method5566() throws IOException { this.method5567(); - this.aFileOnDisk1.method2158(); + this.aFileOnDisk1.close(); } @OriginalMember(owner = "client!mj", name = "a", descriptor = "(Z)V") diff --git a/client/src/main/java/Class13_Sub1.java b/client/src/main/java/Class13_Sub1.java index f6ac175..b3ed031 100644 --- a/client/src/main/java/Class13_Sub1.java +++ b/client/src/main/java/Class13_Sub1.java @@ -7,6 +7,6 @@ public final class Class13_Sub1 extends Class13 { @OriginalMember(owner = "client!jca", name = "b", descriptor = "(I)J") @Override public long method5161() { - return Static588.method7715() * 1000000L; + return Static588.currentTimeWithDrift() * 1000000L; } } diff --git a/client/src/main/java/Class19.java b/client/src/main/java/Class19.java index f545fc8..7940cbd 100644 --- a/client/src/main/java/Class19.java +++ b/client/src/main/java/Class19.java @@ -65,9 +65,9 @@ public Class19(@OriginalArg(0) Interface4 arg0) { public abstract void EA(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3); @OriginalMember(owner = "client!ha", name = "i", descriptor = "(I)V") - public final void method7940() { + public final void cleanup() { Static259.aBooleanArray8[this.anInt8962] = false; - this.method7987(); + this.doCleanup(); } @OriginalMember(owner = "client!ha", name = "K", descriptor = "([I)V") @@ -259,11 +259,11 @@ public final void method7984() throws Exception_Sub1 { @OriginalMember(owner = "client!ha", name = "finalize", descriptor = "()V") @Override public void finalize() { - this.method7940(); + this.cleanup(); } @OriginalMember(owner = "client!ha", name = "u", descriptor = "()V") - protected abstract void method7987(); + protected abstract void doCleanup(); @OriginalMember(owner = "client!ha", name = "a", descriptor = "(Lclient!eca;Lclient!wja;)Lclient!gaa;") public abstract Interface9 method7988(@OriginalArg(0) IndexedSprite arg0, @OriginalArg(1) Interface26 arg1); diff --git a/client/src/main/java/Class190.java b/client/src/main/java/Class190.java index b92a488..ca118f3 100644 --- a/client/src/main/java/Class190.java +++ b/client/src/main/java/Class190.java @@ -69,7 +69,7 @@ public void method4225() { } @OriginalMember(owner = "client!je", name = "a", descriptor = "(B)V") - public void method4227() { + public void cleanup() { synchronized (this) { if (this.anIOException1 == null) { this.anIOException1 = new IOException(""); @@ -78,7 +78,8 @@ public void method4227() { } try { this.aThread3.join(); - } catch (@Pc(37) InterruptedException local37) { + } catch (@Pc(37) InterruptedException e) { + e.printStackTrace(); } } diff --git a/client/src/main/java/Class19_Sub1.java b/client/src/main/java/Class19_Sub1.java index 05cddcf..0abfff8 100644 --- a/client/src/main/java/Class19_Sub1.java +++ b/client/src/main/java/Class19_Sub1.java @@ -473,7 +473,7 @@ protected Class19_Sub1(@OriginalArg(0) Canvas arg0, @OriginalArg(1) Object arg1, } } catch (@Pc(399) Throwable local399) { local399.printStackTrace(); - this.method7940(); + this.cleanup(); throw new RuntimeException(""); } } @@ -1059,7 +1059,7 @@ public final void method8050(@OriginalArg(0) byte arg0) { @OriginalMember(owner = "client!am", name = "u", descriptor = "()V") @Override - protected void method7987() { + protected void doCleanup() { if (this.aBoolean687) { return; } diff --git a/client/src/main/java/Class19_Sub1_Sub1.java b/client/src/main/java/Class19_Sub1_Sub1.java index 9ccf986..f4cec63 100644 --- a/client/src/main/java/Class19_Sub1_Sub1.java +++ b/client/src/main/java/Class19_Sub1_Sub1.java @@ -159,7 +159,7 @@ public static Class19 createToolkit(@OriginalArg(0) Canvas arg0, @OriginalArg(1) } } catch (@Pc(281) RuntimeException local281) { if (local1 != null) { - local1.method7987(); + local1.doCleanup(); } throw local281; } @@ -200,7 +200,7 @@ private Class19_Sub1_Sub1(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O this.anIDirect3DDevice1.BeginScene(); } catch (@Pc(228) Throwable local228) { local228.printStackTrace(); - this.method7940(); + this.cleanup(); throw new RuntimeException(""); } } @@ -440,9 +440,9 @@ protected void method8039() { @OriginalMember(owner = "client!kea", name = "u", descriptor = "()V") @Override - protected void method7987() { + protected void doCleanup() { this.aTi1.b(-23417); - super.method7987(); + super.doCleanup(); } @OriginalMember(owner = "client!kea", name = "I", descriptor = "()I") diff --git a/client/src/main/java/Class19_Sub1_Sub2.java b/client/src/main/java/Class19_Sub1_Sub2.java index e2bb772..a816d03 100644 --- a/client/src/main/java/Class19_Sub1_Sub2.java +++ b/client/src/main/java/Class19_Sub1_Sub2.java @@ -202,7 +202,7 @@ public Class19_Sub1_Sub2(@OriginalArg(0) OpenGL arg0, @OriginalArg(1) Canvas arg } } catch (@Pc(514) Throwable local514) { local514.printStackTrace(); - this.method7940(); + this.cleanup(); throw new RuntimeException(""); } } @@ -519,9 +519,9 @@ public synchronized void method7977(@OriginalArg(0) int arg0) { local19 = (IntNode) this.aLinkedList60.removeHead(); OpenGL.glDeleteLists((int) local19.id, local19.value); } - if (this.E() > 100663296 && this.aLong279 + 60000L < Static588.method7715()) { + if (this.E() > 100663296 && this.aLong279 + 60000L < Static588.currentTimeWithDrift()) { System.gc(); - this.aLong279 = Static588.method7715(); + this.aLong279 = Static588.currentTimeWithDrift(); } super.method7977(local11); } @@ -1028,8 +1028,8 @@ public void method8125(@OriginalArg(0) Class168 arg0, @OriginalArg(2) boolean ar @OriginalMember(owner = "client!tca", name = "u", descriptor = "()V") @Override - protected void method7987() { - super.method7987(); + protected void doCleanup() { + super.doCleanup(); if (this.anOpenGL2 != null) { this.anOpenGL2.a(); this.anOpenGL2.release(); diff --git a/client/src/main/java/Class19_Sub2.java b/client/src/main/java/Class19_Sub2.java index 224ee08..6c7f0a2 100644 --- a/client/src/main/java/Class19_Sub2.java +++ b/client/src/main/java/Class19_Sub2.java @@ -187,10 +187,10 @@ private Class19_Sub2(@OriginalArg(0) Interface4 arg0) { this.method8020(0); Static198.method2954(true, true); this.aBoolean330 = true; - this.anInt4184 = (int) Static588.method7715(); + this.anInt4184 = (int) Static588.currentTimeWithDrift(); } catch (@Pc(99) Throwable local99) { local99.printStackTrace(); - this.method7940(); + this.cleanup(); throw new RuntimeException(""); } } @@ -203,14 +203,14 @@ public Class19_Sub2(@OriginalArg(0) Canvas arg0, @OriginalArg(1) Interface4 arg1 this.method8019(arg0); } catch (@Pc(12) Throwable local12) { local12.printStackTrace(); - this.method7940(); + this.cleanup(); throw new RuntimeException(""); } } @OriginalMember(owner = "client!iaa", name = "u", descriptor = "()V") @Override - protected void method7987() { + protected void doCleanup() { if (this.aBoolean330) { Static300.method4390(true, false); this.aBoolean330 = false; diff --git a/client/src/main/java/Class19_Sub3.java b/client/src/main/java/Class19_Sub3.java index 898dae0..bf01834 100644 --- a/client/src/main/java/Class19_Sub3.java +++ b/client/src/main/java/Class19_Sub3.java @@ -669,7 +669,7 @@ public Class19_Sub3(@OriginalArg(0) Canvas arg0, @OriginalArg(1) Interface4 arg1 this.method7969(); } catch (@Pc(666) Throwable local666) { local666.printStackTrace(); - this.method7987(); + this.doCleanup(); throw new RuntimeException(""); } } else { @@ -1116,7 +1116,7 @@ public void A(@OriginalArg(0) int arg0, @OriginalArg(1) Class1 arg1, @OriginalAr @OriginalMember(owner = "client!qha", name = "u", descriptor = "()V") @Override - protected void method7987() { + protected void doCleanup() { for (@Pc(8) Linkable local8 = this.aLinkedList46.head(); local8 != null; local8 = this.aLinkedList46.next()) { ((Linkable_Sub13_Sub1) local8).method1609(); } @@ -1235,7 +1235,7 @@ private void method6982() { if (local13++ > 5) { throw new RuntimeException(""); } - Static638.method8395(1000L); + Static638.sleep(1000L); } } @@ -2697,9 +2697,9 @@ public synchronized void method7977(@OriginalArg(0) int arg0) { OpenGL.glDeleteLists((int) local19.id, local19.value); } this.aClass169_1.method3528(); - if (this.E() > 100663296 && this.aLong248 + 60000L < Static588.method7715()) { + if (this.E() > 100663296 && this.aLong248 + 60000L < Static588.currentTimeWithDrift()) { System.gc(); - this.aLong248 = Static588.method7715(); + this.aLong248 = Static588.currentTimeWithDrift(); } this.anInt7987 = local9; } diff --git a/client/src/main/java/Class222.java b/client/src/main/java/Class222.java index 319a427..a15b252 100644 --- a/client/src/main/java/Class222.java +++ b/client/src/main/java/Class222.java @@ -155,7 +155,7 @@ private void method9175() throws IOException { private boolean method9176() { if (this.aClass2_Sub28_Sub1_2 == null) { @Pc(42) double local42 = (double) this.aClass2_Sub28_Sub3_2.method5488(); - return local42 == 0.0D || (double) Static588.method7715() >= 1000.0D / local42 + (double) this.aClass2_Sub28_Sub3_2.method5496(); + return local42 == 0.0D || (double) Static588.currentTimeWithDrift() >= 1000.0D / local42 + (double) this.aClass2_Sub28_Sub3_2.method5496(); } else { return !this.aClass2_Sub28_Sub3_2.method5498() || this.method9185() > this.aClass2_Sub28_Sub3_2.method5497(); } diff --git a/client/src/main/java/Class226.java b/client/src/main/java/Class226.java index 21dbcba..b856d8a 100644 --- a/client/src/main/java/Class226.java +++ b/client/src/main/java/Class226.java @@ -51,21 +51,21 @@ public void run() { } @OriginalMember(owner = "client!lha", name = "a", descriptor = "(I)V") - public void method5243() { + public void shutDown() { if (this.aThread4 == null) { return; } this.method5244(new Linkable()); try { this.aThread4.join(); - } catch (@Pc(23) InterruptedException local23) { + } catch (@Pc(23) InterruptedException e) { + e.printStackTrace(); } this.aThread4 = null; } @OriginalMember(owner = "client!lha", name = "a", descriptor = "(ILclient!ie;)V") private void method5244(@OriginalArg(1) Linkable arg0) { - @Pc(2) LinkedList local2 = this.aLinkedList32; synchronized (this.aLinkedList32) { this.aLinkedList32.addTail(arg0); this.aLinkedList32.notify(); diff --git a/client/src/main/java/Class304.java b/client/src/main/java/Class304.java index f0816ab..db621ec 100644 --- a/client/src/main/java/Class304.java +++ b/client/src/main/java/Class304.java @@ -20,10 +20,10 @@ public void method6866(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { this.anIntArray621[arg0] = arg1; @Pc(24) LongNode local24 = (LongNode) this.aHashTable39.get((long) arg0); if (local24 == null) { - local24 = new LongNode(Static588.method7715() + 500L); + local24 = new LongNode(Static588.currentTimeWithDrift() + 500L); this.aHashTable39.put((long) arg0, local24); } else { - local24.value = Static588.method7715() + 500L; + local24.value = Static588.currentTimeWithDrift() + 500L; } } @@ -86,7 +86,7 @@ public void method6871(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @OriginalMember(owner = "client!qga", name = "a", descriptor = "(IZ)I") public int method6872(@OriginalArg(1) boolean arg0) { - @Pc(8) long local8 = Static588.method7715(); + @Pc(8) long local8 = Static588.currentTimeWithDrift(); for (@Pc(23) LongNode local23 = arg0 ? (LongNode) this.aHashTable39.head() : (LongNode) this.aHashTable39.next(); local23 != null; local23 = (LongNode) this.aHashTable39.next()) { if ((local23.value & 0x3FFFFFFFFFFFFFFFL) < local8) { if ((local23.value & 0x4000000000000000L) != 0L) { @@ -109,7 +109,7 @@ public void method6873(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { local24 = new LongNode(4611686018427387905L); this.aHashTable39.put((long) arg0, local24); } else if (local24.value != 4611686018427387905L) { - local24.value = Static588.method7715() + 500L | 0x4000000000000000L; + local24.value = Static588.currentTimeWithDrift() + 500L | 0x4000000000000000L; } } } diff --git a/client/src/main/java/Class348.java b/client/src/main/java/Class348.java index e76c9ae..5e172a3 100644 --- a/client/src/main/java/Class348.java +++ b/client/src/main/java/Class348.java @@ -11,7 +11,7 @@ protected Class348() { } @OriginalMember(owner = "client!vn", name = "a", descriptor = "(I)V") - public abstract void method7926(); + public abstract void cleanup(); @OriginalMember(owner = "client!vn", name = "b", descriptor = "(I)V") public abstract void method7927(); diff --git a/client/src/main/java/Class348_Sub1.java b/client/src/main/java/Class348_Sub1.java index aec6d72..274f793 100644 --- a/client/src/main/java/Class348_Sub1.java +++ b/client/src/main/java/Class348_Sub1.java @@ -46,19 +46,20 @@ public boolean method7932(@OriginalArg(0) int arg0) throws IOException { @OriginalMember(owner = "client!tc", name = "a", descriptor = "(I)V") @Override - public void method7926() { + public void cleanup() { try { this.aSocket2.close(); - } catch (@Pc(11) IOException local11) { + } catch (@Pc(11) IOException e) { + e.printStackTrace(); } - this.aClass190_1.method4227(); - this.aClass385_1.method8915(); + this.aClass190_1.cleanup(); + this.aClass385_1.cleanup(); } @OriginalMember(owner = "client!tc", name = "finalize", descriptor = "()V") @Override public void finalize() { - this.method7926(); + this.cleanup(); } @OriginalMember(owner = "client!tc", name = "b", descriptor = "(I)V") diff --git a/client/src/main/java/Class354.java b/client/src/main/java/Class354.java index 3301aea..f1b66e0 100644 --- a/client/src/main/java/Class354.java +++ b/client/src/main/java/Class354.java @@ -30,7 +30,7 @@ public Class354(@OriginalArg(0) Class76 arg0, @OriginalArg(1) Class398 arg1) { @OriginalMember(owner = "client!tha", name = "a", descriptor = "(ZJ)Z") @Override public boolean method8463(@OriginalArg(1) long arg0) { - return Static588.method7715() >= (long) this.aClass76_1.anInt2140 + arg0; + return Static588.currentTimeWithDrift() >= (long) this.aClass76_1.anInt2140 + arg0; } @OriginalMember(owner = "client!tha", name = "c", descriptor = "(I)I") diff --git a/client/src/main/java/Class362.java b/client/src/main/java/Class362.java index 033aa36..189fecb 100644 --- a/client/src/main/java/Class362.java +++ b/client/src/main/java/Class362.java @@ -66,9 +66,9 @@ public boolean method8349() { return true; } } - if (this.aPrivilegedRequest7 == null || this.aPrivilegedRequest7.anInt6789 == 2) { + if (this.aPrivilegedRequest7 == null || this.aPrivilegedRequest7.state == 2) { return true; - } else if (this.aPrivilegedRequest7.anInt6789 == 1) { + } else if (this.aPrivilegedRequest7.state == 1) { if (this.aThread5 == null) { this.aThread5 = new Thread(this); this.aThread5.start(); diff --git a/client/src/main/java/Class364.java b/client/src/main/java/Class364.java index 5a25df0..dc8d441 100644 --- a/client/src/main/java/Class364.java +++ b/client/src/main/java/Class364.java @@ -61,7 +61,7 @@ public void method8372() { public synchronized void method8373(@OriginalArg(1) Interface22 arg0) { this.anInterface22_2 = this.anInterface22_1; this.anInterface22_1 = arg0; - this.aLong286 = Static588.method7715(); + this.aLong286 = Static588.currentTimeWithDrift(); } @OriginalMember(owner = "client!uaa", name = "a", descriptor = "(ILjava/lang/String;Lclient!gca;IJ)V") @@ -106,14 +106,14 @@ public int method8378() { @Override public void run() { while (!this.aBoolean732) { - @Pc(8) long local8 = Static588.method7715(); + @Pc(8) long local8 = Static588.currentTimeWithDrift(); synchronized (this) { try { this.anInt9523++; if (this.anInterface22_1 instanceof Class374) { this.anInterface22_1.method8465(this.aBoolean731); } else { - @Pc(25) long local25 = Static588.method7715(); + @Pc(25) long local25 = Static588.currentTimeWithDrift(); if (Static163.aClass19_17 == null || this.anInterface22_2 == null || this.anInterface22_2.method8462() == 0 || this.aLong286 < local25 - (long) this.anInterface22_2.method8462()) { if (this.anInterface22_2 != null) { this.aBoolean731 = true; @@ -175,10 +175,10 @@ public void run() { continue; } } - @Pc(304) long local304 = Static588.method7715(); + @Pc(304) long local304 = Static588.currentTimeWithDrift(); @Pc(312) int local312 = (int) (local8 + 20L - local304); if (local312 > 0) { - Static638.method8395((long) local312); + Static638.sleep((long) local312); } } } diff --git a/client/src/main/java/Class385.java b/client/src/main/java/Class385.java index 2a7a2ed..75eac9e 100644 --- a/client/src/main/java/Class385.java +++ b/client/src/main/java/Class385.java @@ -40,7 +40,7 @@ public Class385(@OriginalArg(0) OutputStream arg0, @OriginalArg(1) int arg1) { } @OriginalMember(owner = "client!vja", name = "a", descriptor = "(I)V") - public void method8915() { + public void cleanup() { synchronized (this) { if (this.anIOException2 == null) { this.anIOException2 = new IOException(""); @@ -49,7 +49,8 @@ public void method8915() { } try { this.aThread6.join(); - } catch (@Pc(29) InterruptedException local29) { + } catch (@Pc(29) InterruptedException e) { + e.printStackTrace(); } } diff --git a/client/src/main/java/Class90.java b/client/src/main/java/Class90.java index 7a3f4c5..9962576 100644 --- a/client/src/main/java/Class90.java +++ b/client/src/main/java/Class90.java @@ -39,7 +39,7 @@ public final void method7749() { this.method7751(local18, local32); this.method7753(local18, local32); @Pc(56) String local56 = Static449.aClass364_1.method8377(); - if (Static588.method7715() - this.aLong274 > 10000L) { + if (Static588.currentTimeWithDrift() - this.aLong274 > 10000L) { local56 = local56 + " (" + Static449.aClass364_1.method8369().method2952() + ")"; } this.aClass14_10.method8828(-1, local18 + this.aClass138_5.anInt4418 / 2, local56, local32 + this.aClass138_5.anInt4413 / 2 + this.aClass138_5.anInt4416 + 4, this.aClass138_5.anInt4421); @@ -58,7 +58,7 @@ protected final int method7752() { @Pc(55) long local55 = this.aLong274 - Static449.aClass364_1.method8370(); if (local55 > 0L) { @Pc(72) long local72 = (long) (local40 - local9) * (local55 * 10000L / (long) local9); - @Pc(81) long local81 = (Static588.method7715() - this.aLong274) * 10000L; + @Pc(81) long local81 = (Static588.currentTimeWithDrift() - this.aLong274) * 10000L; if (local81 < local72) { local13 = (int) ((long) (local40 - local9) * local81 * 100L / local72 + (long) (local9 * 100)); } else { @@ -68,7 +68,7 @@ protected final int method7752() { } } else { this.anInt8730 = local9; - this.aLong274 = Static588.method7715(); + this.aLong274 = Static588.currentTimeWithDrift(); } return local13; } diff --git a/client/src/main/java/ClientStream.java b/client/src/main/java/ClientStream.java index 71265f4..49b53b5 100644 --- a/client/src/main/java/ClientStream.java +++ b/client/src/main/java/ClientStream.java @@ -18,7 +18,7 @@ public final class ClientStream implements Runnable { private byte[] aByteArray79; @OriginalMember(owner = "client!nk", name = "n", descriptor = "Z") - private boolean aBoolean488 = false; + private boolean isShuttingDown = false; @OriginalMember(owner = "client!nk", name = "k", descriptor = "I") private int anInt6541 = 0; @@ -57,7 +57,7 @@ public ClientStream(@OriginalArg(0) Socket arg0, @OriginalArg(1) Signlink arg1, @OriginalMember(owner = "client!nk", name = "a", descriptor = "(I)V") public void method5823() throws IOException { - if (!this.aBoolean488 && this.aBoolean489) { + if (!this.isShuttingDown && this.aBoolean489) { this.aBoolean489 = false; throw new IOException(); } @@ -65,7 +65,7 @@ public void method5823() throws IOException { @OriginalMember(owner = "client!nk", name = "d", descriptor = "(I)I") public int method5824() throws IOException { - return this.aBoolean488 ? 0 : this.anInputStream2.read(); + return this.isShuttingDown ? 0 : this.anInputStream2.read(); } @OriginalMember(owner = "client!nk", name = "run", descriptor = "()V") @@ -78,7 +78,7 @@ public void run() { @Pc(26) int local26; synchronized (this) { if (this.anInt6540 == this.anInt6541) { - if (this.aBoolean488) { + if (this.isShuttingDown) { break label80; } try { @@ -133,7 +133,7 @@ public void run() { @OriginalMember(owner = "client!nk", name = "a", descriptor = "(IBI[B)V") public void method5825(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) byte[] arg2) throws IOException { - if (this.aBoolean488) { + if (this.isShuttingDown) { return; } while (arg0 > 0) { @@ -148,7 +148,7 @@ public void method5825(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @Orig @OriginalMember(owner = "client!nk", name = "a", descriptor = "(B)V") public void method5826() { - if (!this.aBoolean488) { + if (!this.isShuttingDown) { this.anInputStream2 = new BrokenInputStream(); this.anOutputStream1 = new BrokenOutputStream(); } @@ -157,17 +157,17 @@ public void method5826() { @OriginalMember(owner = "client!nk", name = "finalize", descriptor = "()V") @Override public void finalize() { - this.method5830(); + this.shutDown(); } @OriginalMember(owner = "client!nk", name = "c", descriptor = "(I)I") public int method5828() throws IOException { - return this.aBoolean488 ? 0 : this.anInputStream2.available(); + return this.isShuttingDown ? 0 : this.anInputStream2.available(); } @OriginalMember(owner = "client!nk", name = "a", descriptor = "(II[BB)V") public void method5829(@OriginalArg(1) int arg0, @OriginalArg(2) byte[] arg1) throws IOException { - if (this.aBoolean488) { + if (this.isShuttingDown) { return; } if (this.aBoolean489) { @@ -193,22 +193,23 @@ public void method5829(@OriginalArg(1) int arg0, @OriginalArg(2) byte[] arg1) th } @OriginalMember(owner = "client!nk", name = "e", descriptor = "(I)V") - public void method5830() { - if (this.aBoolean488) { + public void shutDown() { + if (this.isShuttingDown) { return; } synchronized (this) { - this.aBoolean488 = true; + this.isShuttingDown = true; this.notifyAll(); } if (this.aPrivilegedRequest3 != null) { - while (this.aPrivilegedRequest3.anInt6789 == 0) { - Static638.method8395(1L); + while (this.aPrivilegedRequest3.state == 0) { + Static638.sleep(1L); } - if (this.aPrivilegedRequest3.anInt6789 == 1) { + if (this.aPrivilegedRequest3.state == 1) { try { ((Thread) this.aPrivilegedRequest3.anObject13).join(); - } catch (@Pc(60) InterruptedException local60) { + } catch (@Pc(60) InterruptedException e) { + e.printStackTrace(); } } } diff --git a/client/src/main/java/Connection.java b/client/src/main/java/Connection.java index 5fd7311..c36d6a5 100644 --- a/client/src/main/java/Connection.java +++ b/client/src/main/java/Connection.java @@ -120,9 +120,9 @@ public void method3273() throws IOException { } @OriginalMember(owner = "client!gw", name = "c", descriptor = "(I)V") - public void method3274() { + public void close() { if (this.aClass348_1 != null) { - this.aClass348_1.method7926(); + this.aClass348_1.cleanup(); this.aClass348_1 = null; } } diff --git a/client/src/main/java/FileOnDisk.java b/client/src/main/java/FileOnDisk.java index 0cf2104..f835424 100644 --- a/client/src/main/java/FileOnDisk.java +++ b/client/src/main/java/FileOnDisk.java @@ -43,7 +43,7 @@ public FileOnDisk(@OriginalArg(0) File arg0, @OriginalArg(1) String arg1, @Origi } @OriginalMember(owner = "client!dm", name = "a", descriptor = "(Z)V") - public void method2158() throws IOException { + public void close() throws IOException { if (this.aRandomAccessFile1 != null) { this.aRandomAccessFile1.close(); this.aRandomAccessFile1 = null; @@ -66,7 +66,7 @@ public long method2161() throws IOException { public void finalize() throws Throwable { if (this.aRandomAccessFile1 != null) { System.out.println("Warning! fileondisk " + this.aFile1 + " not closed correctly using close(). Auto-closing instead. "); - this.method2158(); + this.close(); } } diff --git a/client/src/main/java/GameShell.java b/client/src/main/java/GameShell.java index b46e12c..1d759ee 100644 --- a/client/src/main/java/GameShell.java +++ b/client/src/main/java/GameShell.java @@ -29,11 +29,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public static final float[] aFloatArray14 = new float[16384]; @OriginalMember(owner = "client!kh", name = "z", descriptor = "Z") - private boolean aBoolean157 = false; + private boolean isUsingJagMisc = false; @OriginalMember(owner = "client!kh", name = "h", descriptor = "Z") private boolean aBoolean156 = false; + @OriginalMember(owner = "client!hn", name = "b", descriptor = "Z") + public static boolean isShuttingDown = false; + + @OriginalMember(owner = "client!tb", name = "c", descriptor = "J") + public static long shutDownTimestamp = 0L; + static { @Pc(433) double local433 = 3.834951969714103E-4D; for (@Pc(435) int local435 = 0; local435 < 16384; local435++) { @@ -48,54 +54,58 @@ public static void provideLoaderApplet(@OriginalArg(0) Applet arg0) { } @OriginalMember(owner = "client!kh", name = "a", descriptor = "(IZ)V") - private void method1632(@OriginalArg(1) boolean arg0) { + private void shutDown(@OriginalArg(1) boolean clean) { synchronized (this) { - if (Static250.aBoolean311) { + if (isShuttingDown) { return; } - Static250.aBoolean311 = true; + isShuttingDown = true; } - System.out.println("Shutdown start - clean:" + arg0); + System.out.println("Shutdown start - clean:" + clean); if (Static166.anApplet1 != null) { Static166.anApplet1.destroy(); } try { - this.method1633(); - } catch (@Pc(42) Exception local42) { + this.doShutDown(); + } catch (@Pc(42) Exception e) { + e.printStackTrace(); + } - if (this.aBoolean157) { + if (this.isUsingJagMisc) { try { jagmisc.quit(); - } catch (@Pc(48) Throwable local48) { + } catch (@Pc(48) Throwable e) { + e.printStackTrace(); } - this.aBoolean157 = false; + this.isUsingJagMisc = false; } - Static307.method4480(); - Static501.method6714(); + Static307.shutDown(); + Static501.unloadLibraries(); if (Static434.aCanvas7 != null) { try { Static434.aCanvas7.removeFocusListener(this); Static434.aCanvas7.getParent().remove(Static434.aCanvas7); - } catch (@Pc(68) Exception local68) { + } catch (@Pc(68) Exception e) { + e.printStackTrace(); } } if (Static446.aSignlink6 != null) { try { - Static446.aSignlink6.method8985(); - } catch (@Pc(76) Exception local76) { + Static446.aSignlink6.shutDown(); + } catch (@Pc(76) Exception e) { + e.printStackTrace(); } } - this.method1637(); if (Static353.aFrame10 != null) { Static353.aFrame10.setVisible(false); Static353.aFrame10.dispose(); Static353.aFrame10 = null; } - System.out.println("Shutdown complete - clean:" + arg0); + System.out.println("Shutdown complete - clean:" + clean); } @OriginalMember(owner = "client!kh", name = "j", descriptor = "(I)V") - protected abstract void method1633(); + protected abstract void doShutDown(); @OriginalMember(owner = "client!kh", name = "b", descriptor = "(I)Z") public final boolean method1634() { @@ -129,8 +139,8 @@ protected final void method1635(@OriginalArg(3) int arg0, @OriginalArg(6) String 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); - while (local88.anInt6789 == 0) { - Static638.method8395(10L); + while (local88.state == 0) { + Static638.sleep(10L); } } catch (@Pc(103) Exception local103) { Static240.method3496(local103, (String) null); @@ -154,14 +164,11 @@ public final void focusGained(@OriginalArg(0) FocusEvent arg0) { Static664.aBoolean759 = true; } - @OriginalMember(owner = "client!kh", name = "e", descriptor = "(B)V") - protected abstract void method1637(); - @OriginalMember(owner = "client!kh", name = "start", descriptor = "()V") @Override public final void start() { - if (Static149.aGameShell == this && !Static250.aBoolean311) { - Static604.aLong278 = 0L; + if (Static149.aGameShell == this && !isShuttingDown) { + shutDownTimestamp = 0L; } } @@ -189,7 +196,7 @@ public final void windowDeactivated(@OriginalArg(0) WindowEvent arg0) { @OriginalMember(owner = "client!kh", name = "e", descriptor = "(I)V") private void method1639() { - @Pc(6) long local6 = Static588.method7715(); + @Pc(6) long local6 = Static588.currentTimeWithDrift(); @Pc(17) long local17 = Static475.aLongArray16[Static708.anInt10644]; Static475.aLongArray16[Static708.anInt10644] = local6; if (local17 != 0L && local17 < local6) { @@ -232,8 +239,8 @@ protected final void method1640(@OriginalArg(2) int arg0, @OriginalArg(3) int ar Static149.aGameShell = this; Static284.aSignlink4 = Static446.aSignlink6 = new Signlink(arg1, arg2, 37, Static166.anApplet1 != null); @Pc(80) PrivilegedRequest local80 = Static446.aSignlink6.method8991(this, 1); - while (local80.anInt6789 == 0) { - Static638.method8395(10L); + while (local80.state == 0) { + Static638.sleep(10L); } } else { Static426.anInt941++; @@ -297,7 +304,7 @@ public final void run() { this.method1641(); this.method1647(); Static600.aTimer1 = Static570.method7550(); - while (Static604.aLong278 == 0L || Static588.method7715() < Static604.aLong278) { + while (shutDownTimestamp == 0L || Static588.currentTimeWithDrift() < shutDownTimestamp) { Static32.anInt776 = Static600.aTimer1.method5598(Static324.aLong164); for (@Pc(213) int local213 = 0; local213 < Static32.anInt776; local213++) { this.method1646(); @@ -312,7 +319,7 @@ public final void run() { this.method1638("crash"); } finally { @Pc(275) Object local275 = null; - this.method1632(true); + this.shutDown(true); } } @@ -329,11 +336,11 @@ public final AppletContext getAppletContext() { @OriginalMember(owner = "client!kh", name = "paint", descriptor = "(Ljava/awt/Graphics;)V") @Override public final synchronized void paint(@OriginalArg(0) Graphics arg0) { - if (Static149.aGameShell != this || Static250.aBoolean311) { + if (Static149.aGameShell != this || isShuttingDown) { return; } Static664.aBoolean759 = true; - if (Static463.aBoolean531 && Static588.method7715() - Static149.aLong96 > 1000L) { + if (Static463.aBoolean531 && Static588.currentTimeWithDrift() - Static149.aLong96 > 1000L) { @Pc(28) Rectangle local28 = arg0.getClipBounds(); if (local28 == null || Static52.anInt1059 <= local28.width && local28.height >= Static54.anInt1084) { Static723.aBoolean827 = true; @@ -355,8 +362,8 @@ public final void windowClosing(@OriginalArg(0) WindowEvent arg0) { @OriginalMember(owner = "client!kh", name = "stop", descriptor = "()V") @Override public final void stop() { - if (Static149.aGameShell == this && !Static250.aBoolean311) { - Static604.aLong278 = Static588.method7715() + 4000L; + if (Static149.aGameShell == this && !isShuttingDown) { + shutDownTimestamp = Static588.currentTimeWithDrift() + 4000L; } } @@ -397,7 +404,7 @@ public synchronized void method1641() { Static206.aBoolean268 = true; Static664.aBoolean759 = true; Static723.aBoolean827 = false; - Static149.aLong96 = Static588.method7715(); + Static149.aLong96 = Static588.currentTimeWithDrift(); } @OriginalMember(owner = "client!kh", name = "d", descriptor = "(B)Z") @@ -436,7 +443,7 @@ public final boolean method1644() { @OriginalMember(owner = "client!kh", name = "f", descriptor = "(I)V") private void method1646() { - @Pc(6) long local6 = Static588.method7715(); + @Pc(6) long local6 = Static588.currentTimeWithDrift(); @Pc(10) long local10 = Static221.aLongArray18[Static392.anInt6142]; Static221.aLongArray18[Static392.anInt6142] = local6; @Pc(31) boolean local31; @@ -479,11 +486,11 @@ public final void windowDeiconified(@OriginalArg(0) WindowEvent arg0) { @OriginalMember(owner = "client!kh", name = "destroy", descriptor = "()V") @Override public final void destroy() { - if (Static149.aGameShell == this && !Static250.aBoolean311) { - Static604.aLong278 = Static588.method7715(); - Static638.method8395(5000L); + if (Static149.aGameShell == this && !isShuttingDown) { + shutDownTimestamp = Static588.currentTimeWithDrift(); + Static638.sleep(5000L); Static284.aSignlink4 = null; - this.method1632(false); + this.shutDown(false); } } diff --git a/client/src/main/java/JavaKeyboard.java b/client/src/main/java/JavaKeyboard.java index 8d5610e..d72cf88 100644 --- a/client/src/main/java/JavaKeyboard.java +++ b/client/src/main/java/JavaKeyboard.java @@ -51,7 +51,7 @@ private void method8485(@OriginalArg(0) char arg0, @OriginalArg(2) int arg1, @Or local7.aChar4 = arg0; local7.anInt2881 = arg1; local7.anInt2886 = arg2; - local7.aLong99 = Static588.method7715(); + local7.aLong99 = Static588.currentTimeWithDrift(); this.aLinkedList71.addTail(local7); } diff --git a/client/src/main/java/JavaMouse.java b/client/src/main/java/JavaMouse.java index 7c8b86b..19efd41 100644 --- a/client/src/main/java/JavaMouse.java +++ b/client/src/main/java/JavaMouse.java @@ -82,7 +82,7 @@ private void method3627(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Ori local3.anInt1889 = arg1; local3.anInt1888 = arg2; local3.anInt1887 = arg0; - local3.aLong68 = Static588.method7715(); + local3.aLong68 = Static588.currentTimeWithDrift(); local3.anInt1890 = arg3; this.aLinkedList21.addTail(local3); } diff --git a/client/src/main/java/Js5CacheQueue.java b/client/src/main/java/Js5CacheQueue.java index 277b010..f7a9e7e 100644 --- a/client/src/main/java/Js5CacheQueue.java +++ b/client/src/main/java/Js5CacheQueue.java @@ -16,7 +16,7 @@ public final class Js5CacheQueue implements Runnable { public int anInt4243 = 0; @OriginalMember(owner = "client!iba", name = "a", descriptor = "Z") - private boolean aBoolean333 = false; + private boolean isShuttingDown = false; @OriginalMember(owner = "client!iba", name = "g", descriptor = "Ljava/lang/Thread;") private Thread aThread2; @@ -32,10 +32,10 @@ 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); - while (local20.anInt6789 == 0) { - Static638.method8395(10L); + while (local20.state == 0) { + Static638.sleep(10L); } - if (local20.anInt6789 == 2) { + if (local20.state == 2) { throw new RuntimeException(); } this.aThread2 = (Thread) local20.anObject13; @@ -67,15 +67,15 @@ public Js5CacheRequest method3825(@OriginalArg(0) Cache arg0, @OriginalArg(1) in } @OriginalMember(owner = "client!iba", name = "a", descriptor = "(I)V") - public void method3826() { - this.aBoolean333 = true; - @Pc(9) SecondaryLinkedList local9 = this.aSecondaryLinkedList7; + public void shutDown() { + this.isShuttingDown = true; synchronized (this.aSecondaryLinkedList7) { this.aSecondaryLinkedList7.notifyAll(); } try { this.aThread2.join(); - } catch (@Pc(25) InterruptedException local25) { + } catch (@Pc(25) InterruptedException e) { + e.printStackTrace(); } this.aThread2 = null; } @@ -93,7 +93,7 @@ private void method3827(@OriginalArg(1) Js5CacheRequest arg0) { @OriginalMember(owner = "client!iba", name = "run", descriptor = "()V") @Override public void run() { - while (!this.aBoolean333) { + while (!this.isShuttingDown) { @Pc(10) SecondaryLinkedList local10 = this.aSecondaryLinkedList7; @Pc(18) Js5CacheRequest local18; synchronized (this.aSecondaryLinkedList7) { diff --git a/client/src/main/java/Js5CachedResourceProvider.java b/client/src/main/java/Js5CachedResourceProvider.java index 8b2645c..6762667 100644 --- a/client/src/main/java/Js5CachedResourceProvider.java +++ b/client/src/main/java/Js5CachedResourceProvider.java @@ -218,7 +218,7 @@ public void cycle() { this.aLinkedList42 = null; } } - if (!this.aBoolean569 || Static588.method7715() < this.aLong239) { + if (!this.aBoolean569 || Static588.currentTimeWithDrift() < this.aLong239) { return; } for (@Pc(366) Js5Request local366 = (Js5Request) this.aHashTable36.head(); local366 != null; local366 = (Js5Request) this.aHashTable36.next()) { @@ -233,7 +233,7 @@ public void cycle() { } } } - this.aLong239 = Static588.method7715() + 1000L; + this.aLong239 = Static588.currentTimeWithDrift() + 1000L; } @OriginalMember(owner = "client!pm", name = "d", descriptor = "(B)I") diff --git a/client/src/main/java/Js5NetQueue.java b/client/src/main/java/Js5NetQueue.java index 25ac46e..f5d7bd4 100644 --- a/client/src/main/java/Js5NetQueue.java +++ b/client/src/main/java/Js5NetQueue.java @@ -49,7 +49,7 @@ public final class Js5NetQueue { @OriginalMember(owner = "client!pla", name = "b", descriptor = "(B)V") public void method6619() { try { - this.aClientStream1.method5830(); + this.aClientStream1.shutDown(); } catch (@Pc(5) Exception local5) { } this.aClientStream1 = null; @@ -70,7 +70,7 @@ private void method6620() { this.aClientStream1.method5829(4, this.aPacket_13.data); } catch (@Pc(33) IOException local33) { try { - this.aClientStream1.method5830(); + this.aClientStream1.shutDown(); } catch (@Pc(39) Exception local39) { } this.anInt7453++; @@ -80,9 +80,9 @@ private void method6620() { } @OriginalMember(owner = "client!pla", name = "a", descriptor = "(Z)V") - public void method6621() { + public void shutDown() { if (this.aClientStream1 != null) { - this.aClientStream1.method5830(); + this.aClientStream1.shutDown(); } } @@ -95,7 +95,7 @@ public int method6622() { public boolean method6624() { @Pc(14) int local14; if (this.aClientStream1 != null) { - @Pc(7) long local7 = Static588.method7715(); + @Pc(7) long local7 = Static588.currentTimeWithDrift(); local14 = (int) (local7 - this.aLong238); this.aLong238 = local7; if (local14 > 200) { @@ -104,7 +104,7 @@ public boolean method6624() { this.anInt7451 += local14; if (this.anInt7451 > 30000) { try { - this.aClientStream1.method5830(); + this.aClientStream1.shutDown(); } catch (@Pc(42) Exception local42) { } this.aClientStream1 = null; @@ -225,7 +225,7 @@ public boolean method6624() { return true; } catch (@Pc(694) IOException local694) { try { - this.aClientStream1.method5830(); + this.aClientStream1.shutDown(); } catch (@Pc(702) Exception local702) { } this.aClientStream1 = null; @@ -252,7 +252,7 @@ public void method6626(@OriginalArg(0) boolean arg0) { this.aClientStream1.method5829(4, this.aPacket_13.data); } catch (@Pc(38) IOException local38) { try { - this.aClientStream1.method5830(); + this.aClientStream1.shutDown(); } catch (@Pc(44) Exception local44) { } this.aClientStream1 = null; @@ -265,7 +265,7 @@ public void method6626(@OriginalArg(0) boolean arg0) { public void method6627(@OriginalArg(0) boolean arg0, @OriginalArg(2) ClientStream arg1) { if (this.aClientStream1 != null) { try { - this.aClientStream1.method5830(); + this.aClientStream1.shutDown(); } catch (@Pc(14) Exception local14) { } this.aClientStream1 = null; @@ -290,7 +290,7 @@ public void method6627(@OriginalArg(0) boolean arg0, @OriginalArg(2) ClientStrea this.aClientStream1.method5829(4, this.aPacket_13.data); } catch (@Pc(117) IOException local117) { try { - this.aClientStream1.method5830(); + this.aClientStream1.shutDown(); } catch (@Pc(123) Exception local123) { } this.anInt7453++; @@ -299,7 +299,7 @@ public void method6627(@OriginalArg(0) boolean arg0, @OriginalArg(2) ClientStrea } } this.anInt7451 = 0; - this.aLong238 = Static588.method7715(); + this.aLong238 = Static588.currentTimeWithDrift(); return; } this.aSecondaryLinkedList12.addTail(local48); @@ -321,7 +321,7 @@ public void method6628() { this.aClientStream1.method5829(4, this.aPacket_13.data); } catch (@Pc(42) IOException local42) { try { - this.aClientStream1.method5830(); + this.aClientStream1.shutDown(); } catch (@Pc(48) Exception local48) { } this.aClientStream1 = null; diff --git a/client/src/main/java/Linkable_Sub28_Sub3.java b/client/src/main/java/Linkable_Sub28_Sub3.java index 83fca61..31faeab 100644 --- a/client/src/main/java/Linkable_Sub28_Sub3.java +++ b/client/src/main/java/Linkable_Sub28_Sub3.java @@ -152,7 +152,7 @@ protected void method8558(@OriginalArg(1) OggPacket arg0) { } return; } - this.aLong188 = Static588.method7715(); + this.aLong188 = Static588.currentTimeWithDrift(); local19 = this.aDecoderContext1.decodePacketIn(arg0, this.aGranulePos1); if (local19 < 0) { throw new IllegalStateException(String.valueOf(local19)); diff --git a/client/src/main/java/MillisTimer.java b/client/src/main/java/MillisTimer.java index 53ecdc5..3c65d13 100644 --- a/client/src/main/java/MillisTimer.java +++ b/client/src/main/java/MillisTimer.java @@ -68,7 +68,7 @@ protected int method5596(@OriginalArg(1) long arg0) { @OriginalMember(owner = "client!au", name = "c", descriptor = "(B)J") private long method734() { - @Pc(10) long local10 = Static588.method7715() * 1000000L; + @Pc(10) long local10 = Static588.currentTimeWithDrift() * 1000000L; @Pc(16) long local16 = local10 - this.aLong20; this.aLong20 = local10; if (local16 > -5000000000L && local16 < 5000000000L) { diff --git a/client/src/main/java/Mouse_Sub2.java b/client/src/main/java/Mouse_Sub2.java index 0881cd2..e6067ed 100644 --- a/client/src/main/java/Mouse_Sub2.java +++ b/client/src/main/java/Mouse_Sub2.java @@ -53,7 +53,7 @@ private void method8855(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @Ori local15.anInt5937 = arg3; local15.anInt5942 = arg1; local15.anInt5940 = arg0; - local15.aLong181 = Static588.method7715(); + local15.aLong181 = Static588.currentTimeWithDrift(); this.aLinkedList75.addTail(local15); } diff --git a/client/src/main/java/PrivilegedRequest.java b/client/src/main/java/PrivilegedRequest.java index f8cba49..11aba44 100644 --- a/client/src/main/java/PrivilegedRequest.java +++ b/client/src/main/java/PrivilegedRequest.java @@ -23,5 +23,5 @@ public final class PrivilegedRequest { public int anInt6790; @OriginalMember(owner = "client!oba", name = "g", descriptor = "I") - public volatile int anInt6789 = 0; + public volatile int state = 0; } diff --git a/client/src/main/java/Protocol.java b/client/src/main/java/Protocol.java index 27f817d..776c022 100644 --- a/client/src/main/java/Protocol.java +++ b/client/src/main/java/Protocol.java @@ -1473,7 +1473,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep local11.pdataisaac(local3044, arg0.anInt3648); local627 = Static350.method5126(0, local3044, arg0.anInt3648); local629 = "opensn"; - if (!Static98.aBoolean191 || Static36.method980(Static446.aSignlink6, local627, local629, 1).anInt6789 == 2) { + if (!Static98.aBoolean191 || Static36.method980(Static446.aSignlink6, local627, local629, 1).state == 2) { Static259.method3693(local627, local629, Static446.aSignlink6, Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915() == 1, true); } arg0.packetType = null; diff --git a/client/src/main/java/SecondaryLinkable_Sub2.java b/client/src/main/java/SecondaryLinkable_Sub2.java index 781a410..25eb1c5 100644 --- a/client/src/main/java/SecondaryLinkable_Sub2.java +++ b/client/src/main/java/SecondaryLinkable_Sub2.java @@ -47,7 +47,7 @@ public long method204() { @OriginalMember(owner = "client!aj", name = "c", descriptor = "(B)V") public void method205() { - super.secondaryKey = Static588.method7715() + 500L | super.secondaryKey & Long.MIN_VALUE; + super.secondaryKey = Static588.currentTimeWithDrift() + 500L | super.secondaryKey & Long.MIN_VALUE; Static59.aSecondaryLinkedList9.addTail(this); } } diff --git a/client/src/main/java/SecondaryParticleNode_Sub1.java b/client/src/main/java/SecondaryParticleNode_Sub1.java index 46a7040..c1e8866 100644 --- a/client/src/main/java/SecondaryParticleNode_Sub1.java +++ b/client/src/main/java/SecondaryParticleNode_Sub1.java @@ -6,7 +6,7 @@ public final class SecondaryParticleNode_Sub1 extends SecondaryParticleNode { @OriginalMember(owner = "client!ne", name = "q", descriptor = "I") - public final int anInt6433 = (int) (Static588.method7715() / 1000L); + public final int anInt6433 = (int) (Static588.currentTimeWithDrift() / 1000L); @OriginalMember(owner = "client!ne", name = "s", descriptor = "Ljava/lang/String;") public final String aString72; diff --git a/client/src/main/java/Signlink.java b/client/src/main/java/Signlink.java index 0f128bb..6d9dc13 100644 --- a/client/src/main/java/Signlink.java +++ b/client/src/main/java/Signlink.java @@ -28,7 +28,7 @@ public final class Signlink implements Runnable { private PrivilegedRequest aPrivilegedRequest8 = null; @OriginalMember(owner = "client!vq", name = "F", descriptor = "Z") - private boolean aBoolean780 = false; + private boolean isShuttingDown = false; @OriginalMember(owner = "client!vq", name = "h", descriptor = "Lclient!oba;") private PrivilegedRequest aPrivilegedRequest9 = null; @@ -169,7 +169,7 @@ public Signlink(@OriginalArg(0) int arg0, @OriginalArg(1) String arg1, @Original } } } - this.aBoolean780 = false; + this.isShuttingDown = false; this.aThread7 = new Thread(this); this.aThread7.setPriority(10); this.aThread7.setDaemon(true); @@ -212,41 +212,46 @@ public PrivilegedRequest method8984() { } @OriginalMember(owner = "client!vq", name = "b", descriptor = "(I)V") - public void method8985() { + public void shutDown() { synchronized (this) { - this.aBoolean780 = true; + this.isShuttingDown = true; this.notifyAll(); } try { this.aThread7.join(); - } catch (@Pc(25) InterruptedException local25) { + } catch (@Pc(25) InterruptedException e) { + e.printStackTrace(); } if (this.aFileOnDisk2 != null) { try { - this.aFileOnDisk2.method2158(); - } catch (@Pc(35) IOException local35) { + this.aFileOnDisk2.close(); + } catch (@Pc(35) IOException e) { + e.printStackTrace(); } } if (this.aFileOnDisk3 != null) { try { - this.aFileOnDisk3.method2158(); - } catch (@Pc(46) IOException local46) { + this.aFileOnDisk3.close(); + } catch (@Pc(46) IOException e) { + e.printStackTrace(); } } if (this.aFileOnDiskArray1 != null) { - for (@Pc(52) int local52 = 0; local52 < this.aFileOnDiskArray1.length; local52++) { - if (this.aFileOnDiskArray1[local52] != null) { - try { - this.aFileOnDiskArray1[local52].method2158(); - } catch (@Pc(67) IOException local67) { - } - } - } + for (FileOnDisk fileOnDisk : this.aFileOnDiskArray1) { + if (fileOnDisk != null) { + try { + fileOnDisk.close(); + } catch (@Pc(67) IOException e) { + e.printStackTrace(); + } + } + } } if (this.aFileOnDisk4 != null) { try { - this.aFileOnDisk4.method2158(); - } catch (@Pc(90) IOException local90) { + this.aFileOnDisk4.close(); + } catch (@Pc(90) IOException e) { + e.printStackTrace(); } } } @@ -320,7 +325,7 @@ 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.method7715() + 5000L; + Static689.aLong317 = Static588.currentTimeWithDrift() + 5000L; } @OriginalMember(owner = "client!vq", name = "a", descriptor = "(IB[ILjava/awt/Component;Ljava/awt/Point;I)Lclient!oba;") @@ -335,7 +340,7 @@ public void run() { @Pc(15) PrivilegedRequest local15; synchronized (this) { while (true) { - if (this.aBoolean780) { + if (this.isShuttingDown) { return; } if (this.aPrivilegedRequest8 != null) { @@ -355,12 +360,12 @@ public void run() { try { @Pc(42) int local42 = local15.anInt6790; if (local42 == 1) { - if (Static588.method7715() < Static689.aLong317) { + if (Static588.currentTimeWithDrift() < Static689.aLong317) { throw new IOException(); } local15.anObject13 = new Socket(InetAddress.getByName((String) local15.anObject12), local15.anInt6788); } else if (local42 == 22) { - if (Static689.aLong317 > Static588.method7715()) { + if (Static689.aLong317 > Static588.currentTimeWithDrift()) { throw new IOException(); } try { @@ -376,7 +381,7 @@ public void run() { local911.setPriority(local15.anInt6788); local15.anObject13 = local911; } else if (local42 == 4) { - if (Static588.method7715() < Static689.aLong317) { + if (Static588.currentTimeWithDrift() < Static689.aLong317) { throw new IOException(); } local15.anObject13 = new DataInputStream(((URL) local15.anObject12).openStream()); @@ -404,13 +409,13 @@ public void run() { } else if (this.aBoolean781) { @Pc(220) String local220; if (local42 == 3) { - if (Static588.method7715() < Static689.aLong317) { + if (Static588.currentTimeWithDrift() < Static689.aLong317) { 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(); } else if (local42 == 21) { - if (Static588.method7715() < Static689.aLong317) { + if (Static588.currentTimeWithDrift() < Static689.aLong317) { throw new IOException(); } local15.anObject13 = InetAddress.getByName((String) local15.anObject12).getAddress(); @@ -489,11 +494,11 @@ public void run() { throw new Exception(""); } } - local15.anInt6789 = 1; + local15.state = 1; } catch (@Pc(958) ThreadDeath local958) { throw local958; } catch (@Pc(961) Throwable local961) { - local15.anInt6789 = 2; + local15.state = 2; } synchronized (local15) { local15.notify(); diff --git a/client/src/main/java/Static112.java b/client/src/main/java/Static112.java index 98f3f1c..0fa5d87 100644 --- a/client/src/main/java/Static112.java +++ b/client/src/main/java/Static112.java @@ -64,7 +64,7 @@ public static Class200 method2106(@OriginalArg(1) Packet arg0) { @OriginalMember(owner = "client!dj", name = "e", descriptor = "(I)V") public static void method2109() { if (Static158.aClass19_5 != null) { - Static158.aClass19_5.method7940(); + Static158.aClass19_5.cleanup(); Static629.aClass14_11 = null; Static158.aClass19_5 = null; } diff --git a/client/src/main/java/Static113.java b/client/src/main/java/Static113.java index c0b7f5d..ec020ea 100644 --- a/client/src/main/java/Static113.java +++ b/client/src/main/java/Static113.java @@ -43,7 +43,7 @@ public static void method2121(@OriginalArg(0) byte[] arg0, @OriginalArg(2) boole } } Static149.aBoolean221 = false; - Static363.aLong219 = Static588.method7715(); + Static363.aLong219 = Static588.currentTimeWithDrift(); Static339.aPacket_9 = null; } } diff --git a/client/src/main/java/Static147.java b/client/src/main/java/Static147.java index 845e6f5..9ac91dc 100644 --- a/client/src/main/java/Static147.java +++ b/client/src/main/java/Static147.java @@ -365,7 +365,7 @@ public static void method2421(@OriginalArg(0) long arg0, @OriginalArg(2) Class19 Static424.anInt6459 = 0; Static111.anInt2220 = 0; Static530.anInt8093 = 0; - @Pc(16) long local16 = Static588.method7715(); + @Pc(16) long local16 = Static588.currentTimeWithDrift(); for (@Pc(21) ParticleSystem local21 = (ParticleSystem) Static342.aParticleLinkedList7.method2790(); local21 != null; local21 = (ParticleSystem) Static342.aParticleLinkedList7.method2785()) { if (local21.method3653(arg1, arg0)) { Static111.anInt2220++; @@ -373,7 +373,7 @@ public static void method2421(@OriginalArg(0) long arg0, @OriginalArg(2) Class19 } if (Static615.aBoolean719 && arg0 % 100L == 0L) { System.out.println("Particle system count: " + Static342.aParticleLinkedList7.method2784() + ", running: " + Static111.anInt2220); - System.out.println("Emitters: " + Static424.anInt6459 + " Particles: " + Static530.anInt8093 + ". Time taken: " + (Static588.method7715() - local16) + "ms"); + System.out.println("Emitters: " + Static424.anInt6459 + " Particles: " + Static530.anInt8093 + ". Time taken: " + (Static588.currentTimeWithDrift() - local16) + "ms"); } } } diff --git a/client/src/main/java/Static150.java b/client/src/main/java/Static150.java index 8221d80..3187487 100644 --- a/client/src/main/java/Static150.java +++ b/client/src/main/java/Static150.java @@ -20,7 +20,7 @@ public final class Static150 { @OriginalMember(owner = "client!en", name = "a", descriptor = "(B)V") public static void method2455() { - Static173.method2690(); + Static173.closeAudioChannels(); Static517.method6822(Static400.aClass2_Sub34_28.aPreference_Sub17_1.method5667() == 1); Static719.aAudioChannel5 = Static638.method8394(Static446.aSignlink6, 0, 22050, Static434.aCanvas7); Static697.method9120(Static48.method1100((MidiPcmStream) null)); diff --git a/client/src/main/java/Static153.java b/client/src/main/java/Static153.java index 9ddfa00..ac43fc0 100644 --- a/client/src/main/java/Static153.java +++ b/client/src/main/java/Static153.java @@ -25,7 +25,7 @@ public static void method2461(@OriginalArg(0) int arg0, @OriginalArg(1) Class367 return; } Static346.aClass367_1 = arg1; - Static344.aLong169 = Static588.method7715(); + Static344.aLong169 = Static588.currentTimeWithDrift(); Static173.anInt2913 = arg0; Static587.anInt8673 = arg0; if (Static587.anInt8673 == 0) { diff --git a/client/src/main/java/Static173.java b/client/src/main/java/Static173.java index b4c61c4..7141886 100644 --- a/client/src/main/java/Static173.java +++ b/client/src/main/java/Static173.java @@ -15,12 +15,12 @@ public final class Static173 { public static int anInt2913 = -1; @OriginalMember(owner = "client!fga", name = "b", descriptor = "(Z)V") - public static void method2690() { + public static void closeAudioChannels() { if (Static719.aAudioChannel5 != null) { - Static719.aAudioChannel5.method3586(); + Static719.aAudioChannel5.close(); } if (Static559.aAudioChannel3 != null) { - Static559.aAudioChannel3.method3586(); + Static559.aAudioChannel3.close(); } } diff --git a/client/src/main/java/Static218.java b/client/src/main/java/Static218.java index eb05ac7..913b3d6 100644 --- a/client/src/main/java/Static218.java +++ b/client/src/main/java/Static218.java @@ -15,7 +15,7 @@ public static void method3188(@OriginalArg(0) String arg0, @OriginalArg(1) Strin if (arg1.length() > 320 || !Static470.method6387()) { return; } - Connection.lobbyConnection.method3274(); + Connection.lobbyConnection.close(); Static367.method5268(); Static59.aString63 = arg0; Static449.aString75 = arg1; @@ -27,10 +27,10 @@ public static void method3189() { @Pc(7) FileOnDisk local7 = null; try { @Pc(13) PrivilegedRequest local13 = Static446.aSignlink6.method8981("2"); - while (local13.anInt6789 == 0) { - Static638.method8395(1L); + while (local13.state == 0) { + Static638.sleep(1L); } - if (local13.anInt6789 == 1) { + if (local13.state == 1) { local7 = (FileOnDisk) local13.anObject13; @Pc(41) byte[] local41 = new byte[(int) local7.method2161()]; @Pc(57) int local57; @@ -46,7 +46,7 @@ public static void method3189() { } try { if (local7 != null) { - local7.method2158(); + local7.close(); } } catch (@Pc(100) Exception local100) { } diff --git a/client/src/main/java/Static231.java b/client/src/main/java/Static231.java index 70a9565..f434dfa 100644 --- a/client/src/main/java/Static231.java +++ b/client/src/main/java/Static231.java @@ -75,7 +75,7 @@ public static void method3375() { } Static59.aClass73_5 = null; Static460.aClass73_10 = null; - Static163.aClass19_17.method7940(); + Static163.aClass19_17.cleanup(); Static163.aClass19_17 = null; } @@ -241,7 +241,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool return; } if (arg2.equalsIgnoreCase("unloadnatives")) { - Static79.method1579(Static501.method6714() ? "Libraries unloaded" : "Library unloading failed!"); + Static79.method1579(Static501.unloadLibraries() ? "Libraries unloaded" : "Library unloading failed!"); return; } if (arg2.equalsIgnoreCase("clientdrop")) { @@ -260,7 +260,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool return; } if (arg2.equalsIgnoreCase("clientjs5drop")) { - client.js5NetQueue.method6621(); + client.js5NetQueue.shutDown(); Static79.method1579("Dropped client js5 net queue"); return; } @@ -290,7 +290,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool return; } if (arg2.equalsIgnoreCase("rebuildprofile")) { - Static690.aLong318 = Static588.method7715(); + Static690.aLong318 = Static588.currentTimeWithDrift(); Static28.aBoolean43 = true; Static449.method6116(); Static244.method3512(); @@ -728,7 +728,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool if (arg2.startsWith("setoutput ")) { local2592 = new File(arg2.substring(10)); if (local2592.exists()) { - local2592 = new File(arg2.substring(10) + "." + Static588.method7715() + ".log"); + local2592 = new File(arg2.substring(10) + "." + Static588.currentTimeWithDrift() + ".log"); if (local2592.exists()) { Static79.method1579("file already exists!"); return; diff --git a/client/src/main/java/Static232.java b/client/src/main/java/Static232.java index 415876c..4ee513b 100644 --- a/client/src/main/java/Static232.java +++ b/client/src/main/java/Static232.java @@ -123,10 +123,10 @@ public static boolean method3400() { return false; } for (@Pc(23) int local23 = 0; local23 < local10.anInt10364; local23++) { - if (local10.aPrivilegedRequestArray1[local23] != null && local10.aPrivilegedRequestArray1[local23].anInt6789 == 0) { + if (local10.aPrivilegedRequestArray1[local23] != null && local10.aPrivilegedRequestArray1[local23].state == 0) { return false; } - if (local10.aPrivilegedRequestArray2[local23] != null && local10.aPrivilegedRequestArray2[local23].anInt6789 == 0) { + if (local10.aPrivilegedRequestArray2[local23] != null && local10.aPrivilegedRequestArray2[local23].state == 0) { return false; } } diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java index a934ccf..06de221 100644 --- a/client/src/main/java/Static233.java +++ b/client/src/main/java/Static233.java @@ -33,7 +33,7 @@ public static void method3409(@OriginalArg(1) boolean arg0) { @Pc(12) Connection[] local12 = Connection.connections; for (@Pc(14) int local14 = 0; local14 < local12.length; local14++) { @Pc(19) Connection local19 = local12[local14]; - local19.method3274(); + local19.close(); } Static707.method9227(); Static352.resetCache(); diff --git a/client/src/main/java/Static240.java b/client/src/main/java/Static240.java index 21ac199..94bceb0 100644 --- a/client/src/main/java/Static240.java +++ b/client/src/main/java/Static240.java @@ -37,10 +37,10 @@ public static void method3496(@OriginalArg(0) Throwable arg0, @OriginalArg(1) St 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)); - while (local131.anInt6789 == 0) { - Static638.method8395(1L); + while (local131.state == 0) { + Static638.sleep(1L); } - if (local131.anInt6789 == 1) { + if (local131.state == 1) { @Pc(148) DataInputStream local148 = (DataInputStream) local131.anObject13; local148.read(); local148.close(); diff --git a/client/src/main/java/Static245.java b/client/src/main/java/Static245.java index 7cac6f4..73a2037 100644 --- a/client/src/main/java/Static245.java +++ b/client/src/main/java/Static245.java @@ -78,7 +78,7 @@ public static void method8630() { Static226.aClass46Array7[0].notify(); } try { - Static638.method8395(1L); + Static638.sleep(1L); } catch (@Pc(148) Exception local148) { } } @@ -86,13 +86,13 @@ public static void method8630() { return; } try { - Static638.method8395(1L); + Static638.sleep(1L); } catch (@Pc(103) Exception local103) { } } } try { - Static638.method8395(1L); + Static638.sleep(1L); } catch (@Pc(49) Exception local49) { } } diff --git a/client/src/main/java/Static250.java b/client/src/main/java/Static250.java deleted file mode 100644 index 931af30..0000000 --- a/client/src/main/java/Static250.java +++ /dev/null @@ -1,7 +0,0 @@ -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static250 { - - @OriginalMember(owner = "client!hn", name = "b", descriptor = "Z") - public static boolean aBoolean311 = false; -} diff --git a/client/src/main/java/Static254.java b/client/src/main/java/Static254.java index 9b87bcd..6e553bf 100644 --- a/client/src/main/java/Static254.java +++ b/client/src/main/java/Static254.java @@ -18,7 +18,7 @@ public static void method3605() { Static618.anInt9449 = 0; Static674.anInt10128 = 0; Static373.anInt5903 = 0; - Connection.lobbyConnection.method3274(); + Connection.lobbyConnection.close(); Static50.aBoolean565 = true; Static91.aBoolean750 = true; Static230.method3374(); diff --git a/client/src/main/java/Static266.java b/client/src/main/java/Static266.java index 7d4c999..b52b1a9 100644 --- a/client/src/main/java/Static266.java +++ b/client/src/main/java/Static266.java @@ -143,11 +143,11 @@ public static void method6777() { } try { if (local5 != null) { - local5.method2158(); + local5.close(); } } catch (@Pc(74) Exception local74) { } - Static98.aLong71 = Static588.method7715(); + Static98.aLong71 = Static588.currentTimeWithDrift(); Static624.aBoolean727 = false; } } diff --git a/client/src/main/java/Static278.java b/client/src/main/java/Static278.java index de31a01..58efe57 100644 --- a/client/src/main/java/Static278.java +++ b/client/src/main/java/Static278.java @@ -3,9 +3,6 @@ public final class Static278 { - @OriginalMember(owner = "client!in", name = "I", descriptor = "J") - public static long aLong144; - @OriginalMember(owner = "client!in", name = "M", descriptor = "[I") public static int[] anIntArray350 = new int[32]; diff --git a/client/src/main/java/Static303.java b/client/src/main/java/Static303.java index 2261298..0d2c236 100644 --- a/client/src/main/java/Static303.java +++ b/client/src/main/java/Static303.java @@ -16,7 +16,7 @@ public static void method4428(@OriginalArg(0) int arg0) { Static319.aString51 = ""; } Static129.anInt2409 = arg0; - Connection.lobbyConnection.method3274(); + Connection.lobbyConnection.close(); Static81.method1586(5); } diff --git a/client/src/main/java/Static307.java b/client/src/main/java/Static307.java index d1e59ac..d43738f 100644 --- a/client/src/main/java/Static307.java +++ b/client/src/main/java/Static307.java @@ -5,7 +5,7 @@ public final class Static307 { @OriginalMember(owner = "client!jo", name = "b", descriptor = "Z") - private static boolean aBoolean380 = false; + private static boolean isShuttingDown = false; @OriginalMember(owner = "client!jo", name = "c", descriptor = "Lclient!sia;") private static final LinkedList aLinkedList28 = new LinkedList(); @@ -15,7 +15,7 @@ public final class Static307 { @OriginalMember(owner = "client!jo", name = "a", descriptor = "(ILclient!e;)V") public static synchronized void method4477(@OriginalArg(1) Interface5 arg0) { - if (aBoolean380) { + if (isShuttingDown) { return; } if (anInt4924 <= 0) { @@ -45,8 +45,8 @@ public static synchronized void method4479() { } @OriginalMember(owner = "client!jo", name = "a", descriptor = "(ZI)V") - public static synchronized void method4480() { - aBoolean380 = true; + public static synchronized void shutDown() { + isShuttingDown = true; } @OriginalMember(owner = "client!jo", name = "a", descriptor = "(I)V") diff --git a/client/src/main/java/Static314.java b/client/src/main/java/Static314.java index 0e30965..d8594ed 100644 --- a/client/src/main/java/Static314.java +++ b/client/src/main/java/Static314.java @@ -39,11 +39,12 @@ public static void method4565(@OriginalArg(1) float arg0, @OriginalArg(2) float } @OriginalMember(owner = "client!jw", name = "a", descriptor = "(Z)V") - public static void method4567() { + public static void closeAFileOutputStream2() { if (Static134.aFileOutputStream2 != null) { try { Static134.aFileOutputStream2.close(); - } catch (@Pc(10) IOException local10) { + } catch (@Pc(10) IOException e) { + e.printStackTrace(); } } Static134.aFileOutputStream2 = null; diff --git a/client/src/main/java/Static315.java b/client/src/main/java/Static315.java index 9376ae7..2c38ac5 100644 --- a/client/src/main/java/Static315.java +++ b/client/src/main/java/Static315.java @@ -104,12 +104,4 @@ public static void method4577(@OriginalArg(0) int arg0, @OriginalArg(2) SeqType Static161.method2586(local63, 0, local46, local81, 255); } } - - @OriginalMember(owner = "client!k", name = "a", descriptor = "(JB)V") - public static void method4578(@OriginalArg(0) long arg0) { - try { - Thread.sleep(arg0); - } catch (@Pc(12) InterruptedException local12) { - } - } } diff --git a/client/src/main/java/Static358.java b/client/src/main/java/Static358.java index 2572a28..edb108a 100644 --- a/client/src/main/java/Static358.java +++ b/client/src/main/java/Static358.java @@ -133,7 +133,7 @@ public static void method9190() { } try { @Pc(23) String local23 = Static166.anApplet1.getParameter("cookiehost"); - @Pc(31) int local31 = (int) (Static588.method7715() / 86400000L) - 11745; + @Pc(31) int local31 = (int) (Static588.currentTimeWithDrift() / 86400000L) - 11745; @Pc(47) String local47 = "usrdob=" + local31 + "; version=1; path=/; domain=" + local23; BrowserControl.eval("document.cookie=\"" + local47 + "\"", Static166.anApplet1); } catch (@Pc(63) Throwable local63) { diff --git a/client/src/main/java/Static36.java b/client/src/main/java/Static36.java index 11ac487..30f8cdb 100644 --- a/client/src/main/java/Static36.java +++ b/client/src/main/java/Static36.java @@ -52,22 +52,22 @@ public static PrivilegedRequest method980(@OriginalArg(1) Signlink arg0, @Origin throw new RuntimeException(); } @Pc(47) PrivilegedRequest local47 = new PrivilegedRequest(); - local47.anInt6789 = 1; + local47.state = 1; return local47; } catch (@Pc(53) Throwable local53) { local57 = new PrivilegedRequest(); - local57.anInt6789 = 2; + local57.state = 2; return local57; } } else if (arg3 == 2) { try { Static166.anApplet1.getAppletContext().showDocument(new URL(Static166.anApplet1.getCodeBase(), arg1), "_blank"); local57 = new PrivilegedRequest(); - local57.anInt6789 = 1; + local57.state = 1; return local57; } catch (@Pc(94) Exception local94) { local57 = new PrivilegedRequest(); - local57.anInt6789 = 2; + local57.state = 2; return local57; } } else if (arg3 == 3) { @@ -78,11 +78,11 @@ public static PrivilegedRequest method980(@OriginalArg(1) Signlink arg0, @Origin try { Static166.anApplet1.getAppletContext().showDocument(new URL(Static166.anApplet1.getCodeBase(), arg1), "_top"); local57 = new PrivilegedRequest(); - local57.anInt6789 = 1; + local57.state = 1; return local57; } catch (@Pc(137) Exception local137) { local57 = new PrivilegedRequest(); - local57.anInt6789 = 2; + local57.state = 2; return local57; } } else { diff --git a/client/src/main/java/Static363.java b/client/src/main/java/Static363.java index c484c32..a7aec54 100644 --- a/client/src/main/java/Static363.java +++ b/client/src/main/java/Static363.java @@ -39,7 +39,7 @@ public static void method6234(@OriginalArg(1) String[] arg0) { Static79.method1579("Pausing for " + local61 + " seconds..."); Static144.aStringArray7 = arg0; Static523.anInt3885 = local41 + 1; - Static305.aLong157 = (long) (local61 * 1000) + Static588.method7715(); + Static305.aLong157 = (long) (local61 * 1000) + Static588.currentTimeWithDrift(); return; } Static110.aString19 = arg0[local41]; @@ -62,7 +62,7 @@ public static int method6235(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) @Pc(43) Dimension local43 = Static434.aCanvas7.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.method7715(); + @Pc(70) long local70 = Static588.currentTimeWithDrift(); Static163.aClass19_17.la(); Static460.aClass73_10.method7125(0, Static247.anInt3993, 0); Static163.aClass19_17.method8000(Static460.aClass73_10); @@ -79,14 +79,14 @@ public static int method6235(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) Static59.aClass73_5.method7125((int) ((float) Static340.anInt5586 * (-((float) local123 / 2.0F) + (float) local126)), 0, (local123 + 1) * Static340.anInt5586); local111.method7473(Static59.aClass73_5, (ParticleNode_Sub6) null, 0); local113++; - if ((long) arg0 <= Static588.method7715() - local70) { + if ((long) arg0 <= Static588.currentTimeWithDrift() - local70) { break label41; } } } } Static163.aClass19_17.method7950(); - @Pc(195) long local195 = (long) (local113 * 1000) / (Static588.method7715() - local70); + @Pc(195) long local195 = (long) (local113 * 1000) / (Static588.currentTimeWithDrift() - local70); Static163.aClass19_17.GA(0); Static163.aClass19_17.ya(); return (int) local195; @@ -99,7 +99,7 @@ public static int method6235(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) @OriginalMember(owner = "client!li", name = "a", descriptor = "(IIIIIZ)V") public static void method6236(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) boolean arg4) { if (Static316.aFrame8 != null && (arg2 != 3 || arg3 != Static328.anInt5427 || Static110.anInt2189 != arg1)) { - Static655.method8562(Static446.aSignlink6, Static316.aFrame8); + Static655.closeFrame(Static446.aSignlink6, Static316.aFrame8); Static316.aFrame8 = null; } if (arg2 == 3 && Static316.aFrame8 == null) { diff --git a/client/src/main/java/Static364.java b/client/src/main/java/Static364.java index f2330d4..e8bb0b4 100644 --- a/client/src/main/java/Static364.java +++ b/client/src/main/java/Static364.java @@ -73,7 +73,7 @@ public static void method5253() { local25 = 6000; } if (local25 < Static330.anInt5434) { - Static524.aConnection3.method3274(); + Static524.aConnection3.close(); if (Static76.anInt1601 >= 3) { Static135.anInt8223 = 0; Static342.method4464(-5); @@ -100,10 +100,10 @@ public static void method5253() { @Pc(203) int local203; @Pc(250) int local250; if (Static135.anInt8223 == 2) { - if (Static524.aConnection3.aPrivilegedRequest1.anInt6789 == 2) { + if (Static524.aConnection3.aPrivilegedRequest1.state == 2) { throw new IOException(); } - if (Static524.aConnection3.aPrivilegedRequest1.anInt6789 != 1) { + if (Static524.aConnection3.aPrivilegedRequest1.state != 1) { return; } Static524.aConnection3.aClass348_1 = Static99.method1975((Socket) Static524.aConnection3.aPrivilegedRequest1.anObject13); @@ -149,7 +149,7 @@ public static void method5253() { if (local360 != 0) { Static135.anInt8223 = 0; Static342.method4464(local360); - Static524.aConnection3.method3274(); + Static524.aConnection3.close(); Static564.method7465(); return; } @@ -178,7 +178,7 @@ public static void method5253() { @Pc(465) String local465 = Static524.aConnection3.inboundPacket.gjstr2(); Static524.aConnection3.inboundPacket.pos = 0; @Pc(473) String local473 = "opensn"; - if (!Static98.aBoolean191 || Static36.method980(Static446.aSignlink6, local465, local473, 1).anInt6789 == 2) { + if (!Static98.aBoolean191 || Static36.method980(Static446.aSignlink6, local465, local473, 1).state == 2) { Static259.method3693(local465, local473, Static446.aSignlink6, Static400.aClass2_Sub34_28.aPreference_Sub29_1.method7915() == 1, true); } Static135.anInt8223 = 6; @@ -319,7 +319,7 @@ public static void method5253() { Static330.anInt5434 = 0; Static135.anInt8223 = 1; Static76.anInt1601++; - Static524.aConnection3.aClass348_1.method7926(); + Static524.aConnection3.aClass348_1.cleanup(); Static524.aConnection3.aClass348_1 = null; return; } else if (local360 == 42) { @@ -329,7 +329,7 @@ public static void method5253() { } else if (!Static561.aBoolean640 || Static311.aBoolean384 || Static129.anInt2409 == -1 || local360 != 35) { Static135.anInt8223 = 0; Static342.method4464(local360); - Static524.aConnection3.aClass348_1.method7926(); + Static524.aConnection3.aClass348_1.cleanup(); Static524.aConnection3.aClass348_1 = null; Static564.method7465(); return; @@ -337,7 +337,7 @@ public static void method5253() { Static311.aBoolean384 = true; Static135.anInt8223 = 1; Static330.anInt5434 = 0; - Static524.aConnection3.aClass348_1.method7926(); + Static524.aConnection3.aClass348_1.cleanup(); Static524.aConnection3.aClass348_1 = null; return; } @@ -358,7 +358,7 @@ public static void method5253() { Static135.anInt8223 = 0; Static118.anInt2292 = local360 * 50; Static342.method4464(21); - Static524.aConnection3.aClass348_1.method7926(); + Static524.aConnection3.aClass348_1.cleanup(); Static524.aConnection3.aClass348_1 = null; Static564.method7465(); } @@ -387,7 +387,7 @@ public static void method5253() { } Static135.anInt8223 = 0; Static342.method4464(Static79.anInt1634); - Static524.aConnection3.aClass348_1.method7926(); + Static524.aConnection3.aClass348_1.cleanup(); Static524.aConnection3.aClass348_1 = null; Static564.method7465(); } else if (Static135.anInt8223 != 13) { @@ -423,7 +423,7 @@ public static void method5253() { Static34.aBoolean62 = local1435.g1() == 1; Static298.aBoolean369 = local1435.g1() == 1; Static416.aLong207 = local1435.g8(); - Static94.aLong70 = Static416.aLong207 - Static588.method7715() - local1435.g5(); + Static94.aLong70 = Static416.aLong207 - Static588.currentTimeWithDrift() - local1435.g5(); local203 = local1435.g1(); Static126.aBoolean200 = (local203 & 0x1) != 0; Static425.aBoolean482 = (local203 & 0x2) != 0; @@ -561,7 +561,7 @@ public static void method5253() { Static135.anInt8223 = 14; } } catch (@Pc(2184) IOException local2184) { - Static524.aConnection3.method3274(); + Static524.aConnection3.close(); if (Static76.anInt1601 < 3) { if (Static299.anInt4825 == 2) { Static344.aClass229_1.method5260(); diff --git a/client/src/main/java/Static419.java b/client/src/main/java/Static419.java index 560185b..b4b77d1 100644 --- a/client/src/main/java/Static419.java +++ b/client/src/main/java/Static419.java @@ -36,7 +36,8 @@ public static void method5757() { try { Static242.aThread1.join(); return; - } catch (@Pc(26) InterruptedException local26) { + } catch (@Pc(26) InterruptedException e) { + e.printStackTrace(); } } } diff --git a/client/src/main/java/Static437.java b/client/src/main/java/Static437.java index 59910a2..3759f3d 100644 --- a/client/src/main/java/Static437.java +++ b/client/src/main/java/Static437.java @@ -31,18 +31,18 @@ public static void method5915(@OriginalArg(1) PacketBit arg0) { @Pc(16) boolean local16 = false; for (@Pc(18) int local18 = 0; local18 < local10.anInt10364; local18++) { if (local10.aPrivilegedRequestArray1[local18] != null) { - if (local10.aPrivilegedRequestArray1[local18].anInt6789 == 2) { + if (local10.aPrivilegedRequestArray1[local18].state == 2) { local10.anIntArray829[local18] = -5; } - if (local10.aPrivilegedRequestArray1[local18].anInt6789 == 0) { + if (local10.aPrivilegedRequestArray1[local18].state == 0) { local16 = true; } } if (local10.aPrivilegedRequestArray2[local18] != null) { - if (local10.aPrivilegedRequestArray2[local18].anInt6789 == 2) { + if (local10.aPrivilegedRequestArray2[local18].state == 2) { local10.anIntArray829[local18] = -6; } - if (local10.aPrivilegedRequestArray2[local18].anInt6789 == 0) { + if (local10.aPrivilegedRequestArray2[local18].state == 0) { local16 = true; } } diff --git a/client/src/main/java/Static472.java b/client/src/main/java/Static472.java index 8478dd1..93ac811 100644 --- a/client/src/main/java/Static472.java +++ b/client/src/main/java/Static472.java @@ -5422,11 +5422,11 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } } else if (arg0 < 6400) { if (arg0 == 6300) { - anIntArray578[anInt7142++] = (int) (Static588.method7715() / 60000L); + anIntArray578[anInt7142++] = (int) (Static588.currentTimeWithDrift() / 60000L); return; } if (arg0 == 6301) { - anIntArray578[anInt7142++] = (int) (Static588.method7715() / 86400000L) - 11745; + anIntArray578[anInt7142++] = (int) (Static588.currentTimeWithDrift() / 86400000L) - 11745; return; } if (arg0 == 6302) { @@ -5443,7 +5443,7 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean return; } if (arg0 == 6303) { - anIntArray578[anInt7142++] = Static614.method8242(Static588.method7715()); + anIntArray578[anInt7142++] = Static614.method8242(Static588.currentTimeWithDrift()); return; } if (arg0 == 6304) { @@ -5491,7 +5491,7 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean anIntArray578[anInt7142++] = 0; return; } - if (Static363.aLong219 > Static588.method7715() - 1000L) { + if (Static363.aLong219 > Static588.currentTimeWithDrift() - 1000L) { anIntArray578[anInt7142++] = 1; return; } @@ -5831,7 +5831,7 @@ private static void method6421(@OriginalArg(0) int arg0, @OriginalArg(1) boolean } if (arg0 == 6901) { anIntArray578[anInt7142++] = (int) (Static416.aLong207 / 60000L); - anIntArray578[anInt7142++] = (int) ((Static416.aLong207 - Static588.method7715() - Static94.aLong70) / 60000L); + anIntArray578[anInt7142++] = (int) ((Static416.aLong207 - Static588.currentTimeWithDrift() - Static94.aLong70) / 60000L); anIntArray578[anInt7142++] = Static425.aBoolean482 ? 1 : 0; return; } diff --git a/client/src/main/java/Static489.java b/client/src/main/java/Static489.java index deef1eb..84dc6fb 100644 --- a/client/src/main/java/Static489.java +++ b/client/src/main/java/Static489.java @@ -31,14 +31,14 @@ public static Frame method6543(@OriginalArg(0) int arg0, @OriginalArg(1) Signlin return null; } @Pc(101) PrivilegedRequest local101 = arg1.method8977(arg0, arg2, arg3); - while (local101.anInt6789 == 0) { - Static638.method8395(10L); + while (local101.state == 0) { + Static638.sleep(10L); } @Pc(112) Frame local112 = (Frame) local101.anObject13; if (local112 == null) { return null; - } else if (local101.anInt6789 == 2) { - Static655.method8562(arg1, local112); + } else if (local101.state == 2) { + Static655.closeFrame(arg1, local112); return null; } else { return local112; @@ -351,7 +351,7 @@ public static void method6548() { Static199.method2977(); Static75.aBoolean521 = true; if (Static28.aBoolean43) { - Static79.method1579("Took: " + (Static588.method7715() - Static690.aLong318) + "ms"); + Static79.method1579("Took: " + (Static588.currentTimeWithDrift() - Static690.aLong318) + "ms"); Static28.aBoolean43 = false; } } diff --git a/client/src/main/java/Static501.java b/client/src/main/java/Static501.java index 1c275be..2a632ab 100644 --- a/client/src/main/java/Static501.java +++ b/client/src/main/java/Static501.java @@ -26,7 +26,7 @@ public final class Static501 { public static final Linkable_Sub7[] aClass2_Sub7Array4 = new Linkable_Sub7[8]; @OriginalMember(owner = "client!pq", name = "d", descriptor = "(I)Z") - public static boolean method6714() { + public static boolean unloadLibraries() { @Pc(7) Hashtable local7 = new Hashtable(); @Pc(10) Enumeration local10 = Static137.aHashtable2.keys(); while (local10.hasMoreElements()) { diff --git a/client/src/main/java/Static506.java b/client/src/main/java/Static506.java index 0810841..0d313ce 100644 --- a/client/src/main/java/Static506.java +++ b/client/src/main/java/Static506.java @@ -30,7 +30,7 @@ public static void method8313() { if (Static173.anInt2913 < 0) { return; } - @Pc(18) long local18 = Static588.method7715(); + @Pc(18) long local18 = Static588.currentTimeWithDrift(); Static173.anInt2913 = (int) ((long) Static173.anInt2913 + Static344.aLong169 - local18); if (Static173.anInt2913 > 0) { @Pc(35) int local35 = (Static173.anInt2913 << 8) / Static587.anInt8673; diff --git a/client/src/main/java/Static56.java b/client/src/main/java/Static56.java index 86bb0cd..486bf82 100644 --- a/client/src/main/java/Static56.java +++ b/client/src/main/java/Static56.java @@ -11,7 +11,7 @@ public final class Static56 { @OriginalMember(owner = "client!bs", name = "b", descriptor = "(I)V") public static void method1220() { if (Static135.anInt8223 != 0) { - Static524.aConnection3.method3274(); + Static524.aConnection3.close(); Static707.method9227(); Static564.method7465(); } diff --git a/client/src/main/java/Static588.java b/client/src/main/java/Static588.java index 5ec3bd4..937380a 100644 --- a/client/src/main/java/Static588.java +++ b/client/src/main/java/Static588.java @@ -15,6 +15,12 @@ public static boolean method7712(@OriginalArg(0) boolean arg0, @OriginalArg(1) b return arg0 | arg1; } + @OriginalMember(owner = "client!in", name = "I", descriptor = "J") + public static long nowWithDrift; + + @OriginalMember(owner = "client!vea", name = "G", descriptor = "J") + public static long drift; + @OriginalMember(owner = "client!sj", name = "a", descriptor = "(I)V") public static void method7713() { Static425.aClass19_13.xa(((float) Static400.aClass2_Sub34_28.aPreference_Sub22_1.method6769() * 0.1F + 0.7F) * Static318.aFloat210); @@ -52,12 +58,12 @@ public static boolean method7714(@OriginalArg(1) int arg0, @OriginalArg(2) int a } @OriginalMember(owner = "client!sj", name = "a", descriptor = "(Z)J") - public static synchronized long method7715() { - @Pc(5) long local5 = System.currentTimeMillis(); - if (Static278.aLong144 > local5) { - Static672.aLong305 += Static278.aLong144 - local5; + public static synchronized long currentTimeWithDrift() { + @Pc(5) long now = System.currentTimeMillis(); + if (nowWithDrift > now) { + drift += nowWithDrift - now; } - Static278.aLong144 = local5; - return local5 + Static672.aLong305; + nowWithDrift = now; + return now + drift; } } diff --git a/client/src/main/java/Static595.java b/client/src/main/java/Static595.java index 203804e..7e03634 100644 --- a/client/src/main/java/Static595.java +++ b/client/src/main/java/Static595.java @@ -74,7 +74,7 @@ public static void method7807(@OriginalArg(1) String arg0, @OriginalArg(2) boole local85 = null; if (local57 != null) { try { - local57.method7940(); + local57.cleanup(); } catch (@Pc(359) Throwable local359) { } } @@ -82,7 +82,7 @@ public static void method7807(@OriginalArg(1) String arg0, @OriginalArg(2) boole } if (local57 != null) { try { - local57.method7940(); + local57.cleanup(); } catch (@Pc(339) Throwable local339) { } } @@ -91,7 +91,7 @@ public static void method7807(@OriginalArg(1) String arg0, @OriginalArg(2) boole local85 = null; if (local57 != null) { try { - local57.method7940(); + local57.cleanup(); } catch (@Pc(349) Throwable local349) { } } diff --git a/client/src/main/java/Static604.java b/client/src/main/java/Static604.java index d261fb2..a3a4711 100644 --- a/client/src/main/java/Static604.java +++ b/client/src/main/java/Static604.java @@ -7,9 +7,6 @@ public final class Static604 { @OriginalMember(owner = "client!tb", name = "b", descriptor = "[I") public static final int[] anIntArray708 = new int[16]; - @OriginalMember(owner = "client!tb", name = "c", descriptor = "J") - public static long aLong278 = 0L; - @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; diff --git a/client/src/main/java/Static61.java b/client/src/main/java/Static61.java index 9495d41..0293123 100644 --- a/client/src/main/java/Static61.java +++ b/client/src/main/java/Static61.java @@ -47,7 +47,7 @@ public static void method1312(@OriginalArg(0) Signlink arg0, @OriginalArg(1) Obj return; } for (@Pc(19) int local19 = 0; local19 < 50 && arg0.anEventQueue1.peekEvent() != null; local19++) { - Static638.method8395(1L); + Static638.sleep(1L); } try { if (arg1 != null) { diff --git a/client/src/main/java/Static638.java b/client/src/main/java/Static638.java index 4d9a99f..8ca3be4 100644 --- a/client/src/main/java/Static638.java +++ b/client/src/main/java/Static638.java @@ -73,15 +73,23 @@ public static AudioChannel method8394(@OriginalArg(0) Signlink arg0, @OriginalAr } @OriginalMember(owner = "client!uca", name = "a", descriptor = "(JZ)V") - public static void method8395(@OriginalArg(0) long arg0) { - if (arg0 <= 0L) { + public static void sleep(@OriginalArg(0) long ms) { + if (ms <= 0L) { return; } - if (arg0 % 10L == 0L) { - Static315.method4578(arg0 - 1L); - Static315.method4578(1L); + if (ms % 10L == 0L) { + doSleep(ms - 1L); + doSleep(1L); } else { - Static315.method4578(arg0); + doSleep(ms); + } + } + + @OriginalMember(owner = "client!k", name = "a", descriptor = "(JB)V") + public static void doSleep(@OriginalArg(0) long ms) { + try { + Thread.sleep(ms); + } catch (@Pc(12) InterruptedException local12) { } } diff --git a/client/src/main/java/Static65.java b/client/src/main/java/Static65.java index c8c6de3..1a4bc43 100644 --- a/client/src/main/java/Static65.java +++ b/client/src/main/java/Static65.java @@ -27,14 +27,14 @@ public static int method1470() { local7 = true; local5 = Static255.method3612((Js5) null, (Interface4) null, 0, local19, 0); } - @Pc(36) long local36 = Static588.method7715(); + @Pc(36) long local36 = Static588.currentTimeWithDrift(); for (@Pc(38) int local38 = 0; local38 < 10000; local38++) { local5.method7994(); } - @Pc(71) int local71 = (int) (Static588.method7715() - local36); + @Pc(71) int local71 = (int) (Static588.currentTimeWithDrift() - local36); local5.method7971(100, 100, 0, 0, -16777216); if (local7) { - local5.method7940(); + local5.cleanup(); } return local71; } diff --git a/client/src/main/java/Static655.java b/client/src/main/java/Static655.java index 1baed0c..7b9600b 100644 --- a/client/src/main/java/Static655.java +++ b/client/src/main/java/Static655.java @@ -18,18 +18,18 @@ public final class Static655 { public static int anInt9767 = 0; @OriginalMember(owner = "client!un", name = "a", descriptor = "(Lclient!vq;ILjava/awt/Frame;)V") - public static void method8562(@OriginalArg(0) Signlink arg0, @OriginalArg(2) Frame arg1) { + public static void closeFrame(@OriginalArg(0) Signlink signlink, @OriginalArg(2) Frame frame) { while (true) { - @Pc(10) PrivilegedRequest local10 = arg0.method8989(arg1); - while (local10.anInt6789 == 0) { - Static638.method8395(10L); + @Pc(10) PrivilegedRequest request = signlink.method8989(frame); + while (request.state == 0) { + Static638.sleep(10L); } - if (local10.anInt6789 == 1) { - arg1.setVisible(false); - arg1.dispose(); + if (request.state == 1) { + frame.setVisible(false); + frame.dispose(); return; } - Static638.method8395(100L); + Static638.sleep(100L); } } } diff --git a/client/src/main/java/Static666.java b/client/src/main/java/Static666.java index e4e1faa..0c18f2e 100644 --- a/client/src/main/java/Static666.java +++ b/client/src/main/java/Static666.java @@ -18,10 +18,10 @@ public static void method8693(@OriginalArg(0) int arg0) { @Pc(5) FileOnDisk local5 = null; try { @Pc(18) PrivilegedRequest local18 = Static446.aSignlink6.method8981(""); - while (local18.anInt6789 == 0) { - Static638.method8395(1L); + while (local18.state == 0) { + Static638.sleep(1L); } - if (local18.anInt6789 == 1) { + if (local18.state == 1) { local5 = (FileOnDisk) local18.anObject13; @Pc(41) Packet local41 = Static400.aClass2_Sub34_28.method5110(); local5.method2162(local41.data, 0, local41.pos); @@ -30,7 +30,7 @@ public static void method8693(@OriginalArg(0) int arg0) { } try { if (local5 != null) { - local5.method2158(); + local5.close(); } } catch (@Pc(58) Exception local58) { } diff --git a/client/src/main/java/Static668.java b/client/src/main/java/Static668.java index 1742775..33fe391 100644 --- a/client/src/main/java/Static668.java +++ b/client/src/main/java/Static668.java @@ -63,7 +63,7 @@ public static void method8703() { Static566.anInt8472 += 6; } @Pc(26) int local26; - if (Static523.anInt3885 != -1 && Static305.aLong157 < Static588.method7715()) { + if (Static523.anInt3885 != -1 && Static305.aLong157 < Static588.currentTimeWithDrift()) { for (local26 = Static523.anInt3885; local26 < Static144.aStringArray7.length; local26++) { if (Static144.aStringArray7[local26].startsWith("pause")) { @Pc(40) int local40 = 5; @@ -73,7 +73,7 @@ public static void method8703() { } Static79.method1579("Pausing for " + local40 + " seconds..."); Static523.anInt3885 = local26 + 1; - Static305.aLong157 = (long) (local40 * 1000) + Static588.method7715(); + Static305.aLong157 = (long) (local40 * 1000) + Static588.currentTimeWithDrift(); return; } Static110.aString19 = Static144.aStringArray7[local26]; diff --git a/client/src/main/java/Static672.java b/client/src/main/java/Static672.java index a31ccc1..8bef625 100644 --- a/client/src/main/java/Static672.java +++ b/client/src/main/java/Static672.java @@ -7,9 +7,6 @@ public final class Static672 { @OriginalMember(owner = "client!vea", name = "J", descriptor = "Lclient!nk;") public static ClientStream aClientStream2; - @OriginalMember(owner = "client!vea", name = "G", descriptor = "J") - public static long aLong305; - @OriginalMember(owner = "client!vea", name = "I", descriptor = "Lclient!it;") public static final Class184 aClass184_18 = new Class184(2, 4, 4, 0); diff --git a/client/src/main/java/Static673.java b/client/src/main/java/Static673.java index 2acf249..be45963 100644 --- a/client/src/main/java/Static673.java +++ b/client/src/main/java/Static673.java @@ -16,10 +16,10 @@ public static Class273[] method8787(@OriginalArg(0) Signlink arg0, @OriginalArg( return new Class273[0]; } @Pc(15) PrivilegedRequest local15 = arg0.method8984(); - while (local15.anInt6789 == 0) { - Static638.method8395(10L); + while (local15.state == 0) { + Static638.sleep(10L); } - if (local15.anInt6789 == 2) { + if (local15.state == 2) { return new Class273[0]; } @Pc(38) int[] local38 = (int[]) local15.anObject13; diff --git a/client/src/main/java/Static708.java b/client/src/main/java/Static708.java index 806d7ad..6a2aee6 100644 --- a/client/src/main/java/Static708.java +++ b/client/src/main/java/Static708.java @@ -26,7 +26,7 @@ public static void method9230(@OriginalArg(1) String arg0) { if (arg0.length() == 0) { local47 = local47 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0"; } else { - local47 = local47 + "; Expires=" + Static163.method8846(Static588.method7715() + 94608000000L) + "; Max-Age=" + 94608000L; + local47 = local47 + "; Expires=" + Static163.method8846(Static588.currentTimeWithDrift() + 94608000000L) + "; Max-Age=" + 94608000L; } BrowserControl.eval("document.cookie=\"" + local47 + "\"", Static166.anApplet1); } catch (@Pc(104) Throwable local104) { diff --git a/client/src/main/java/Static709.java b/client/src/main/java/Static709.java index 5e67c43..8cb46ae 100644 --- a/client/src/main/java/Static709.java +++ b/client/src/main/java/Static709.java @@ -27,7 +27,7 @@ public static void method9252() { if (Static655.aClass140Array1 == null) { Static655.aClass140Array1 = Static198.method2955(); Static473.aClass140_22 = Static655.aClass140Array1[0]; - Static72.aLong52 = Static588.method7715(); + Static72.aLong52 = Static588.currentTimeWithDrift(); } if (Static449.aClass364_1 == null) { Static229.method3368(); @@ -52,7 +52,7 @@ public static void method9252() { } Static376.anInt5919 = local27.anInt3270; if (Static473.aClass140_22.aBoolean264 || local27.aBoolean264) { - Static72.aLong52 = Static588.method7715(); + Static72.aLong52 = Static588.currentTimeWithDrift(); } } if (Static449.aClass364_1 == null) { @@ -110,7 +110,7 @@ public static void method9254() { Connection.gameConnection.queue(local71); } if (Static211.aClass2_Sub12_3 == null) { - if (Static675.aLong307 <= Static588.method7715()) { + if (Static675.aLong307 <= Static588.currentTimeWithDrift()) { Static211.aClass2_Sub12_3 = Static151.aClass226_20.method5245(Static344.aClass229_1.aString60); } } else if (Static211.aClass2_Sub12_3.anInt1631 != -1) { @@ -118,7 +118,7 @@ public static void method9254() { local71.buffer.p2(Static211.aClass2_Sub12_3.anInt1631); Connection.gameConnection.queue(local71); Static211.aClass2_Sub12_3 = null; - Static675.aLong307 = Static588.method7715() + 30000L; + Static675.aLong307 = Static588.currentTimeWithDrift() + 30000L; } @Pc(166) Linkable_Sub9 local166 = (Linkable_Sub9) Static226.aLinkedList58.head(); @Pc(181) int local181; @@ -128,7 +128,7 @@ public static void method9254() { @Pc(288) int local288; @Pc(300) int local300; @Pc(179) OutboundPacket local179; - if (local166 != null || Static56.aLong38 < Static588.method7715() - 2000L) { + if (local166 != null || Static56.aLong38 < Static588.currentTimeWithDrift() - 2000L) { local179 = null; local181 = 0; for (@Pc(186) Linkable_Sub9 local186 = (Linkable_Sub9) Static677.aLinkedList76.head(); local186 != null && (local179 == null || local179.buffer.pos - local181 < 240); local186 = (Linkable_Sub9) Static677.aLinkedList76.next()) { @@ -545,11 +545,11 @@ public static void method9254() { for (local541 = 0; local541 < 5; local541++) { @Pc(2246) int local2246 = Static194.anIntArray268[local541]++; } - if (Static624.aBoolean727 && Static98.aLong71 < Static588.method7715() - 60000L) { + if (Static624.aBoolean727 && Static98.aLong71 < Static588.currentTimeWithDrift() - 60000L) { Static266.method6777(); } for (@Pc(2281) SecondaryParticleNode_Sub1 local2281 = (SecondaryParticleNode_Sub1) Static168.aParticleLinkedList5.method2790(); local2281 != null; local2281 = (SecondaryParticleNode_Sub1) Static168.aParticleLinkedList5.method2785()) { - if (Static588.method7715() / 1000L - 5L > (long) local2281.anInt6433) { + if (Static588.currentTimeWithDrift() / 1000L - 5L > (long) local2281.anInt6433) { if (local2281.aShort74 > 0) { Static44.method1072(local2281.aString72 + LocalizedText.FRIEND_LOGGED_IN.get(Static51.clientLanguageId), "", 0, "", "", 5); } diff --git a/client/src/main/java/Static711.java b/client/src/main/java/Static711.java index eb5467d..10f52e8 100644 --- a/client/src/main/java/Static711.java +++ b/client/src/main/java/Static711.java @@ -16,11 +16,11 @@ public static void method9272() { if (Static236.aPrivilegedRequest2 == null) { return; } - if (Static236.aPrivilegedRequest2.anInt6789 == 1) { + if (Static236.aPrivilegedRequest2.state == 1) { Static236.aPrivilegedRequest2 = null; return; } - if (Static236.aPrivilegedRequest2.anInt6789 == 2) { + if (Static236.aPrivilegedRequest2.state == 2) { Static637.method8382(Static340.aString53, 2, Static272.aSignlink3); Static236.aPrivilegedRequest2 = null; return; diff --git a/client/src/main/java/Static720.java b/client/src/main/java/Static720.java index ac37bdb..fbb5c61 100644 --- a/client/src/main/java/Static720.java +++ b/client/src/main/java/Static720.java @@ -57,10 +57,10 @@ public static Preferences method9398() { @Pc(19) Preferences local19 = new Preferences(Static392.clientModeGame, 0); try { @Pc(25) PrivilegedRequest local25 = Static446.aSignlink6.method8981(""); - while (local25.anInt6789 == 0) { - Static638.method8395(1L); + while (local25.state == 0) { + Static638.sleep(1L); } - if (local25.anInt6789 == 1) { + if (local25.state == 1) { local13 = (FileOnDisk) local25.anObject13; @Pc(51) byte[] local51 = new byte[(int) local13.method2161()]; @Pc(66) int local66; @@ -76,7 +76,7 @@ public static Preferences method9398() { } try { if (local13 != null) { - local13.method2158(); + local13.close(); } } catch (@Pc(104) Exception local104) { } diff --git a/client/src/main/java/Static76.java b/client/src/main/java/Static76.java index b5adeeb..c4e7f07 100644 --- a/client/src/main/java/Static76.java +++ b/client/src/main/java/Static76.java @@ -35,7 +35,7 @@ public static void method1555() { } try { if (++Static654.anInt9739 > 2000) { - Connection.lobbyConnection.method3274(); + Connection.lobbyConnection.close(); if (Static720.anInt10865 >= 2) { Static6.anInt95 = 0; Static580.anInt8621 = -5; @@ -51,10 +51,10 @@ public static void method1555() { Static6.anInt95 = 2; } if (Static6.anInt95 == 2) { - if (Connection.lobbyConnection.aPrivilegedRequest1.anInt6789 == 2) { + if (Connection.lobbyConnection.aPrivilegedRequest1.state == 2) { throw new IOException(); } - if (Connection.lobbyConnection.aPrivilegedRequest1.anInt6789 != 1) { + if (Connection.lobbyConnection.aPrivilegedRequest1.state != 1) { return; } Connection.lobbyConnection.aClass348_1 = Static99.method1975((Socket) Connection.lobbyConnection.aPrivilegedRequest1.anObject13); @@ -67,10 +67,10 @@ public static void method1555() { @Pc(139) int local139 = Connection.lobbyConnection.inboundPacket.data[0] & 0xFF; Static6.anInt95 = 0; Static580.anInt8621 = local139; - Connection.lobbyConnection.method3274(); + Connection.lobbyConnection.close(); } } catch (@Pc(148) IOException local148) { - Connection.lobbyConnection.method3274(); + Connection.lobbyConnection.close(); if (Static720.anInt10865 < 2) { Static660.aClass229_4.method5260(); Static720.anInt10865++; diff --git a/client/src/main/java/Static79.java b/client/src/main/java/Static79.java index 9ba1348..b830933 100644 --- a/client/src/main/java/Static79.java +++ b/client/src/main/java/Static79.java @@ -34,7 +34,7 @@ public static void method1579(@OriginalArg(1) String arg0) { if (Static393.aStringArray32 == null) { Static279.method4072(); } - Static459.aCalendar3.setTime(new Date(Static588.method7715())); + Static459.aCalendar3.setTime(new Date(Static588.currentTimeWithDrift())); @Pc(20) int local20 = Static459.aCalendar3.get(11); @Pc(31) int local31 = Static459.aCalendar3.get(12); @Pc(35) int local35 = Static459.aCalendar3.get(13); diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java index a5519f2..f5b2973 100644 --- a/client/src/main/java/Static81.java +++ b/client/src/main/java/Static81.java @@ -19,7 +19,7 @@ public static void method1586(@OriginalArg(0) int arg0) { Static670.method8735(); } if (arg0 != 14 && Static467.aClass348_2 != null) { - Static467.aClass348_2.method7926(); + Static467.aClass348_2.cleanup(); Static467.aClass348_2 = null; } if (arg0 == 3) { @@ -96,7 +96,7 @@ public static SecondaryLinkable_Sub2 method1587() { if (local17 == null) { return null; } - if (local17.method201() > Static588.method7715()) { + if (local17.method201() > Static588.currentTimeWithDrift()) { return null; } local17.unlink(); diff --git a/client/src/main/java/Timer.java b/client/src/main/java/Timer.java index d887da0..23e15b0 100644 --- a/client/src/main/java/Timer.java +++ b/client/src/main/java/Timer.java @@ -16,7 +16,7 @@ public abstract class Timer { public final int method5598(@OriginalArg(0) long arg0) { @Pc(13) long local13 = this.method5599(); if (local13 > 0L) { - Static638.method8395(local13); + Static638.sleep(local13); } return this.method5596(arg0); } diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index f2a28c9..96537b7 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -198,7 +198,7 @@ public static int method3448() { if (Static198.aClass140_1 == Static473.aClass140_22) { @Pc(65) Runtime local65 = Runtime.getRuntime(); local74 = (int) ((local65.totalMemory() - local65.freeMemory()) / 1024L); - @Pc(77) long local77 = Static588.method7715(); + @Pc(77) long local77 = Static588.currentTimeWithDrift(); if (Static6.aLong8 == 0L) { Static6.aLong8 = local77; } @@ -514,25 +514,25 @@ public synchronized void method1641() { @OriginalMember(owner = "client!client", name = "j", descriptor = "(I)V") @Override - protected void method1633() { + protected void doShutDown() { if (Static624.aBoolean727) { Static266.method6777(); } Static419.method5757(); if (Static163.aClass19_17 != null) { - Static163.aClass19_17.method7940(); + Static163.aClass19_17.cleanup(); } if (Static316.aFrame8 != null) { - Static655.method8562(Static446.aSignlink6, Static316.aFrame8); + Static655.closeFrame(Static446.aSignlink6, Static316.aFrame8); Static316.aFrame8 = null; } - Connection.gameConnection.method3274(); - Connection.lobbyConnection.method3274(); - Static173.method2690(); - js5NetQueue.method6621(); - js5CacheQueue.method3826(); + Connection.gameConnection.close(); + Connection.lobbyConnection.close(); + Static173.closeAudioChannels(); + js5NetQueue.shutDown(); + js5CacheQueue.shutDown(); if (Static151.aClass226_20 != null) { - Static151.aClass226_20.method5243(); + Static151.aClass226_20.shutDown(); Static151.aClass226_20 = null; } try { @@ -542,8 +542,9 @@ protected void method1633() { } Static5.aBufferedFile1.method5566(); Static690.aBufferedFile5.method5566(); - Static314.method4567(); - } catch (@Pc(91) Exception local91) { + Static314.closeAFileOutputStream2(); + } catch (@Pc(91) Exception e) { + e.printStackTrace(); } } @@ -590,14 +591,14 @@ private void method1656() { Static92.anInt1874++; } if (Static92.anInt1874 == 1) { - if (Static514.aPrivilegedRequest6.anInt6789 == 2) { + if (Static514.aPrivilegedRequest6.state == 2) { if (Static514.aPrivilegedRequest6.anObject13 != null) { Static376.aString62 = (String) Static514.aPrivilegedRequest6.anObject13; } this.method1667(1000); return; } - if (Static514.aPrivilegedRequest6.anInt6789 == 1) { + if (Static514.aPrivilegedRequest6.state == 1) { Static92.anInt1874++; } } @@ -608,7 +609,7 @@ private void method1656() { local251.p4(667); Static672.aClientStream2.method5829(5, local251.data); Static92.anInt1874++; - Static678.aLong310 = Static588.method7715(); + Static678.aLong310 = Static588.currentTimeWithDrift(); } if (Static92.anInt1874 == 3) { if (Static181.method2778(Static283.gameState) || Static672.aClientStream2.method5828() > 0) { @@ -618,7 +619,7 @@ private void method1656() { return; } Static92.anInt1874++; - } else if (Static588.method7715() - Static678.aLong310 > 30000L) { + } else if (Static588.currentTimeWithDrift() - Static678.aLong310 > 30000L) { this.method1667(1001); return; } @@ -741,11 +742,11 @@ private void method1658() { Static320.method4598(); } Static587.method7704(); - if (Static624.aBoolean727 && Static588.method7715() - 60000L > Static98.aLong71) { + if (Static624.aBoolean727 && Static588.currentTimeWithDrift() - 60000L > Static98.aLong71) { Static266.method6777(); } for (@Pc(672) SecondaryParticleNode_Sub1 local672 = (SecondaryParticleNode_Sub1) Static168.aParticleLinkedList5.method2790(); local672 != null; local672 = (SecondaryParticleNode_Sub1) Static168.aParticleLinkedList5.method2785()) { - if ((long) local672.anInt6433 < Static588.method7715() / 1000L - 5L) { + if ((long) local672.anInt6433 < Static588.currentTimeWithDrift() / 1000L - 5L) { if (local672.aShort74 > 0) { Static44.method1072(local672.aString72 + LocalizedText.FRIEND_LOGGED_IN.get(Static51.clientLanguageId), "", 0, "", "", 5); } @@ -774,7 +775,7 @@ private void method1658() { Static233.method3409(false); return; } - Connection.lobbyConnection.method3274(); + Connection.lobbyConnection.close(); return; } } @@ -817,11 +818,6 @@ private void method1659() { } } - @OriginalMember(owner = "client!client", name = "e", descriptor = "(B)V") - @Override - protected void method1637() { - } - @OriginalMember(owner = "client!client", name = "f", descriptor = "(B)V") private void method1666() { if (Static283.gameState == 16) { @@ -834,7 +830,7 @@ private void method1666() { Static719.aAudioChannel5.method3592(); } if (Static475.method6445(Static283.gameState)) { - if (Static297.aLong153 != 0L && Static588.method7715() > Static297.aLong153) { + if (Static297.aLong153 != 0L && Static588.currentTimeWithDrift() > Static297.aLong153) { Static409.method5657(Static36.method978(3), Static560.anInt8429, false, Static433.anInt6258); } else if (!Static163.aClass19_17.method8001() && Static723.aBoolean827) { Static574.method7572(); @@ -865,7 +861,7 @@ private void method1666() { Static52.anInt1059 = local110; Static54.anInt1084 = local114; } - Static297.aLong153 = Static588.method7715() + 500L; + Static297.aLong153 = Static588.currentTimeWithDrift() + 500L; Static284.aBoolean355 = false; } } @@ -961,13 +957,13 @@ private void method1666() { Static507.method6744(); local110 = Static400.aClass2_Sub34_28.aPreference_Sub21_1.method6360(); if (local110 == 0) { - Static638.method8395(15L); + Static638.sleep(15L); } else if (local110 == 1) { - Static638.method8395(10L); + Static638.sleep(10L); } else if (local110 == 2) { - Static638.method8395(5L); + Static638.sleep(5L); } else if (local110 == 3) { - Static638.method8395(2L); + Static638.sleep(2L); } if (Static666.aBoolean766) { Static614.method8245(); @@ -1027,7 +1023,7 @@ private void method1668() { Static334.aKeyboard1.method8481(); Static189.aMouse1.method8841(); if (Static163.aClass19_17 != null) { - Static163.aClass19_17.method7977((int) Static588.method7715()); + Static163.aClass19_17.method7977((int) Static588.currentTimeWithDrift()); } Static711.method9272(); Static671.anInt10026 = 0; diff --git a/client/src/main/java/oa.java b/client/src/main/java/oa.java index edddc91..4e43547 100644 --- a/client/src/main/java/oa.java +++ b/client/src/main/java/oa.java @@ -70,7 +70,7 @@ public oa(@OriginalArg(0) Canvas arg0, @OriginalArg(1) Interface4 arg1, @Origina this.method8019(arg0); } } catch (@Pc(82) Throwable local82) { - this.method7940(); + this.cleanup(); throw new RuntimeException(); } } @@ -614,7 +614,7 @@ public Class67 method8008(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @O @OriginalMember(owner = "client!oa", name = "finalize", descriptor = "()V") @Override public synchronized void finalize() { - this.method7940(); + this.cleanup(); if (this.nativeid != 0L) { Static307.method4477(this); } @@ -770,7 +770,7 @@ public void method7993(@OriginalArg(0) float arg0, @OriginalArg(1) float arg1, @ @OriginalMember(owner = "client!oa", name = "u", descriptor = "()V") @Override - protected void method7987() { + protected void doCleanup() { if (this.aBoolean509) { return; } diff --git a/client/src/main/java/p.java b/client/src/main/java/p.java index 7806874..0884843 100644 --- a/client/src/main/java/p.java +++ b/client/src/main/java/p.java @@ -59,9 +59,9 @@ public void method6439(@OriginalArg(0) Canvas arg0, @OriginalArg(1) int arg1, @O @OriginalMember(owner = "client!p", name = "a", descriptor = "(Ljava/lang/Exception;)V") private void method6440(@OriginalArg(0) Exception arg0) { if (!Static474.aBoolean542) { - Static474.aLong229 = Static588.method7715(); + Static474.aLong229 = Static588.currentTimeWithDrift(); Static474.aBoolean542 = true; - } else if (Static588.method7715() - Static474.aLong229 < 30000L) { + } else if (Static588.currentTimeWithDrift() - Static474.aLong229 < 30000L) { this.aCanvas9.repaint(); } else { throw new RuntimeException(arg0.getMessage());