project: Rev update

runescape-client/src/main/java/PcmPlayer.java

@@ -1,199 +1,211 @@
+import java.util.concurrent.ScheduledExecutorService;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dq")
+@ObfuscatedName("de")
 @Implements("PcmPlayer")
 public class PcmPlayer {
-	@ObfuscatedName("v")
-	@ObfuscatedGetter(
-		intValue = -326357542
+	@ObfuscatedName("p")
+	@Export("PcmPlayer_stereo")
+	protected static boolean PcmPlayer_stereo;
+	@ObfuscatedName("y")
+	@Export("soundSystemExecutor")
+	static ScheduledExecutorService soundSystemExecutor;
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		signature = "Ldc;"
 	)
-	@Export("PcmPlayer_sampleRate")
-	public static int PcmPlayer_sampleRate;
-	@ObfuscatedName("k")
+	@Export("soundSystem")
+	static SoundSystem soundSystem;
+	@ObfuscatedName("fc")
+	@ObfuscatedSignature(
+		signature = "Lkn;"
+	)
+	static AbstractSocket field1413;
+	@ObfuscatedName("e")
 	@Export("samples")
 	protected int[] samples;
-	@ObfuscatedName("x")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		signature = "Ldj;"
+		signature = "Ldt;"
 	)
 	@Export("stream")
 	PcmStream stream;
-	@ObfuscatedName("j")
-	@ObfuscatedGetter(
-		intValue = 1561038713
-	)
-	int field1394;
 	@ObfuscatedName("r")
 	@ObfuscatedGetter(
-		longValue = -4392841547696202379L
+		intValue = 78939647
+	)
+	int field1396;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		longValue = -143263282379705379L
 	)
 	@Export("timeMs")
 	long timeMs;
-	@ObfuscatedName("e")
+	@ObfuscatedName("a")
 	@ObfuscatedGetter(
-		intValue = 1043621473
+		intValue = 519126893
 	)
 	@Export("capacity")
 	int capacity;
+	@ObfuscatedName("d")
+	@ObfuscatedGetter(
+		intValue = 1108114601
+	)
+	int field1401;
 	@ObfuscatedName("s")
 	@ObfuscatedGetter(
-		intValue = 87415669
+		intValue = -1542098097
 	)
-	int field1388;
-	@ObfuscatedName("b")
+	int field1402;
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 692811819
+		longValue = -5404263653312830565L
 	)
-	int field1389;
-	@ObfuscatedName("z")
+	long field1405;
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		longValue = -5109190258343752079L
+		intValue = 1907349045
 	)
-	long field1390;
-	@ObfuscatedName("f")
+	int field1406;
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = -728002027
+		intValue = 850216769
 	)
-	int field1384;
-	@ObfuscatedName("g")
+	int field1404;
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = 1330759581
-	)
-	int field1380;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = -1355026859
+		intValue = -1870292623
 	)
 	int field1393;
-	@ObfuscatedName("u")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		longValue = 8313708391947362675L
+		longValue = 8086263838612894667L
 	)
-	long field1396;
-	@ObfuscatedName("y")
-	boolean field1395;
-	@ObfuscatedName("ag")
+	long field1407;
+	@ObfuscatedName("j")
+	boolean field1398;
+	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = 232307999
+		intValue = 657489915
 	)
-	int field1392;
+	int field1409;
+	@ObfuscatedName("aw")
+	@ObfuscatedSignature(
+		signature = "[Ldt;"
+	)
+	PcmStream[] field1410;
 	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		signature = "[Ldj;"
+		signature = "[Ldt;"
 	)
-	PcmStream[] field1397;
-	@ObfuscatedName("av")
-	@ObfuscatedSignature(
-		signature = "[Ldj;"
-	)
-	PcmStream[] field1398;
+	PcmStream[] field1411;
 
 	protected PcmPlayer() {
-		this.field1394 = 32;
-		this.timeMs = PlayerAppearance.currentTimeMillis();
-		this.field1390 = 0L;
-		this.field1384 = 0;
-		this.field1380 = 0;
+		this.field1396 = 32;
+		this.timeMs = TaskHandler.currentTimeMillis();
+		this.field1405 = 0L;
+		this.field1406 = 0;
+		this.field1404 = 0;
 		this.field1393 = 0;
-		this.field1396 = 0L;
-		this.field1395 = true;
-		this.field1392 = 0;
-		this.field1397 = new PcmStream[8];
-		this.field1398 = new PcmStream[8];
+		this.field1407 = 0L;
+		this.field1398 = true;
+		this.field1409 = 0;
+		this.field1410 = new PcmStream[8];
+		this.field1411 = new PcmStream[8];
 	}
 
