project: rev 192

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

@@ -1,151 +1,190 @@
+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("jx")
+@ObfuscatedName("jn")
+@Implements("NPCDefinition")
 public class NPCDefinition extends DualNode {
-	@ObfuscatedName("z")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lic;"
+		descriptor = "Liw;"
 	)
+	@Export("NpcDefinition_archive")
 	public static AbstractArchive NpcDefinition_archive;
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lic;"
+		descriptor = "Liw;"
 	)
+	@Export("NpcDefinition_modelArchive")
 	public static AbstractArchive NpcDefinition_modelArchive;
-	@ObfuscatedName("s")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "Lel;"
+		descriptor = "Lev;"
 	)
-	public static EvictingDualNodeHashTable NpcDefinition_cached;
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "Lel;"
-	)
-	public static EvictingDualNodeHashTable NpcDefinition_cachedModels;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = -851756363
-	)
-	public int id;
-	@ObfuscatedName("o")
-	public String name;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = -1762851059
-	)
-	public int size;
-	@ObfuscatedName("w")
-	int[] models;
-	@ObfuscatedName("g")
-	int[] field3492;
+	@Export("NpcDefinition_cached")
+	static EvictingDualNodeHashTable NpcDefinition_cached;
 	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = 594093455
+	@ObfuscatedSignature(
+		descriptor = "Lev;"
 	)
+	@Export("NpcDefinition_cachedModels")
+	static EvictingDualNodeHashTable NpcDefinition_cachedModels;
+	@ObfuscatedName("z")
+	@ObfuscatedGetter(
+		intValue = -241449157
+	)
+	@Export("id")
+	public int id;
+	@ObfuscatedName("q")
+	@Export("name")
+	public String name;
+	@ObfuscatedName("k")
+	@ObfuscatedGetter(
+		intValue = 2022516453
+	)
+	@Export("size")
+	public int size;
+	@ObfuscatedName("c")
+	@Export("models")
+	int[] models;
+	@ObfuscatedName("u")
+	int[] field3492;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = 397566937
+	)
+	@Export("idleSequence")
 	public int idleSequence;
+	@ObfuscatedName("e")
+	@ObfuscatedGetter(
+		intValue = 1249905269
+	)
+	@Export("turnLeftSequence")
+	public int turnLeftSequence;
+	@ObfuscatedName("o")
+	@ObfuscatedGetter(
+		intValue = 1539158423
+	)
+	@Export("turnRightSequence")
+	public int turnRightSequence;
 	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = 1970335799
-	)
-	public int turnLeftSequence;
-	@ObfuscatedName("d")
-	@ObfuscatedGetter(
-		intValue = 136881499
-	)
-	public int turnRightSequence;
-	@ObfuscatedName("h")
-	@ObfuscatedGetter(
-		intValue = -1497603669
+		intValue = -1135124357
 	)
+	@Export("walkSequence")
 	public int walkSequence;
-	@ObfuscatedName("a")
+	@ObfuscatedName("x")
 	@ObfuscatedGetter(
-		intValue = -1405079749
+		intValue = -1656626847
 	)
+	@Export("walkBackSequence")
 	public int walkBackSequence;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = -950124131
-	)
-	public int walkLeftSequence;
-	@ObfuscatedName("c")
-	@ObfuscatedGetter(
-		intValue = -1378189657
-	)
-	public int walkRightSequence;
-	@ObfuscatedName("f")
-	short[] recolorFrom;
-	@ObfuscatedName("y")
-	short[] recolorTo;
-	@ObfuscatedName("v")
-	short[] retextureFrom;
-	@ObfuscatedName("j")
-	short[] retextureTo;
-	@ObfuscatedName("r")
-	public String[] actions;
-	@ObfuscatedName("u")
-	public boolean drawMapDot;
 	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -442899961
+		intValue = 2010823165
 	)
+	@Export("walkLeftSequence")
+	public int walkLeftSequence;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = 1791628875
+	)
+	@Export("walkRightSequence")
+	public int walkRightSequence;
+	@ObfuscatedName("y")
+	@Export("recolorFrom")
+	short[] recolorFrom;
+	@ObfuscatedName("s")
+	@Export("recolorTo")
+	short[] recolorTo;
+	@ObfuscatedName("j")
+	@Export("retextureFrom")
+	short[] retextureFrom;
+	@ObfuscatedName("w")
+	@Export("retextureTo")
+	short[] retextureTo;
+	@ObfuscatedName("v")
+	@Export("actions")
+	public String[] actions;
+	@ObfuscatedName("d")
+	@Export("drawMapDot")
+	public boolean drawMapDot;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = 1396717947
+	)
+	@Export("combatLevel")
 	public int combatLevel;
