project: rev 195

2021-04-14 13:14:08 +01:00
parent 05ff44d4ad
commit c9d40d93dd
439 changed files with 55170 additions and 51182 deletions
--- a/runescape-client/src/main/java/class258.java
+++ b/runescape-client/src/main/java/class258.java
@@ -1,55 +1,83 @@
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("in")
+@ObfuscatedName("io")
 public class class258 {
-	@ObfuscatedName("gg")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIII)V",
-		garbageValue = "1214767068"
+		descriptor = "(IIIII)V",
+		garbageValue = "862328928"
 	)
-	static final void method4685(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-		var5 = SecureRandomCallable.method1233(var5, var6); // L: 4934
-		int var7 = 2048 - var3 & 2047; // L: 4935
-		int var8 = 2048 - var4 & 2047; // L: 4936
-		int var9 = 0; // L: 4937
-		int var10 = 0; // L: 4938
-		int var11 = var5; // L: 4939
-		int var12;
-		int var13;
-		int var14;
-		if (var7 != 0) { // L: 4940
-			var12 = Rasterizer3D.Rasterizer3D_sine[var7]; // L: 4941
-			var13 = Rasterizer3D.Rasterizer3D_cosine[var7]; // L: 4942
-			var14 = var13 * var10 - var5 * var12 >> 16; // L: 4943
-			var11 = var13 * var5 + var12 * var10 >> 16; // L: 4944
-			var10 = var14; // L: 4945
+	static void method4608(int var0, int var1, int var2, int var3) {
+		for (ObjectSound var4 = (ObjectSound)ObjectSound.objectSounds.last(); var4 != null; var4 = (ObjectSound)ObjectSound.objectSounds.previous()) { // L: 53
+			if (var4.soundEffectId != -1 || var4.soundEffectIds != null) { // L: 54
+				int var5 = 0; // L: 55
+				if (var1 > var4.field916) { // L: 56
+					var5 += var1 - var4.field916;
+				} else if (var1 < var4.x) { // L: 57
+					var5 += var4.x - var1;
+				}
+
+				if (var2 > var4.field917) { // L: 58
+					var5 += var2 - var4.field917;
+				} else if (var2 < var4.y) { // L: 59
+					var5 += var4.y - var2;
+				}
+
+				if (var5 - 64 <= var4.field918 && Login.clientPreferences.areaSoundEffectsVolume != 0 && var0 == var4.plane) { // L: 60
+					var5 -= 64; // L: 71
+					if (var5 < 0) { // L: 72
+						var5 = 0;
+					}
+
+					int var6 = (var4.field918 - var5) * Login.clientPreferences.areaSoundEffectsVolume / var4.field918; // L: 73
+					if (var4.stream1 == null) { // L: 74
+						if (var4.soundEffectId >= 0) { // L: 75
+							SoundEffect var7 = SoundEffect.readSoundEffect(ItemContainer.archive4, var4.soundEffectId, 0); // L: 76
+							if (var7 != null) { // L: 77
+								RawSound var8 = var7.toRawSound().resample(class34.decimator); // L: 78
+								RawPcmStream var9 = RawPcmStream.createRawPcmStream(var8, 100, var6); // L: 79
+								var9.setNumLoops(-1); // L: 80
+								Huffman.pcmStreamMixer.addSubStream(var9); // L: 81
+								var4.stream1 = var9; // L: 82
+							}
+						}
+					} else {
+						var4.stream1.method901(var6); // L: 86
+					}
+
+					if (var4.stream2 == null) { // L: 87
+						if (var4.soundEffectIds != null && (var4.field924 -= var3) <= 0) { // L: 88
+							int var11 = (int)(Math.random() * (double)var4.soundEffectIds.length); // L: 89
+							SoundEffect var12 = SoundEffect.readSoundEffect(ItemContainer.archive4, var4.soundEffectIds[var11], 0); // L: 90
+							if (var12 != null) { // L: 91
+								RawSound var13 = var12.toRawSound().resample(class34.decimator); // L: 92
+								RawPcmStream var10 = RawPcmStream.createRawPcmStream(var13, 100, var6); // L: 93
+								var10.setNumLoops(0); // L: 94
+								Huffman.pcmStreamMixer.addSubStream(var10); // L: 95
+								var4.stream2 = var10; // L: 96
+								var4.field924 = var4.field921 + (int)(Math.random() * (double)(var4.field922 - var4.field921)); // L: 97
+							}
+						}
+					} else {
+						var4.stream2.method901(var6); // L: 102
+						if (!var4.stream2.hasNext()) { // L: 103
+							var4.stream2 = null; // L: 104
+						}
+					}
+				} else {
+					if (var4.stream1 != null) { // L: 61
+						Huffman.pcmStreamMixer.removeSubStream(var4.stream1); // L: 62
+						var4.stream1 = null; // L: 63
+					}
+
+					if (var4.stream2 != null) { // L: 65
+						Huffman.pcmStreamMixer.removeSubStream(var4.stream2); // L: 66
+						var4.stream2 = null; // L: 67
+					}
+				}
+			}
 		}

-		if (var8 != 0) { // L: 4947
-			var12 = Rasterizer3D.Rasterizer3D_sine[var8]; // L: 4948
-			var13 = Rasterizer3D.Rasterizer3D_cosine[var8]; // L: 4949
-			var14 = var13 * var9 + var11 * var12 >> 16; // L: 4950
-			var11 = var13 * var11 - var12 * var9 >> 16; // L: 4951
-			var9 = var14; // L: 4952
-		}
-
-		SecureRandomFuture.cameraX = var0 - var9; // L: 4954
-		ArchiveLoader.cameraY = var1 - var10; // L: 4955
-		ObjectSound.cameraZ = var2 - var11; // L: 4956
-		KeyHandler.cameraPitch = var3; // L: 4957
-		class39.cameraYaw = var4; // L: 4958
-		if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (HealthBarUpdate.oculusOrbFocalPointX >> 7 != UserComparator9.localPlayer.x >> 7 || ApproximateRouteStrategy.oculusOrbFocalPointY >> 7 != UserComparator9.localPlayer.y >> 7)) { // L: 4959 4960
-			var12 = UserComparator9.localPlayer.plane; // L: 4961
-			var13 = (HealthBarUpdate.oculusOrbFocalPointX >> 7) + GrandExchangeOfferNameComparator.baseX; // L: 4962
-			var14 = (ApproximateRouteStrategy.oculusOrbFocalPointY >> 7) + NetCache.baseY; // L: 4963
-			PacketBufferNode var15 = WorldMapSprite.getPacketBufferNode(ClientPacket.field2230, Client.packetWriter.isaacCipher); // L: 4966
-			var15.packetBuffer.writeShortLE(var14); // L: 4967
-			var15.packetBuffer.method5883(var12); // L: 4968
-			var15.packetBuffer.method5736(Client.field746); // L: 4969
-			var15.packetBuffer.writeIntME(var13); // L: 4970
-			Client.packetWriter.addNode(var15); // L: 4971
-		}
-
-	} // L: 4975
+	} // L: 108
 }