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

@@ -3,26 +3,24 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("eb")
+@ObfuscatedName("ei")
 @Implements("StructComposition")
 public class StructComposition extends DualNode {
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "Ljp;"
+		descriptor = "Ljv;"
 	)
 	@Export("StructDefinition_archive")
 	static AbstractArchive StructDefinition_archive;
-	@ObfuscatedName("c")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "Lho;"
+		descriptor = "Lhz;"
 	)
 	@Export("StructDefinition_cached")
 	public static EvictingDualNodeHashTable StructDefinition_cached;
-	@ObfuscatedName("b")
-	static int[][] field1730;
-	@ObfuscatedName("o")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lmo;"
+		descriptor = "Lmr;"
 	)
 	@Export("params")
 	IterableNodeHashTable params;
@@ -34,19 +32,19 @@ public class StructComposition extends DualNode {
 	StructComposition() {
 	} // L: 16
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1773759277"
+		garbageValue = "1000000"
 	)
 	@Export("postDecode")
 	void postDecode() {
-	} // L: 33
+	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("y")
 	@ObfuscatedSignature(
-		descriptor = "(Lnk;S)V",
-		garbageValue = "14298"
+		descriptor = "(Lnd;I)V",
+		garbageValue = "-32029901"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -60,55 +58,90 @@ public class StructComposition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lnk;II)V",
-		garbageValue = "-570855363"
+		descriptor = "(Lnd;II)V",
+		garbageValue = "-1568797940"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 249) {
-			this.params = HealthBar.readStringIntParameters(var1, this.params); // L: 44
+			this.params = ModeWhere.readStringIntParameters(var1, this.params); // L: 44
 		}
 
-	}
+	} // L: 46
 
-	@ObfuscatedName("z")
+	@ObfuscatedName("j")
 	@ObfuscatedSignature(
-		descriptor = "(IIB)I",
-		garbageValue = "89"
+		descriptor = "(III)I",
+		garbageValue = "1766165302"
 	)
 	@Export("getIntParam")
 	public int getIntParam(int var1, int var2) {
-		return GraphicsObject.method1937(this.params, var1, var2); // L: 49
+		return SecureRandomFuture.method1977(this.params, var1, var2); // L: 49
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
-		garbageValue = "-1494986082"
+		garbageValue = "1932867603"
 	)
 	@Export("getStringParam")
 	public String getStringParam(int var1, String var2) {
-		return Varcs.method2326(this.params, var1, var2); // L: 53
+		return FriendsList.method5650(this.params, var1, var2); // L: 53
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "1212560754"
+		descriptor = "(II)Lef;",
+		garbageValue = "1856212739"
 	)
-	public static boolean method2846() {
-		ReflectionCheck var0 = (ReflectionCheck)class69.reflectionChecks.last(); // L: 28
-		return var0 != null; // L: 29
+	@Export("getNpcDefinition")
+	public static NPCComposition getNpcDefinition(int var0) {
+		NPCComposition var1 = (NPCComposition)NPCComposition.NpcDefinition_cached.get((long)var0); // L: 57
+		if (var1 != null) { // L: 58
+			return var1;
+		} else {
+			byte[] var2 = NPCComposition.NpcDefinition_archive.takeFile(9, var0); // L: 59
+			var1 = new NPCComposition(); // L: 60
+			var1.id = var0; // L: 61
+			if (var2 != null) { // L: 62
+				var1.decode(new Buffer(var2));
+			}
+
+			var1.postDecode(); // L: 63
+			NPCComposition.NpcDefinition_cached.put(var1, (long)var0); // L: 64
+			return var1; // L: 65
+		}
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("r")
 	@ObfuscatedSignature(
-		descriptor = "(Lbz;I)V",
-		garbageValue = "-1673250002"
+		descriptor = "(II)Z",
+		garbageValue = "-1621598776"
 	)
-	public static final void method2863(PlayerProvider var0) {
-		Tiles.pcmPlayerProvider = var0; // L: 45
-	} // L: 46
+	public static boolean method2908(int var0) {
+		return (var0 >> 31 & 1) != 0; // L: 33
+	}
+
+	@ObfuscatedName("lr")
+	@ObfuscatedSignature(
+		descriptor = "(Lio;I)Lio;",
+		garbageValue = "1650638386"
+	)
+	static Widget method2892(Widget var0) {
+		int var1 = class18.method213(class21.getWidgetFlags(var0)); // L: 11363
+		if (var1 == 0) { // L: 11364
+			return null;
+		} else {
+			for (int var2 = 0; var2 < var1; ++var2) { // L: 11365
+				var0 = Frames.getWidget(var0.parentId); // L: 11366
+				if (var0 == null) { // L: 11367
+					return null;
+				}
+			}
+
+			return var0; // L: 11369
+		}
+	}
 }