project: rev 199

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

@@ -1,15 +1,22 @@
 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("oh")
+@ObfuscatedName("pp")
 @Implements("Username")
 public class Username implements Comparable {
-	@ObfuscatedName("s")
+	@ObfuscatedName("m")
+	@ObfuscatedGetter(
+		intValue = -1508031551
+	)
+	@Export("WorldMapElement_count")
+	public static int WorldMapElement_count;
+	@ObfuscatedName("n")
 	@Export("name")
 	String name;
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@Export("cleanName")
 	String cleanName;
 
@@ -18,47 +25,198 @@ public class Username implements Comparable {
 	)
 	public Username(String var1, LoginType var2) {
 		this.name = var1;
-		this.cleanName = class113.method2347(var1, var2);
+		String var4;
+		if (var1 == null) {
+			var4 = null;
+		} else {
+			int var5 = 0;
+
+			int var6;
+			for (var6 = var1.length(); var5 < var6 && FloorOverlayDefinition.method3277(var1.charAt(var5)); ++var5) {
+			}
+
+			while (var6 > var5 && FloorOverlayDefinition.method3277(var1.charAt(var6 - 1))) {
+				--var6;
+			}
+
+			int var7 = var6 - var5;
+			if (var7 >= 1 && var7 <= WorldMapLabel.method3810(var2)) {
+				StringBuilder var8 = new StringBuilder(var7);
+
+				for (int var9 = var5; var9 < var6; ++var9) {
+					char var10 = var1.charAt(var9);
+					boolean var11;
+					if (Character.isISOControl(var10)) {
+						var11 = false;
+					} else if (UserComparator8.isAlphaNumeric(var10)) {
+						var11 = true;
+					} else {
+						char[] var12 = class382.field4209;
+						int var13 = 0;
+
+						label68:
+						while (true) {
+							char var14;
+							if (var13 >= var12.length) {
+								var12 = class382.field4208;
+
+								for (var13 = 0; var13 < var12.length; ++var13) {
+									var14 = var12[var13];
+									if (var10 == var14) {
+										var11 = true;
+										break label68;
+									}
+								}
+
+								var11 = false;
+								break;
+							}
+
+							var14 = var12[var13];
+							if (var14 == var10) {
+								var11 = true;
+								break;
+							}
+
+							++var13;
+						}
+					}
+
+					if (var11) {
+						char var15 = class131.method2647(var10);
+						if (var15 != 0) {
+							var8.append(var15);
+						}
+					}
+				}
+
+				if (var8.length() == 0) {
+					var4 = null;
+				} else {
+					var4 = var8.toString();
+				}
+			} else {
+				var4 = null;
+			}
+		}
+
+		this.cleanName = var4;
 	}
 
 	public Username(String var1) {
 		this.name = var1;
-		this.cleanName = class113.method2347(var1, LoginType.oldscape);
+		LoginType var4 = LoginType.oldscape;
+		String var3;
+		if (var1 == null) {
+			var3 = null;
+		} else {
+			int var5 = 0;
+
+			int var6;
+			for (var6 = var1.length(); var5 < var6 && FloorOverlayDefinition.method3277(var1.charAt(var5)); ++var5) {
+			}
+
+			while (var6 > var5 && FloorOverlayDefinition.method3277(var1.charAt(var6 - 1))) {
+				--var6;
+			}
+
+			int var7 = var6 - var5;
+			if (var7 >= 1 && var7 <= WorldMapLabel.method3810(var4)) {
+				StringBuilder var8 = new StringBuilder(var7);
+
+				for (int var9 = var5; var9 < var6; ++var9) {
+					char var10 = var1.charAt(var9);
+					boolean var11;
+					if (Character.isISOControl(var10)) {
+						var11 = false;
+					} else if (UserComparator8.isAlphaNumeric(var10)) {
+						var11 = true;
+					} else {
+						char[] var12 = class382.field4209;
+						int var13 = 0;
+
+						label68:
+						while (true) {
+							char var14;
+							if (var13 >= var12.length) {
+								var12 = class382.field4208;
+
+								for (var13 = 0; var13 < var12.length; ++var13) {
+									var14 = var12[var13];
+									if (var10 == var14) {
+										var11 = true;
+										break label68;
+									}
+								}
+
+								var11 = false;
+								break;
+							}
+
+							var14 = var12[var13];
+							if (var10 == var14) {
+								var11 = true;
+								break;
+							}
+
+							++var13;
+						}
+					}
+
+					if (var11) {
+						char var15 = class131.method2647(var10);
+						if (var15 != 0) {
+							var8.append(var15);
+						}
+					}
+				}
+
+				if (var8.length() == 0) {
+					var3 = null;
+				} else {
+					var3 = var8.toString();
+				}
+			} else {
+				var3 = null;
+			}
+		}
+
+		this.cleanName = var3;
 	}
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
 		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-1013055370"
+		garbageValue = "1256287168"
 	)
 	@Export("getName")
 	public String getName() {
 		return this.name;
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "-10"
+		descriptor = "(S)Ljava/lang/String;",
+		garbageValue = "-30300"
 	)
-	public String method7241() {
+	public String method7399() {
 		return this.cleanName;
 	}
 
-	@ObfuscatedName("v")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "-808946176"
+		garbageValue = "1374300828"
 	)
 	@Export("hasCleanName")
 	public boolean hasCleanName() {
 		return this.cleanName != null;
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Loh;I)I",
-		garbageValue = "-558094265"
+		descriptor = "(Lpp;B)I",
+		garbageValue = "-74"
 	)
 	@Export("compareToTyped")
 	public int compareToTyped(Username var1) {