-	@ObfuscatedName("b")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -337235261
+		intValue = 9158797
 	)
+	@Export("widthScale")
 	int widthScale;
-	@ObfuscatedName("l")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = -541213457
+		intValue = -174548931
 	)
+	@Export("heightScale")
 	int heightScale;
-	@ObfuscatedName("e")
+	@ObfuscatedName("i")
+	@Export("isVisible")
 	public boolean isVisible;
 	@ObfuscatedName("ab")
 	@ObfuscatedGetter(
-		intValue = -888518163
+		intValue = 917052789
 	)
+	@Export("ambient")
 	int ambient;
-	@ObfuscatedName("ag")
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = -405765695
+		intValue = -787194049
 	)
+	@Export("contrast")
 	int contrast;
 	@ObfuscatedName("ao")
 	@ObfuscatedGetter(
-		intValue = -1421208063
+		intValue = -1315228899
 	)
+	@Export("headIconPrayer")
 	public int headIconPrayer;
-	@ObfuscatedName("ae")
+	@ObfuscatedName("af")
 	@ObfuscatedGetter(
-		intValue = 754705433
+		intValue = -2018130609
 	)
+	@Export("rotation")
 	public int rotation;
-	@ObfuscatedName("an")
+	@ObfuscatedName("av")
+	@Export("transforms")
 	public int[] transforms;
-	@ObfuscatedName("am")
-	@ObfuscatedGetter(
-		intValue = -1534025905
-	)
-	int transformVarbit;
-	@ObfuscatedName("ap")
-	@ObfuscatedGetter(
-		intValue = -1959008785
-	)
-	int transformVarp;
-	@ObfuscatedName("au")
-	public boolean isInteractable;
-	@ObfuscatedName("aa")
-	public boolean isClickable;
 	@ObfuscatedName("ar")
-	public boolean isFollower;
-	@ObfuscatedName("at")
-	@ObfuscatedSignature(
-		descriptor = "Llq;"
+	@ObfuscatedGetter(
+		intValue = -1301084267
 	)
+	@Export("transformVarbit")
+	int transformVarbit;
+	@ObfuscatedName("ay")
+	@ObfuscatedGetter(
+		intValue = 281561835
+	)
+	@Export("transformVarp")
+	int transformVarp;
+	@ObfuscatedName("ah")
+	@Export("isInteractable")
+	public boolean isInteractable;
+	@ObfuscatedName("az")
+	@Export("isClickable")
+	public boolean isClickable;
+	@ObfuscatedName("ak")
+	@Export("isFollower")
+	public boolean isFollower;
+	@ObfuscatedName("au")
+	@ObfuscatedSignature(
+		descriptor = "Lll;"
+	)
+	@Export("params")
 	IterableNodeHashTable params;
 
 	static {
@@ -180,19 +219,21 @@ public class NPCDefinition extends DualNode {
 		this.isFollower = false; // L: 51
 	} // L: 54
 
-	@ObfuscatedName("k")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
 		descriptor = "(I)V",
-		garbageValue = "-1451445441"
+		garbageValue = "60755671"
 	)
+	@Export("postDecode")
 	void postDecode() {
 	} // L: 68
 
-	@ObfuscatedName("s")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(Lkf;I)V",
-		garbageValue = "289970781"
+		descriptor = "(Lkb;B)V",
+		garbageValue = "1"
 	)