-	@ObfuscatedName("a")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		signature = "(B)V",
-		garbageValue = "-122"
+		signature = "(I)V",
+		garbageValue = "347893346"
 	)
 	@Export("init")
 	protected void init() throws Exception {
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "1329305761"
+		signature = "(IB)V",
+		garbageValue = "25"
 	)
 	@Export("open")
 	protected void open(int var1) throws Exception {
 	}
 
-	@ObfuscatedName("n")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		signature = "(I)I",
-		garbageValue = "-2053382901"
+		signature = "(B)I",
+		garbageValue = "80"
 	)
 	@Export("position")
 	protected int position() throws Exception {
 		return this.capacity;
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("g")
 	@Export("write")
 	protected void write() throws Exception {
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-359946727"
+		garbageValue = "-1441503616"
 	)
 	@Export("close")
 	protected void close() {
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "47548316"
+		signature = "(B)V",
+		garbageValue = "45"
 	)
 	@Export("discard")
 	protected void discard() throws Exception {
 	}
 
-	@ObfuscatedName("av")
+	@ObfuscatedName("am")
 	@ObfuscatedSignature(
-		signature = "(Ldj;S)V",
-		garbageValue = "2001"
+		signature = "(Ldt;B)V",
+		garbageValue = "-11"
 	)
 	@Export("setStream")
 	public final synchronized void setStream(PcmStream var1) {
 		this.stream = var1;
 	}
 
-	@ObfuscatedName("am")
+	@ObfuscatedName("ai")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-162724995"
+		garbageValue = "344107964"
 	)
 	@Export("run")
 	public final synchronized void run() {
 		if (this.samples != null) {
-			long var1 = PlayerAppearance.currentTimeMillis();
+			long var1 = TaskHandler.currentTimeMillis();
 
 			try {
-				if (0L != this.field1390) {
-					if (var1 < this.field1390) {
+				if (this.field1405 != 0L) {
+					if (var1 < this.field1405) {
 						return;
 					}
 
 					this.open(this.capacity);
-					this.field1390 = 0L;
-					this.field1395 = true;
+					this.field1405 = 0L;
+					this.field1398 = true;
 				}
 
 				int var3 = this.position();
-				if (this.field1393 - var3 > this.field1384) {
-					this.field1384 = this.field1393 - var3;
+				if (this.field1393 - var3 > this.field1406) {
+					this.field1406 = this.field1393 - var3;
 				}
 
-				int var4 = this.field1389 + this.field1388;
+				int var4 = this.field1401 + this.field1402;
 				if (var4 + 256 > 16384) {
 					var4 = 16128;
 				}
@@ -207,10 +219,10 @@ public class PcmPlayer {
 					this.close();
 					this.open(this.capacity);
 					var3 = 0;
-					this.field1395 = true;
+					this.field1398 = true;
 					if (var4 + 256 > this.capacity) {
 						var4 = this.capacity - 256;
-						this.field1389 = var4 - this.field1388;
+						this.field1402 = var4 - this.field1401;
 					}
 				}
 
@@ -220,38 +232,38 @@ public class PcmPlayer {
 					var3 += 256;
 				}
 
-				if (var1 > this.field1396) {
-					if (!this.field1395) {
-						if (this.field1384 == 0 && this.field1380 == 0) {
+				if (var1 > this.field1407) {
+					if (!this.field1398) {
+						if (this.field1406 == 0 && this.field1404 == 0) {
 							this.close();
-							this.field1390 = var1 + 2000L;
+							this.field1405 = var1 + 2000L;
 							return;
 						}
 
-						this.field1389 = Math.min(this.field1380, this.field1384);
-						this.field1380 = this.field1384;
+						this.field1402 = Math.min(this.field1404, this.field1406);
+						this.field1404 = this.field1406;
 					} else {
-						this.field1395 = false;
+						this.field1398 = false;
 					}
 
-					this.field1384 = 0;
-					this.field1396 = 2000L + var1;
+					this.field1406 = 0;
+					this.field1407 = 2000L + var1;
 				}
 
 				this.field1393 = var3;
 			} catch (Exception var7) {
 				this.close();
-				this.field1390 = var1 + 2000L;
+				this.field1405 = 2000L + var1;
 			}
 
 			try {
-				if (var1 > this.timeMs + 500000L) {
+				if (var1 > 500000L + this.timeMs) {
 					var1 = this.timeMs;
 				}
 
 				while (var1 > 5000L + this.timeMs) {
 					this.skip(256);
-					this.timeMs += (long)(256000 / (PcmPlayer_sampleRate * 22050));
+					this.timeMs += (long)(256000 / Messages.field1274);
 				}
 			} catch (Exception var6) {
 				this.timeMs = var1;
@@ -260,57 +272,57 @@ public class PcmPlayer {
 		}
 	}
 
-	@ObfuscatedName("ab")
+	@ObfuscatedName("ag")
 	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-2122185925"
+		signature = "(S)V",
+		garbageValue = "-4762"
 	)
-	public final void method2581() {
-		this.field1395 = true;
+	public final void method2458() {
+		this.field1398 = true;
 	}
 
-	@ObfuscatedName("ax")
+	@ObfuscatedName("ao")
 	@ObfuscatedSignature(
-		signature = "(I)V",
-		garbageValue = "-855034369"
+		signature = "(B)V",
+		garbageValue = "1"
 	)
 	@Export("tryDiscard")
 	public final synchronized void tryDiscard() {
-		this.field1395 = true;
+		this.field1398 = true;
 
 		try {
 			this.discard();
 		} catch (Exception var2) {
 			this.close();
-			this.field1390 = PlayerAppearance.currentTimeMillis() + 2000L;
+			this.field1405 = TaskHandler.currentTimeMillis() + 2000L;
 		}
 
 	}
 
-	@ObfuscatedName("al")
+	@ObfuscatedName("aw")
 	@ObfuscatedSignature(
 		signature = "(I)V",
-		garbageValue = "-1045839525"
+		garbageValue = "-1132905799"
 	)
 	@Export("shutdown")
 	public final synchronized void shutdown() {
-		if (VerticalAlignment.soundSystem != null) {
+		if (soundSystem != null) {
 			boolean var1 = true;
 
 			for (int var2 = 0; var2 < 2; ++var2) {
-				if (this == VerticalAlignment.soundSystem.players[var2]) {
-					VerticalAlignment.soundSystem.players[var2] = null;
+				if (this == soundSystem.players[var2]) {
+					soundSystem.players[var2] = null;
 				}
 
-				if (VerticalAlignment.soundSystem.players[var2] != null) {
+				if (soundSystem.players[var2] != null) {
 					var1 = false;
 				}
 			}
 
 			if (var1) {
-				SecureRandomCallable.soundSystemExecutor.shutdownNow();
-				SecureRandomCallable.soundSystemExecutor = null;
-				VerticalAlignment.soundSystem = null;
+				soundSystemExecutor.shutdownNow();
+				soundSystemExecutor = null;
+				soundSystem = null;
 			}
 		}
 
@@ -318,16 +330,16 @@ public class PcmPlayer {
 		this.samples = null;
 	}
 
-	@ObfuscatedName("ap")
+	@ObfuscatedName("ak")
 	@ObfuscatedSignature(
-		signature = "(II)V",
-		garbageValue = "-1485075672"
+		signature = "(IB)V",
+		garbageValue = "8"
 	)
 	@Export("skip")
 	final void skip(int var1) {
-		this.field1392 -= var1;
-		if (this.field1392 < 0) {
-			this.field1392 = 0;
+		this.field1409 -= var1;
+		if (this.field1409 < 0) {
+			this.field1409 = 0;
 		}
 
 		if (this.stream != null) {
@@ -336,20 +348,20 @@ public class PcmPlayer {
 
 	}
 
-	@ObfuscatedName("aj")
+	@ObfuscatedName("aa")
 	@Export("fill")
 	final void fill(int[] var1, int var2) {
 		int var3 = var2;
-		if (InterfaceParent.PcmPlayer_stereo) {
+		if (PcmPlayer_stereo) {
 			var3 = var2 << 1;
 		}
 
 		class300.clearIntArray(var1, 0, var3);
-		this.field1392 -= var2;
-		if (this.stream != null && this.field1392 <= 0) {
-			this.field1392 += PcmPlayer_sampleRate * 22050 >> 4;
-			PlayerAppearance.PcmStream_disable(this.stream);
-			this.method2586(this.stream, this.stream.vmethod2868());
+		this.field1409 -= var2;
+		if (this.stream != null && this.field1409 <= 0) {
+			this.field1409 += Messages.field1274 >> 4;
+			class1.PcmStream_disable(this.stream);
+			this.method2452(this.stream, this.stream.vmethod2741());
 			int var4 = 0;
 			int var5 = 255;
 
@@ -371,7 +383,7 @@ public class PcmPlayer {
 					if ((var9 & 1) != 0) {
 						var5 &= ~(1 << var7);
 						var10 = null;
-						PcmStream var11 = this.field1397[var7];
+						PcmStream var11 = this.field1410[var7];
 
 						label98:
 						while (true) {
@@ -387,33 +399,33 @@ public class PcmPlayer {
 									var11 = var11.after;
 								} else {
 									var11.active = true;
-									int var13 = var11.vmethod4063();
+									int var13 = var11.vmethod3963();
 									var4 += var13;
 									if (var12 != null) {
 										var12.position += var13;
 									}
 
-									if (var4 >= this.field1394) {
+									if (var4 >= this.field1396) {
 										break label104;
 									}
 
 									PcmStream var14 = var11.firstSubStream();
 									if (var14 != null) {
-										for (int var15 = var11.field1467; var14 != null; var14 = var11.nextSubStream()) {
-											this.method2586(var14, var15 * var14.vmethod2868() >> 8);
+										for (int var15 = var11.field1483; var14 != null; var14 = var11.nextSubStream()) {
+											this.method2452(var14, var15 * var14.vmethod2741() >> 8);
 										}
 									}
 
 									PcmStream var18 = var11.after;
 									var11.after = null;
 									if (var10 == null) {
-										this.field1397[var7] = var18;
+										this.field1410[var7] = var18;
 									} else {
 										var10.after = var18;
 									}
 
 									if (var18 == null) {
-										this.field1398[var7] = var10;
+										this.field1411[var7] = var10;
 									}
 
 									var11 = var18;
@@ -428,9 +440,9 @@ public class PcmPlayer {
 			}
 
 			for (var6 = 0; var6 < 8; ++var6) {
-				PcmStream var16 = this.field1397[var6];
-				PcmStream[] var17 = this.field1397;
-				this.field1398[var6] = null;
+				PcmStream var16 = this.field1410[var6];
+				PcmStream[] var17 = this.field1410;
+				this.field1411[var6] = null;
 
 				for (var17[var6] = null; var16 != null; var16 = var10) {
 					var10 = var16.after;
@@ -439,83 +451,87 @@ public class PcmPlayer {
 			}
 		}
 
-		if (this.field1392 < 0) {
-			this.field1392 = 0;
+		if (this.field1409 < 0) {
+			this.field1409 = 0;
 		}
 
 		if (this.stream != null) {
 			this.stream.fill(var1, 0, var2);
 		}
 
-		this.timeMs = PlayerAppearance.currentTimeMillis();
+		this.timeMs = TaskHandler.currentTimeMillis();
 	}
 
-	@ObfuscatedName("au")
+	@ObfuscatedName("ar")
 	@ObfuscatedSignature(
-		signature = "(Ldj;IB)V",
-		garbageValue = "113"
+		signature = "(Ldt;II)V",
+		garbageValue = "1065299389"
 	)
-	final void method2586(PcmStream var1, int var2) {
+	final void method2452(PcmStream var1, int var2) {
 		int var3 = var2 >> 5;
-		PcmStream var4 = this.field1398[var3];
+		PcmStream var4 = this.field1411[var3];
 		if (var4 == null) {
-			this.field1397[var3] = var1;
+			this.field1410[var3] = var1;
 		} else {
 			var4.after = var1;
 		}
 
-		this.field1398[var3] = var1;
-		var1.field1467 = var2;
+		this.field1411[var3] = var1;
+		var1.field1483 = var2;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		signature = "(CI)Z",
-		garbageValue = "1251726708"
+		signature = "(S)V",
+		garbageValue = "180"
 	)
-	public static boolean method2639(char var0) {
-		if (var0 > ' ' && var0 < 127 || var0 > 127 && var0 < 160 || var0 > 160 && var0 <= 255) {
-			return true;
-		} else {
-			if (var0 != 0) {
-				char[] var1 = class287.cp1252AsciiExtension;
+	static void method2510() {
+		UrlRequester.SpriteBuffer_xOffsets = null;
+		class216.SpriteBuffer_yOffsets = null;
+		class325.SpriteBuffer_spriteWidths = null;
+		VarcInt.SpriteBuffer_spriteHeights = null;
+		class325.SpriteBuffer_spritePalette = null;
+		FillMode.SpriteBuffer_pixels = null;
+	}
 
-				for (int var2 = 0; var2 < var1.length; ++var2) {
-					char var3 = var1[var2];
-					if (var0 == var3) {
-						return true;
-					}
+	@ObfuscatedName("it")
+	@ObfuscatedSignature(
+		signature = "(I)V",
+		garbageValue = "264863950"
+	)
+	static final void method2509() {
+		boolean var0 = false;
+
+		while (!var0) {
+			var0 = true;
+
+			for (int var1 = 0; var1 < Client.menuOptionsCount - 1; ++var1) {
+				if (Client.menuOpcodes[var1] < 1000 && Client.menuOpcodes[var1 + 1] > 1000) {
+					String var2 = Client.menuTargets[var1];
+					Client.menuTargets[var1] = Client.menuTargets[var1 + 1];
+					Client.menuTargets[var1 + 1] = var2;
+					String var3 = Client.menuActions[var1];
+					Client.menuActions[var1] = Client.menuActions[var1 + 1];
+					Client.menuActions[var1 + 1] = var3;
+					int var4 = Client.menuOpcodes[var1];
+					Client.menuOpcodes[var1] = Client.menuOpcodes[var1 + 1];
+					Client.menuOpcodes[var1 + 1] = var4;
+					var4 = Client.menuArguments1[var1];
+					Client.menuArguments1[var1] = Client.menuArguments1[var1 + 1];
+					Client.menuArguments1[var1 + 1] = var4;
+					var4 = Client.menuArguments2[var1];
+					Client.menuArguments2[var1] = Client.menuArguments2[var1 + 1];
+					Client.menuArguments2[var1 + 1] = var4;
+					var4 = Client.menuIdentifiers[var1];
+					Client.menuIdentifiers[var1] = Client.menuIdentifiers[var1 + 1];
+					Client.menuIdentifiers[var1 + 1] = var4;
+					boolean var5 = Client.menuShiftClick[var1];
+					Client.menuShiftClick[var1] = Client.menuShiftClick[var1 + 1];
+					Client.menuShiftClick[var1 + 1] = var5;
+					var0 = false;
 				}
 			}
-
-			return false;
-		}
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		signature = "(III)I",
-		garbageValue = "1581886582"
-	)
-	static int method2638(int var0, int var1) {
-		long var2 = (long)((var0 << 16) + var1);
-		return UserComparator6.NetCache_currentResponse != null && var2 == UserComparator6.NetCache_currentResponse.key ? Frames.NetCache_responseArchiveBuffer.offset * 99 / (Frames.NetCache_responseArchiveBuffer.array.length - UserComparator6.NetCache_currentResponse.padding) + 1 : 0;
-	}
-
-	@ObfuscatedName("hk")
-	@ObfuscatedSignature(
-		signature = "(IIB)I",
-		garbageValue = "-14"
-	)
-	static int method2637(int var0, int var1) {
-		int var2 = var1 - 334;
-		if (var2 < 0) {
-			var2 = 0;
-		} else if (var2 > 100) {
-			var2 = 100;
 		}
 
-		int var3 = (Client.zoomWidth - Client.zoomHeight) * var2 / 100 + Client.zoomHeight;
-		return var0 * var3 / 256;
 	}
 }