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

@@ -1,13 +1,20 @@
 import java.util.Comparator;
 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("nl")
+@ObfuscatedName("nj")
 @Implements("UserComparator2")
 public class UserComparator2 implements Comparator {
-	@ObfuscatedName("h")
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = -821679425
+	)
+	@Export("SpriteBuffer_spriteHeight")
+	static int SpriteBuffer_spriteHeight;
+	@ObfuscatedName("v")
 	@Export("reversed")
 	final boolean reversed;
 
@@ -15,21 +22,21 @@ public class UserComparator2 implements Comparator {
 		this.reversed = var1; // L: 10
 	} // L: 11
 
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Llm;Llm;B)I",
-		garbageValue = "-94"
+		descriptor = "(Llx;Llx;B)I",
+		garbageValue = "-9"
 	)
 	@Export("compare_bridged")
 	int compare_bridged(User var1, User var2) {
 		return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); // L: 14
 	}
 
-	public boolean equals(Object var1) {
-		return super.equals(var1); // L: 22
-	}
-
 	public int compare(Object var1, Object var2) {
 		return this.compare_bridged((User)var1, (User)var2); // L: 18
 	}
+
+	public boolean equals(Object var1) {
+		return super.equals(var1); // L: 22
+	}
 }