chore: revision 189

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

@@ -4,120 +4,114 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("il")
+@ObfuscatedName("jv")
 @Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("t")
+	@ObfuscatedName("x")
 	@ObfuscatedSignature(
-		signature = "Lii;"
+		signature = "Liy;"
 	)
-	public static AbstractArchive field3329;
-	@ObfuscatedName("o")
+	@Export("HitSplatDefinition_archive")
+	public static AbstractArchive HitSplatDefinition_archive;
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "Lii;"
+		signature = "Liy;"
 	)
-	@Export("HitSplatDefinition_fontsArchive")
-	public static AbstractArchive HitSplatDefinition_fontsArchive;
-	@ObfuscatedName("e")
+	public static AbstractArchive field3322;
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "Leh;"
+		signature = "Leg;"
 	)
 	@Export("HitSplatDefinition_cached")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("i")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
-		signature = "Leh;"
+		signature = "Leg;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("g")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "Leh;"
+		signature = "Leg;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
 	public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("hs")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = -1943215083
-	)
-	@Export("cameraX")
-	static int cameraX;
-	@ObfuscatedName("h")
-	@ObfuscatedGetter(
-		intValue = -36563091
+		intValue = -1275511307
 	)
 	@Export("fontId")
 	int fontId;
-	@ObfuscatedName("v")
+	@ObfuscatedName("n")
 	@ObfuscatedGetter(
-		intValue = -549916475
+		intValue = 1688289147
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -795329979
-	)
-	public int field3328;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 2007057893
-	)
-	int field3339;
-	@ObfuscatedName("w")
-	@ObfuscatedGetter(
-		intValue = 1439710291
-	)
-	int field3324;
-	@ObfuscatedName("k")
-	@ObfuscatedGetter(
-		intValue = -378798801
-	)
-	int field3331;
-	@ObfuscatedName("q")
-	@ObfuscatedGetter(
-		intValue = -403504011
-	)
-	int field3332;
-	@ObfuscatedName("z")
-	@ObfuscatedGetter(
-		intValue = 1748437233
-	)
-	public int field3323;
-	@ObfuscatedName("y")
-	@ObfuscatedGetter(
-		intValue = 1149201175
-	)
-	public int field3334;
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = -600429647
-	)
-	public int field3335;
-	@ObfuscatedName("b")
-	String field3322;
-	@ObfuscatedName("r")
-	@ObfuscatedGetter(
-		intValue = -960133159
-	)
-	public int field3337;
-	@ObfuscatedName("s")
-	@ObfuscatedGetter(
-		intValue = 465425557
-	)
-	public int field3338;
-	@ObfuscatedName("a")
-	@Export("transforms")
-	public int[] transforms;
 	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1372204811
