Merge remote-tracking branch 'upstream/master' into master

Nice insider info btw, be nice if you shared it, so-called "open source" client.

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

@@ -4,34 +4,34 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("dx")
+@ObfuscatedName("de")
 @Implements("NanoClock")
 public class NanoClock extends Clock {
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		longValue = -6431087590291668695L
+		longValue = -87747295156547195L
 	)
 	@Export("lastTimeNano")
 	long lastTimeNano;
 
-	NanoClock() {
+	public NanoClock() {
 		this.lastTimeNano = System.nanoTime(); // L: 10
 	} // L: 11
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "2109522039"
+		garbageValue = "-1887937791"
 	)
 	@Export("mark")
 	public void mark() {
 		this.lastTimeNano = System.nanoTime(); // L: 14
 	} // L: 15
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(III)I",
-		garbageValue = "665432073"
+		garbageValue = "-1841090229"
 	)
 	@Export("wait")
 	public int wait(int var1, int var2) {
@@ -41,18 +41,40 @@ public class NanoClock extends Clock {
 			var5 = var3;
 		}
 
-		UrlRequest.sleepExact(var5 / 1000000L); // L: 21
-		long var7 = System.nanoTime(); // L: 22
+		long var7 = var5 / 1000000L; // L: 21
+		long var9;
+		if (var7 > 0L) { // L: 23
+			if (var7 % 10L == 0L) { // L: 24
+				var9 = var7 - 1L; // L: 25
 
-		int var9;
-		for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) { // L: 23 24 26
-			++var9; // L: 25
+				try {
+					Thread.sleep(var9); // L: 28
+				} catch (InterruptedException var16) { // L: 30
+				}
+
+				try {
+					Thread.sleep(1L); // L: 34
+				} catch (InterruptedException var15) { // L: 36
+				}
+			} else {
+				try {
+					Thread.sleep(var7); // L: 41
+				} catch (InterruptedException var14) { // L: 43
+				}
+			}
 		}
 
-		if (this.lastTimeNano < var7) { // L: 28
-			this.lastTimeNano = var7;
+		var9 = System.nanoTime(); // L: 46
+
+		int var13;
+		for (var13 = 0; var13 < 10 && (var13 < 1 || this.lastTimeNano < var9); this.lastTimeNano += 1000000L * (long)var1) { // L: 47 48 50
+			++var13; // L: 49
 		}
 
-		return var9; // L: 29
+		if (this.lastTimeNano < var9) { // L: 52
+			this.lastTimeNano = var9;
+		}
+
+		return var13; // L: 53
 	}
 }