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/AbstractUserComparator.java

@@ -4,20 +4,20 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("lr")
+@ObfuscatedName("ln")
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
-	@ObfuscatedName("c")
+	@ObfuscatedName("n")
 	@Export("nextComparator")
 	Comparator nextComparator;
 
 	protected AbstractUserComparator() {
 	} // L: 8
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/util/Comparator;I)V",
-		garbageValue = "-1938939594"
+		garbageValue = "-82971499"
 	)
 	@Export("addComparator")
 	final void addComparator(Comparator var1) {
@@ -29,10 +29,10 @@ public abstract class AbstractUserComparator implements Comparator {
 
 	} // L: 17
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "(Llm;Llm;B)I",
-		garbageValue = "-41"
+		descriptor = "(Llx;Llx;B)I",
+		garbageValue = "0"
 	)
 	@Export("compareUser")
 	protected final int compareUser(User var1, User var2) {
@@ -42,33 +42,4 @@ public abstract class AbstractUserComparator implements Comparator {
 	public boolean equals(Object var1) {
 		return super.equals(var1); // L: 25
 	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "-246385012"
-	)
-	static int method5592(int var0, int var1) {
-		if (var0 == -2) { // L: 37
-			return 12345678;
-		} else if (var0 == -1) { // L: 38
-			if (var1 < 0) { // L: 39
-				var1 = 0; // L: 40
-			} else if (var1 > 127) { // L: 42
-				var1 = 127; // L: 43
-			}
-
-			var1 = 127 - var1; // L: 45
-			return var1; // L: 46
-		} else {
-			var1 = (var0 & 127) * var1 / 128; // L: 48
-			if (var1 < 2) { // L: 49
-				var1 = 2;
-			} else if (var1 > 126) { // L: 50
-				var1 = 126;
-			}
-
-			return (var0 & 65408) + var1; // L: 51
-		}
-	}
 }