project: Rev 204

2022-03-23 14:15:28 +01:00
parent 14d41dd9a4
commit 3834b46aee
532 changed files with 61751 additions and 59895 deletions
--- a/runescape-client/src/main/java/FriendsChat.java
+++ b/runescape-client/src/main/java/FriendsChat.java
@@ -4,222 +4,209 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("ma")
+@ObfuscatedName("nw")
@Implements("FriendsChat")
 public class FriendsChat extends UserList {
-	@ObfuscatedName("sg")
-	@ObfuscatedGetter(
-		intValue = 1974859207
-	)
-	static int field4141;
-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lok;"
+		descriptor = "Lpa;"
 	)
 	@Export("loginType")
 	final LoginType loginType;
-	@ObfuscatedName("s")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "Lmb;"
+		descriptor = "Lnv;"
 	)
 	@Export("localUser")
 	final Usernamed localUser;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@Export("name")
 	public String name;
-	@ObfuscatedName("r")
+	@ObfuscatedName("l")
 	@Export("owner")
 	public String owner;
-	@ObfuscatedName("o")
+	@ObfuscatedName("n")
 	@Export("minKick")
 	public byte minKick;
-	@ObfuscatedName("i")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = 149836569
+		intValue = 1904728549
 	)
 	@Export("rank")
 	public int rank;
-	@ObfuscatedName("w")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = -1071475131
+		intValue = -1723570979
 	)
-	int field4143;
+	int field4252;

 	@ObfuscatedSignature(
-		descriptor = "(Lok;Lmb;)V"
+		descriptor = "(Lpa;Lnv;)V"
 	)
 	public FriendsChat(LoginType var1, Usernamed var2) {
-		super(100);
+		super(100); // L: 19
 		this.name = null; // L: 12
 		this.owner = null; // L: 13
-		this.field4143 = 1;
+		this.field4252 = 1; // L: 16
 		this.loginType = var1; // L: 20
-		this.localUser = var2;
+		this.localUser = var2; // L: 21
 	} // L: 22

-	@ObfuscatedName("c")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lmy;",
-		garbageValue = "2000225121"
+		descriptor = "(I)Lnc;",
+		garbageValue = "-1289438305"
 	)
 	@Export("newInstance")
 	User newInstance() {
 		return new ClanMate(); // L: 26
 	}

-	@ObfuscatedName("l")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IB)[Lmy;",
-		garbageValue = "55"
+		descriptor = "(II)[Lnc;",
+		garbageValue = "-1075861644"
 	)
 	@Export("newTypedArray")
 	User[] newTypedArray(int var1) {
 		return new ClanMate[var1]; // L: 31
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;S)V",
-		garbageValue = "-10629"
+		garbageValue = "256"
 	)
 	@Export("readName")
 	final void readName(String var1) {
-		this.name = GrandExchangeOffer.method5751(var1); // L: 35
-	} // L: 36
+		String var3 = UserComparator7.base37DecodeLong(class306.method5788(var1)); // L: 37
+		if (var3 == null) {
+			var3 = ""; // L: 38
+		}

-	@ObfuscatedName("v")
+		this.name = var3; // L: 41
+	} // L: 42
+
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(Ljava/lang/String;I)V",
-		garbageValue = "1770567295"
+		garbageValue = "1041352742"
 	)
 	@Export("setOwner")
 	final void setOwner(String var1) {
-		this.owner = GrandExchangeOffer.method5751(var1); // L: 39
-	} // L: 40
+		String var3 = UserComparator7.base37DecodeLong(class306.method5788(var1)); // L: 47
+		if (var3 == null) {
+			var3 = ""; // L: 48
+		}

-	@ObfuscatedName("a")
+		this.owner = var3; // L: 51
+	} // L: 52
+
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;B)V",
-		garbageValue = "-26"
+		descriptor = "(Lpd;I)V",
+		garbageValue = "-1861333718"
 	)
 	@Export("readUpdate")
 	public final void readUpdate(Buffer var1) {
-		this.setOwner(var1.readStringCp1252NullTerminated()); // L: 43
-		long var2 = var1.readLong(); // L: 44
-		this.readName(AbstractByteArrayCopier.method5309(var2)); // L: 45
-		this.minKick = var1.readByte(); // L: 46
-		int var4 = var1.readUnsignedByte(); // L: 47
-		if (var4 != 255) { // L: 48
-			this.clear(); // L: 49
+		this.setOwner(var1.readStringCp1252NullTerminated()); // L: 55
+		long var2 = var1.readLong(); // L: 56
+		this.readName(WorldMapArea.method4648(var2)); // L: 57
+		this.minKick = var1.readByte(); // L: 58
+		int var4 = var1.readUnsignedByte(); // L: 59
+		if (var4 != 255) { // L: 60
+			this.clear(); // L: 61

-			for (int var5 = 0; var5 < var4; ++var5) { // L: 50
-				ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 51
-				int var7 = var1.readUnsignedShort(); // L: 52
-				var6.set(var7, ++this.field4143 - 1); // L: 53
-				var6.rank = var1.readByte(); // L: 54
-				var1.readStringCp1252NullTerminated(); // L: 55
-				this.isLocalPlayer(var6); // L: 56
+			for (int var5 = 0; var5 < var4; ++var5) { // L: 62
+				ClanMate var6 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType)); // L: 63
+				int var7 = var1.readUnsignedShort(); // L: 64
+				var6.set(var7, ++this.field4252 - 1); // L: 65
+				var6.rank = var1.readByte(); // L: 66
+				var1.readStringCp1252NullTerminated(); // L: 67
+				this.isLocalPlayer(var6); // L: 68
 			}

 		}
-	} // L: 58
+	} // L: 70