+		intValue = 500240173
+	)
+	public int field3329;
+	@ObfuscatedName("h")
+	@ObfuscatedGetter(
+		intValue = -1934317107
+	)
+	int field3330;
+	@ObfuscatedName("g")
+	@ObfuscatedGetter(
+		intValue = -26542295
+	)
+	int field3331;
+	@ObfuscatedName("i")
+	@ObfuscatedGetter(
+		intValue = -907663429
+	)
+	int field3332;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = 1874324581
+	)
+	int field3333;
+	@ObfuscatedName("b")
+	@ObfuscatedGetter(
+		intValue = 1914060719
+	)
+	public int field3338;
+	@ObfuscatedName("l")
+	@ObfuscatedGetter(
+		intValue = 56695995
+	)
+	public int field3341;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -990470317
+	)
+	public int field3334;
+	@ObfuscatedName("o")
+	String field3337;
+	@ObfuscatedName("c")
+	@ObfuscatedGetter(
+		intValue = 1652547133
+	)
+	public int field3327;
+	@ObfuscatedName("j")
+	@ObfuscatedGetter(
+		intValue = -6083753
+	)
+	public int field3339;
+	@ObfuscatedName("y")
+	@Export("transforms")
+	public int[] transforms;
+	@ObfuscatedName("f")
+	@ObfuscatedGetter(
+		intValue = 752219759
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
 	@ObfuscatedName("ae")
 	@ObfuscatedGetter(
-		intValue = 1090071963
+		intValue = -250584565
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -128,31 +122,31 @@ public class HitSplatDefinition extends DualNode {
 		HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
 	}
 
-	public HitSplatDefinition() {
+	HitSplatDefinition() {
 		this.fontId = -1;
 		this.textColor = 16777215;
-		this.field3328 = 70;
-		this.field3339 = -1;
-		this.field3324 = -1;
+		this.field3329 = 70;
+		this.field3330 = -1;
 		this.field3331 = -1;
 		this.field3332 = -1;
-		this.field3323 = 0;
-		this.field3334 = 0;
-		this.field3335 = -1;
-		this.field3322 = "";
-		this.field3337 = -1;
+		this.field3333 = -1;
 		this.field3338 = 0;
+		this.field3341 = 0;
+		this.field3334 = -1;
+		this.field3337 = "";
+		this.field3327 = -1;
+		this.field3339 = 0;
 		this.transformVarbit = -1;
 		this.transformVarp = -1;
 	}
 
-	@ObfuscatedName("c")
+	@ObfuscatedName("m")
 	@ObfuscatedSignature(
-		signature = "(Lkp;I)V",
-		garbageValue = "1729846192"
+		signature = "(Lkb;I)V",
+		garbageValue = "1621555289"
 	)
 	@Export("decode")
-	public void decode(Buffer var1) {
+	void decode(Buffer var1) {
 		while (true) {
 			int var2 = var1.readUnsignedByte();
 			if (var2 == 0) {
@@ -163,41 +157,41 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("t")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		signature = "(Lkp;II)V",
-		garbageValue = "-1144577894"
+		signature = "(Lkb;II)V",
+		garbageValue = "575571509"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) {
-			this.fontId = var1.method5593();
+			this.fontId = var1.method5591();
 		} else if (var2 == 2) {
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) {
-			this.field3339 = var1.method5593();
+			this.field3330 = var1.method5591();
 		} else if (var2 == 4) {
-			this.field3331 = var1.method5593();
+			this.field3332 = var1.method5591();
 		} else if (var2 == 5) {
-			this.field3324 = var1.method5593();
+			this.field3331 = var1.method5591();
 		} else if (var2 == 6) {
-			this.field3332 = var1.method5593();
+			this.field3333 = var1.method5591();
 		} else if (var2 == 7) {
-			this.field3323 = var1.readShort();
-		} else if (var2 == 8) {
-			this.field3322 = var1.readStringCp1252NullCircumfixed();
-		} else if (var2 == 9) {
-			this.field3328 = var1.readUnsignedShort();
-		} else if (var2 == 10) {
-			this.field3334 = var1.readShort();
-		} else if (var2 == 11) {
-			this.field3335 = 0;
-		} else if (var2 == 12) {
-			this.field3337 = var1.readUnsignedByte();
-		} else if (var2 == 13) {
 			this.field3338 = var1.readShort();
+		} else if (var2 == 8) {
+			this.field3337 = var1.readStringCp1252NullCircumfixed();
+		} else if (var2 == 9) {
+			this.field3329 = var1.readUnsignedShort();
+		} else if (var2 == 10) {
+			this.field3341 = var1.readShort();
+		} else if (var2 == 11) {
+			this.field3334 = 0;
+		} else if (var2 == 12) {
+			this.field3327 = var1.readUnsignedByte();
+		} else if (var2 == 13) {
+			this.field3339 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field3335 = var1.readUnsignedShort();
+			this.field3334 = var1.readUnsignedShort();
 		} else if (var2 == 17 || var2 == 18) {
 			this.transformVarbit = var1.readUnsignedShort();
 			if (this.transformVarbit == 65535) {
@@ -232,16 +226,16 @@ public class HitSplatDefinition extends DualNode {
 
 	}
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		signature = "(B)Lil;",
-		garbageValue = "105"
+		signature = "(I)Ljv;",
+		garbageValue = "-951570117"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1;
 		if (this.transformVarbit != -1) {
-			var1 = GrandExchangeOfferUnitPriceComparator.getVarbit(this.transformVarbit);
+			var1 = Projectile.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) {
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -253,36 +247,17 @@ public class HitSplatDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}
 
-		if (var2 != -1) {
-			HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2);
-			HitSplatDefinition var3;
-			if (var4 != null) {
-				var3 = var4;
-			} else {
-				byte[] var5 = class49.HitSplatDefinition_archive.takeFile(32, var2);
-				var4 = new HitSplatDefinition();
-				if (var5 != null) {
-					var4.decode(new Buffer(var5));
-				}
-
-				HitSplatDefinition_cached.put(var4, (long)var2);
-				var3 = var4;
-			}
-
-			return var3;
-		} else {
-			return null;
-		}
+		return var2 != -1 ? GrandExchangeOfferUnitPriceComparator.method213(var2) : null;
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("w")
 	@ObfuscatedSignature(
 		signature = "(II)Ljava/lang/String;",
-		garbageValue = "1185099535"
+		garbageValue = "-940233797"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field3322;
+		String var2 = this.field3337;
 
 		while (true) {
 			int var3 = var2.indexOf("%1");
@@ -290,26 +265,26 @@ public class HitSplatDefinition extends DualNode {
 				return var2;
 			}
 
-			var2 = var2.substring(0, var3) + ItemContainer.intToString(var1, false) + var2.substring(var3 + 2);
+			var2 = var2.substring(0, var3) + class280.intToString(var1, false) + var2.substring(var3 + 2);
 		}
 	}
 
-	@ObfuscatedName("i")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		signature = "(I)Llt;",
-		garbageValue = "1146038763"
+		signature = "(I)Lla;",
+		garbageValue = "1656176054"
 	)
-	public Sprite method4649() {
-		if (this.field3339 < 0) {
+	public Sprite method4642() {
+		if (this.field3330 < 0) {
 			return null;
 		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3339);
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3330);
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3339, 0);
+				var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3330, 0);
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3339);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3330);
 				}
 
 				return var1;
@@ -317,35 +292,12 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("g")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		signature = "(B)Llt;",
-		garbageValue = "127"
+		signature = "(I)Lla;",
+		garbageValue = "-743591767"
 	)
-	public Sprite method4650() {
-		if (this.field3324 < 0) {
-			return null;
-		} else {
-			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3324);
-			if (var1 != null) {
-				return var1;
-			} else {
-				var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3324, 0);
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3324);
-				}
-
-				return var1;
-			}
-		}
-	}
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		signature = "(B)Llt;",
-		garbageValue = "125"
-	)
-	public Sprite method4651() {
+	public Sprite method4631() {
 		if (this.field3331 < 0) {
 			return null;
 		} else {
@@ -353,7 +305,7 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3331, 0);
+				var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3331, 0);
 				if (var1 != null) {
 					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3331);
 				}