+	@Export("decode")
 	void decode(Buffer var1) {
 		while (true) {
 			int var2 = var1.readUnsignedByte(); // L: 72
@@ -204,11 +245,12 @@ public class NPCDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		descriptor = "(Lkf;II)V",
-		garbageValue = "-1568291099"
+		descriptor = "(Lkb;II)V",
+		garbageValue = "-1883780506"
 	)
+	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		int var3;
 		int var4;
@@ -292,7 +334,7 @@ public class NPCDefinition extends DualNode {
 			} else if (var2 == 111) { // L: 152
 				this.isFollower = true;
 			} else if (var2 == 249) { // L: 153
-				this.params = PacketWriter.readStringIntParameters(var1, this.params);
+				this.params = InvDefinition.readStringIntParameters(var1, this.params);
 			}
 		} else {
 			this.transformVarbit = var1.readUnsignedShort(); // L: 133
@@ -328,11 +370,12 @@ public class NPCDefinition extends DualNode {
 
 	} // L: 155
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(Ljm;ILjm;IB)Ler;",
-		garbageValue = "112"
+		descriptor = "(Ljg;ILjg;II)Leh;",
+		garbageValue = "2096354381"
 	)
+	@Export("getModel")
 	public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
 		if (this.transforms != null) { // L: 158
 			NPCDefinition var12 = this.transform(); // L: 159
@@ -401,11 +444,12 @@ public class NPCDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lee;",
-		garbageValue = "1421247419"
+		descriptor = "(B)Len;",
+		garbageValue = "17"
 	)
+	@Export("getModelData")
 	public final ModelData getModelData() {
 		if (this.transforms != null) { // L: 196
 			NPCDefinition var7 = this.transform(); // L: 197
@@ -455,15 +499,16 @@ public class NPCDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("x")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(I)Ljx;",
-		garbageValue = "795812200"
+		descriptor = "(I)Ljn;",
+		garbageValue = "275766044"
 	)
+	@Export("transform")
 	public final NPCDefinition transform() {
 		int var1 = -1; // L: 224
 		if (this.transformVarbit != -1) { // L: 225
-			var1 = WorldMapSection1.getVarbit(this.transformVarbit);
+			var1 = ApproximateRouteStrategy.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) { // L: 226
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -475,21 +520,22 @@ public class NPCDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		return var2 != -1 ? Skeleton.getNpcDefinition(var2) : null; // L: 230 231
+		return var2 != -1 ? Clock.getNpcDefinition(var2) : null; // L: 230 231
 	}
 
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
 		descriptor = "(I)Z",
-		garbageValue = "140148621"
+		garbageValue = "2069847739"
 	)
+	@Export("transformIsVisible")
 	public boolean transformIsVisible() {
 		if (this.transforms == null) { // L: 235
 			return true;
 		} else {
 			int var1 = -1; // L: 236
 			if (this.transformVarbit != -1) { // L: 237
-				var1 = WorldMapSection1.getVarbit(this.transformVarbit);
+				var1 = ApproximateRouteStrategy.getVarbit(this.transformVarbit);
 			} else if (this.transformVarp != -1) { // L: 238
 				var1 = Varps.Varps_main[this.transformVarp];
 			}
@@ -502,34 +548,36 @@ public class NPCDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(III)I",
-		garbageValue = "1359705510"
+		descriptor = "(IIB)I",
+		garbageValue = "54"
 	)
+	@Export("getIntParam")
 	public int getIntParam(int var1, int var2) {
-		return Username.method5309(this.params, var1, var2); // L: 244
-	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		descriptor = "(ILjava/lang/String;B)Ljava/lang/String;",
-		garbageValue = "77"
-	)
-	public String getStringParam(int var1, String var2) {
-		IterableNodeHashTable var4 = this.params; // L: 249
-		String var3;
-		if (var4 == null) { // L: 251
-			var3 = var2; // L: 252
+		IterableNodeHashTable var4 = this.params; // L: 245
+		int var3;
+		if (var4 == null) { // L: 247
+			var3 = var2; // L: 248
 		} else {
-			ObjectNode var5 = (ObjectNode)var4.get((long)var1); // L: 255
-			if (var5 == null) { // L: 256
-				var3 = var2; // L: 257
+			IntegerNode var5 = (IntegerNode)var4.get((long)var1); // L: 251
+			if (var5 == null) { // L: 252
+				var3 = var2; // L: 253
 			} else {
-				var3 = (String)var5.obj; // L: 260
+				var3 = var5.integer; // L: 256
 			}
 		}
 
-		return var3; // L: 262
+		return var3; // L: 258
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(ILjava/lang/String;I)Ljava/lang/String;",
+		garbageValue = "-1966664867"
+	)
+	@Export("getStringParam")
+	public String getStringParam(int var1, String var2) {
+		return WorldMapSection0.method307(this.params, var1, var2); // L: 262
 	}
 }