-	@ObfuscatedName("y")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(Lpi;I)V",
-		garbageValue = "496706080"
+		descriptor = "(Lpd;S)V",
+		garbageValue = "24300"
 	)
-	public final void method6299(Buffer var1) {
-		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 61
-		int var3 = var1.readUnsignedShort(); // L: 62
-		byte var4 = var1.readByte(); // L: 63
-		boolean var5 = false; // L: 64
-		if (var4 == -128) { // L: 65
+	public final void method6718(Buffer var1) {
+		Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType); // L: 73
+		int var3 = var1.readUnsignedShort(); // L: 74
+		byte var4 = var1.readByte(); // L: 75
+		boolean var5 = false; // L: 76
+		if (var4 == -128) { // L: 77
 			var5 = true;
 		}

 		ClanMate var6;
-		if (var5) { // L: 66
-			if (this.getSize() == 0) { // L: 67
+		if (var5) { // L: 78
+			if (this.getSize() == 0) { // L: 79
 				return;
 			}

-			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 68
-			if (var6 != null && var6.getWorld() == var3) { // L: 69
-				this.remove(var6); // L: 70
+			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 80
+			if (var6 != null && var6.getWorld() == var3) { // L: 81
+				this.remove(var6); // L: 82
 			}
 		} else {
-			var1.readStringCp1252NullTerminated(); // L: 74
-			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 75
-			if (var6 == null) { // L: 76
-				if (this.getSize() > super.capacity) { // L: 77
+			var1.readStringCp1252NullTerminated(); // L: 86
+			var6 = (ClanMate)this.getByCurrentUsername(var2); // L: 87
+			if (var6 == null) { // L: 88
+				if (this.getSize() > super.capacity) { // L: 89
 					return;
 				}

-				var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 78
+				var6 = (ClanMate)this.addLastNoPreviousUsername(var2); // L: 90
 			}

-			var6.set(var3, ++this.field4143 - 1); // L: 80
-			var6.rank = var4; // L: 81
-			this.isLocalPlayer(var6); // L: 82
-		}
-
-	} // L: 84
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "143838083"
-	)
-	@Export("clearFriends")
-	public final void clearFriends() {
-		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 87
-			((ClanMate)this.get(var1)).clearIsFriend(); // L: 88
-		}
-
-	} // L: 90
-
-	@ObfuscatedName("h")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "-1946048984"
-	)
-	@Export("invalidateIgnoreds")
-	public final void invalidateIgnoreds() {
-		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 93
-			((ClanMate)this.get(var1)).clearIsIgnored(); // L: 94
+			var6.set(var3, ++this.field4252 - 1); // L: 92
+			var6.rank = var4; // L: 93
+			this.isLocalPlayer(var6); // L: 94
 		}

 	} // L: 96

-	@ObfuscatedName("q")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(Lmm;I)V",
-		garbageValue = "1351635925"
+		descriptor = "(I)V",
+		garbageValue = "5720718"
 	)
-	@Export("isLocalPlayer")
-	final void isLocalPlayer(ClanMate var1) {
-		if (var1.getUsername().equals(this.localUser.username())) { // L: 99
-			this.rank = var1.rank;
+	@Export("clearFriends")
+	public final void clearFriends() {
+		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 99
+			((ClanMate)this.get(var1)).clearIsFriend(); // L: 100
 		}

-	} // L: 100
+	} // L: 102
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		descriptor = "(B)V",
+		garbageValue = "6"
+	)
+	@Export("invalidateIgnoreds")
+	public final void invalidateIgnoreds() {
+		for (int var1 = 0; var1 < this.getSize(); ++var1) { // L: 105
+			((ClanMate)this.get(var1)).clearIsIgnored(); // L: 106
+		}
+
+	} // L: 108

 	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lok;B)I",
-		garbageValue = "1"
+		descriptor = "(Lnp;B)V",
+		garbageValue = "-104"
 	)
-	public static final int method6330(LoginType var0) {
-		if (var0 == null) { // L: 16
-			return 12; // L: 17
-		} else {
-			switch(var0.field4456) { // L: 19
-			case 1:
-				return 20; // L: 23
-			default:
-				return 12; // L: 21
-			}
+	@Export("isLocalPlayer")
+	final void isLocalPlayer(ClanMate var1) {
+		if (var1.getUsername().equals(this.localUser.username())) { // L: 111
+			this.rank = var1.rank;
 		}
-	}
+
+	} // L: 112
 }