@@ -363,12 +315,12 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("l")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		signature = "(B)Llt;",
-		garbageValue = "-109"
+		signature = "(I)Lla;",
+		garbageValue = "-1442192880"
 	)
-	public Sprite method4652() {
+	public Sprite method4632() {
 		if (this.field3332 < 0) {
 			return null;
 		} else {
@@ -376,7 +328,7 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3332, 0);
+				var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3332, 0);
 				if (var1 != null) {
 					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3332);
 				}
@@ -386,10 +338,33 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}
 
-	@ObfuscatedName("j")
+	@ObfuscatedName("t")
 	@ObfuscatedSignature(
-		signature = "(I)Lko;",
-		garbageValue = "-643633719"
+		signature = "(I)Lla;",
+		garbageValue = "-2137932181"
+	)
+	public Sprite method4633() {
+		if (this.field3333 < 0) {
+			return null;
+		} else {
+			Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3333);
+			if (var1 != null) {
+				return var1;
+			} else {
+				var1 = MusicPatchNode2.SpriteBuffer_getSprite(field3322, this.field3333, 0);
+				if (var1 != null) {
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3333);
+				}
+
+				return var1;
+			}
+		}
+	}
+
+	@ObfuscatedName("e")
+	@ObfuscatedSignature(
+		signature = "(I)Lkx;",
+		garbageValue = "607832420"
 	)
 	@Export("getFont")
 	public Font getFont() {
@@ -400,12 +375,21 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) {
 				return var1;
 			} else {
-				var1 = FaceNormal.method3335(field3329, HitSplatDefinition_fontsArchive, this.fontId, 0);
-				if (var1 != null) {
-					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
+				AbstractArchive var3 = field3322;
+				AbstractArchive var4 = class296.HitSplatDefinition_fontsArchive;
+				int var5 = this.fontId;
+				Font var2;
+				if (!UserComparator7.method3516(var3, var5, 0)) {
+					var2 = null;
+				} else {
+					var2 = VertexNormal.method3094(var4.takeFile(var5, 0));
 				}
 
-				return var1;
+				if (var2 != null) {
+					HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
+				}
+
+				return var2;
 			}
 		}
 	}