Merge branch 'main' of https://github.com/2011Scape/runetek5-client

2011Scape · Apr 14, 2024 · 202826b · 202826b
2 parents 8a74f3c + 986ed92
commit 202826b
Show file tree

Hide file tree

Showing 93 changed files with 405 additions and 401 deletions.
diff --git 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,18 +146,18 @@ 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;
 			}
 			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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();