project: rev 195

2021-04-14 13:14:08 +01:00
parent 05ff44d4ad
commit c9d40d93dd
439 changed files with 55170 additions and 51182 deletions
--- a/runescape-client/src/main/java/HitSplatDefinition.java
+++ b/runescape-client/src/main/java/HitSplatDefinition.java
@@ -4,115 +4,120 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("jz")
+@ObfuscatedName("kt")
@Implements("HitSplatDefinition")
 public class HitSplatDefinition extends DualNode {
-	@ObfuscatedName("n")
+	@ObfuscatedName("f")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Lir;"
 	)
 	@Export("HitSplatDefinition_archive")
 	static AbstractArchive HitSplatDefinition_archive;
-	@ObfuscatedName("d")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "Lig;"
+		descriptor = "Lir;"
+	)
+	static AbstractArchive field3562;
+	@ObfuscatedName("u")
+	@ObfuscatedSignature(
+		descriptor = "Lir;"
 	)
 	@Export("HitSplatDefinition_fontsArchive")
 	static AbstractArchive HitSplatDefinition_fontsArchive;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "Lex;"
+		descriptor = "Lgf;"
 	)
 	@Export("HitSplatDefinition_cached")
 	static EvictingDualNodeHashTable HitSplatDefinition_cached;
-	@ObfuscatedName("y")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "Lex;"
+		descriptor = "Lgf;"
 	)
 	@Export("HitSplatDefinition_cachedSprites")
 	static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
-		descriptor = "Lex;"
+		descriptor = "Lgf;"
 	)
 	@Export("HitSplatDefinition_cachedFonts")
 	static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
-	@ObfuscatedName("b")
+	@ObfuscatedName("m")
 	@ObfuscatedGetter(
-		intValue = -1737800845
+		intValue = -921028973
 	)
 	@Export("fontId")
 	int fontId;
-	@ObfuscatedName("a")
+	@ObfuscatedName("d")
 	@ObfuscatedGetter(
-		intValue = -1895359321
+		intValue = 1347105069
 	)
 	@Export("textColor")
 	public int textColor;
-	@ObfuscatedName("w")
+	@ObfuscatedName("c")
 	@ObfuscatedGetter(
-		intValue = 1681619933
+		intValue = 1413295459
 	)
-	public int field3364;
-	@ObfuscatedName("k")
-	@ObfuscatedGetter(
-		intValue = -334206497
-	)
-	int field3365;
-	@ObfuscatedName("i")
-	@ObfuscatedGetter(
-		intValue = 54312143
-	)
-	int field3366;
-	@ObfuscatedName("x")
-	@ObfuscatedGetter(
-		intValue = 1316651061
-	)
-	int field3367;
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = -2079925537
-	)
-	int field3372;
-	@ObfuscatedName("g")
-	@ObfuscatedGetter(
-		intValue = -2039546161
-	)
-	public int field3378;
-	@ObfuscatedName("u")
-	@ObfuscatedGetter(
-		intValue = 74632649
-	)
-	public int field3370;
-	@ObfuscatedName("t")
-	@ObfuscatedGetter(
-		intValue = -854871663
-	)
-	public int field3371;
-	@ObfuscatedName("p")
-	String field3358;
-	@ObfuscatedName("m")
-	@ObfuscatedGetter(
-		intValue = 1999046971
-	)
-	public int field3375;
-	@ObfuscatedName("r")
-	@ObfuscatedGetter(
-		intValue = 1539092209
-	)
-	public int field3368;
-	@ObfuscatedName("o")
-	@Export("transforms")
-	public int[] transforms;
+	public int field3581;
 	@ObfuscatedName("j")
 	@ObfuscatedGetter(
-		intValue = -979456213
+		intValue = 445711767
+	)
+	int field3573;
+	@ObfuscatedName("r")
+	@ObfuscatedGetter(
+		intValue = -1796599539
+	)
+	int field3577;
+	@ObfuscatedName("q")
+	@ObfuscatedGetter(
+		intValue = -978444857
+	)
+	int field3575;
+	@ObfuscatedName("t")
+	@ObfuscatedGetter(
+		intValue = -215883891
+	)
+	int field3576;
+	@ObfuscatedName("v")
+	@ObfuscatedGetter(
+		intValue = -1377029969
+	)
+	public int field3572;
+	@ObfuscatedName("x")
+	@ObfuscatedGetter(
+		intValue = 1878239229
+	)
+	public int field3584;
+	@ObfuscatedName("z")
+	@ObfuscatedGetter(
+		intValue = 412111735
+	)
+	public int field3579;
+	@ObfuscatedName("i")
+	String field3580;
+	@ObfuscatedName("a")
+	@ObfuscatedGetter(
+		intValue = -700419329
+	)
+	public int field3586;
+	@ObfuscatedName("w")
+	@ObfuscatedGetter(
+		intValue = -1204516257
+	)
+	public int field3582;
+	@ObfuscatedName("s")
+	@Export("transforms")
+	public int[] transforms;
+	@ObfuscatedName("y")
+	@ObfuscatedGetter(
+		intValue = 931180183
 	)
 	@Export("transformVarbit")
 	int transformVarbit;
-	@ObfuscatedName("ay")
+	@ObfuscatedName("ac")
 	@ObfuscatedGetter(
-		intValue = -351254549
+		intValue = -700804289
 	)
 	@Export("transformVarp")
 	int transformVarp;
@@ -126,25 +131,25 @@ public class HitSplatDefinition extends DualNode {
 	HitSplatDefinition() {
 		this.fontId = -1; // L: 26
 		this.textColor = 16777215; // L: 27
-		this.field3364 = 70; // L: 28
-		this.field3365 = -1; // L: 29
-		this.field3366 = -1; // L: 30
-		this.field3367 = -1; // L: 31
-		this.field3372 = -1; // L: 32
-		this.field3378 = 0; // L: 33
-		this.field3370 = 0; // L: 34
-		this.field3371 = -1; // L: 35
-		this.field3358 = ""; // L: 36
-		this.field3375 = -1; // L: 37
-		this.field3368 = 0; // L: 38
+		this.field3581 = 70; // L: 28
+		this.field3573 = -1; // L: 29
+		this.field3577 = -1; // L: 30
+		this.field3575 = -1; // L: 31
+		this.field3576 = -1; // L: 32
+		this.field3572 = 0; // L: 33
+		this.field3584 = 0; // L: 34
+		this.field3579 = -1; // L: 35
+		this.field3580 = ""; // L: 36
+		this.field3586 = -1; // L: 37
+		this.field3582 = 0; // L: 38
 		this.transformVarbit = -1; // L: 40
 		this.transformVarp = -1; // L: 41
 	} // L: 43

-	@ObfuscatedName("d")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(Lkx;I)V",
-		garbageValue = "-1255296319"
+		descriptor = "(Lnu;I)V",
+		garbageValue = "1349410227"
 	)
 	@Export("decode")
 	void decode(Buffer var1) {
@@ -158,41 +163,41 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}

-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@ObfuscatedSignature(
-		descriptor = "(Lkx;IB)V",
-		garbageValue = "12"
+		descriptor = "(Lnu;IB)V",
+		garbageValue = "0"
 	)
 	@Export("decodeNext")
 	void decodeNext(Buffer var1, int var2) {
 		if (var2 == 1) { // L: 70
-			this.fontId = var1.method5833();
+			this.fontId = var1.method6597();
 		} else if (var2 == 2) { // L: 71
 			this.textColor = var1.readMedium();
 		} else if (var2 == 3) { // L: 72
-			this.field3365 = var1.method5833();
+			this.field3573 = var1.method6597();
 		} else if (var2 == 4) { // L: 73
-			this.field3367 = var1.method5833();
+			this.field3575 = var1.method6597();
 		} else if (var2 == 5) { // L: 74
-			this.field3366 = var1.method5833();
+			this.field3577 = var1.method6597();
 		} else if (var2 == 6) { // L: 75
-			this.field3372 = var1.method5833();
+			this.field3576 = var1.method6597();
 		} else if (var2 == 7) { // L: 76
-			this.field3378 = var1.readShort();
+			this.field3572 = var1.readShort();
 		} else if (var2 == 8) { // L: 77
-			this.field3358 = var1.readStringCp1252NullCircumfixed();
+			this.field3580 = var1.readStringCp1252NullCircumfixed();
 		} else if (var2 == 9) { // L: 78
-			this.field3364 = var1.readUnsignedShort();
+			this.field3581 = var1.readUnsignedShort();
 		} else if (var2 == 10) { // L: 79
-			this.field3370 = var1.readShort();
+			this.field3584 = var1.readShort();
 		} else if (var2 == 11) { // L: 80
-			this.field3371 = 0;
+			this.field3579 = 0;
 		} else if (var2 == 12) { // L: 81
-			this.field3375 = var1.readUnsignedByte();
+			this.field3586 = var1.readUnsignedByte();
 		} else if (var2 == 13) { // L: 82
-			this.field3368 = var1.readShort();
+			this.field3582 = var1.readShort();
 		} else if (var2 == 14) {
-			this.field3371 = var1.readUnsignedShort(); // L: 83
+			this.field3579 = var1.readUnsignedShort(); // L: 83
 		} else if (var2 == 17 || var2 == 18) { // L: 84
 			this.transformVarbit = var1.readUnsignedShort(); // L: 85
 			if (this.transformVarbit == 65535) { // L: 86
@@ -227,16 +232,16 @@ public class HitSplatDefinition extends DualNode {

 	} // L: 103

-	@ObfuscatedName("y")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(I)Ljz;",
-		garbageValue = "-718809763"
+		descriptor = "(I)Lkt;",
+		garbageValue = "-1486809095"
 	)
 	@Export("transform")
 	public final HitSplatDefinition transform() {
 		int var1 = -1; // L: 106
 		if (this.transformVarbit != -1) { // L: 107
-			var1 = FontName.getVarbit(this.transformVarbit);
+			var1 = class2.getVarbit(this.transformVarbit);
 		} else if (this.transformVarp != -1) { // L: 108
 			var1 = Varps.Varps_main[this.transformVarp];
 		}
@@ -248,17 +253,17 @@ public class HitSplatDefinition extends DualNode {
 			var2 = this.transforms[this.transforms.length - 1];
 		}

-		return var2 != -1 ? ScriptFrame.method1222(var2) : null; // L: 112 113
+		return var2 != -1 ? StudioGame.method4391(var2) : null; // L: 112 113
 	}

-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(II)Ljava/lang/String;",
-		garbageValue = "1367111183"
+		garbageValue = "1639056635"
 	)
 	@Export("getString")
 	public String getString(int var1) {
-		String var2 = this.field3358; // L: 117
+		String var2 = this.field3580; // L: 117

 		while (true) {
 			int var3 = var2.indexOf("%1"); // L: 119
@@ -266,26 +271,26 @@ public class HitSplatDefinition extends DualNode {
 				return var2; // L: 123
 			}

-			var2 = var2.substring(0, var3) + GrandExchangeOfferOwnWorldComparator.intToString(var1, false) + var2.substring(var3 + 2); // L: 121
+			var2 = var2.substring(0, var3) + WallDecoration.intToString(var1, false) + var2.substring(var3 + 2); // L: 121
 		}
 	}

-	@ObfuscatedName("z")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "(I)Llm;",
-		garbageValue = "-1595522971"
+		descriptor = "(I)Loh;",
+		garbageValue = "-1023418983"
 	)
-	public SpritePixels method4764() {
-		if (this.field3365 < 0) { // L: 127
+	public SpritePixels method5166() {
+		if (this.field3573 < 0) { // L: 127
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3365); // L: 128
-			if (var1 != null) {
-				return var1; // L: 129
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3573); // L: 128
+			if (var1 != null) { // L: 129
+				return var1;
 			} else {
-				var1 = BufferedSource.SpriteBuffer_getSprite(Frames.field1904, this.field3365, 0); // L: 130
+				var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3573, 0); // L: 130
 				if (var1 != null) { // L: 131
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3365);
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3573);
 				}

 				return var1; // L: 133
@@ -293,22 +298,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}

-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
-		descriptor = "(B)Llm;",
-		garbageValue = "49"
+		descriptor = "(I)Loh;",
+		garbageValue = "1414227613"
 	)
-	public SpritePixels method4770() {
-		if (this.field3366 < 0) { // L: 137
+	public SpritePixels method5137() {
+		if (this.field3577 < 0) { // L: 137
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3366); // L: 138
-			if (var1 != null) {
-				return var1; // L: 139
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3577); // L: 138
+			if (var1 != null) { // L: 139
+				return var1;
 			} else {
-				var1 = BufferedSource.SpriteBuffer_getSprite(Frames.field1904, this.field3366, 0); // L: 140
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3366); // L: 141
+				var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3577, 0); // L: 140
+				if (var1 != null) { // L: 141
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3577);
 				}

 				return var1; // L: 143
@@ -316,22 +321,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}

-	@ObfuscatedName("q")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(I)Llm;",
-		garbageValue = "1511725830"
+		descriptor = "(I)Loh;",
+		garbageValue = "-1065428410"
 	)
-	public SpritePixels method4769() {
-		if (this.field3367 < 0) { // L: 147
+	public SpritePixels method5138() {
+		if (this.field3575 < 0) { // L: 147
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3367); // L: 148
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3575); // L: 148
 			if (var1 != null) {
 				return var1; // L: 149
 			} else {
-				var1 = BufferedSource.SpriteBuffer_getSprite(Frames.field1904, this.field3367, 0); // L: 150
-				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3367); // L: 151
+				var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3575, 0); // L: 150
+				if (var1 != null) { // L: 151
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3575);
 				}

 				return var1; // L: 153
@@ -339,22 +344,22 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}

-	@ObfuscatedName("l")
+	@ObfuscatedName("n")
 	@ObfuscatedSignature(
-		descriptor = "(I)Llm;",
-		garbageValue = "-2138481070"
+		descriptor = "(I)Loh;",
+		garbageValue = "-438870038"
 	)
-	public SpritePixels method4766() {
-		if (this.field3372 < 0) { // L: 157
+	public SpritePixels method5157() {
+		if (this.field3576 < 0) { // L: 157
 			return null;
 		} else {
-			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3372); // L: 158
+			SpritePixels var1 = (SpritePixels)HitSplatDefinition_cachedSprites.get((long)this.field3576); // L: 158
 			if (var1 != null) {
 				return var1; // L: 159
 			} else {
-				var1 = BufferedSource.SpriteBuffer_getSprite(Frames.field1904, this.field3372, 0); // L: 160
+				var1 = ModelData0.SpriteBuffer_getSprite(field3562, this.field3576, 0); // L: 160
 				if (var1 != null) {
-					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3372); // L: 161
+					HitSplatDefinition_cachedSprites.put(var1, (long)this.field3576); // L: 161
 				}

 				return var1; // L: 163
@@ -362,10 +367,10 @@ public class HitSplatDefinition extends DualNode {
 		}
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
-		descriptor = "(I)Lkl;",
-		garbageValue = "1442657906"
+		descriptor = "(I)Lkq;",
+		garbageValue = "513658947"
 	)
 	@Export("getFont")
 	public Font getFont() {
@@ -376,108 +381,28 @@ public class HitSplatDefinition extends DualNode {
 			if (var1 != null) { // L: 169
 				return var1;
 			} else {
-				AbstractArchive var3 = Frames.field1904; // L: 171
-				AbstractArchive var4 = HitSplatDefinition_fontsArchive; // L: 172
-				int var5 = this.fontId; // L: 173
-				byte[] var7 = var3.takeFile(var5, 0); // L: 177
-				boolean var6;
-				if (var7 == null) { // L: 178
-					var6 = false; // L: 179
-				} else {
-					GrandExchangeOfferNameComparator.SpriteBuffer_decode(var7); // L: 182
-					var6 = true; // L: 183
+				var1 = class236.method4378(field3562, HitSplatDefinition_fontsArchive, this.fontId, 0); // L: 170
+				if (var1 != null) {
+					HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId); // L: 171
 				}

-				Font var2;
-				if (!var6) { // L: 185
-					var2 = null; // L: 186
-				} else {
-					byte[] var8 = var4.takeFile(var5, 0); // L: 190
-					Font var10;
-					if (var8 == null) { // L: 192
-						var10 = null; // L: 193
-					} else {
-						Font var9 = new Font(var8, class105.SpriteBuffer_xOffsets, class336.SpriteBuffer_yOffsets, class336.SpriteBuffer_spriteWidths, class225.SpriteBuffer_spriteHeights, HorizontalAlignment.SpriteBuffer_spritePalette, class2.SpriteBuffer_pixels); // L: 196
-						class105.SpriteBuffer_xOffsets = null; // L: 198
-						class336.SpriteBuffer_yOffsets = null; // L: 199
-						class336.SpriteBuffer_spriteWidths = null; // L: 200
-						class225.SpriteBuffer_spriteHeights = null; // L: 201
-						HorizontalAlignment.SpriteBuffer_spritePalette = null; // L: 202
-						class2.SpriteBuffer_pixels = null; // L: 203
-						var10 = var9; // L: 205
-					}
-
-					var2 = var10; // L: 207
-				}
-
-				if (var2 != null) { // L: 210
-					HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId);
-				}
-
-				return var2; // L: 212
+				return var1; // L: 173
 			}
 		}
 	}

-	@ObfuscatedName("b")
+	@ObfuscatedName("ed")
 	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)Ljava/lang/String;",
-		garbageValue = "1153896983"
+		descriptor = "(IZZZB)Lig;",
+		garbageValue = "9"
 	)
-	public static String method4768(CharSequence var0) {
-		return ReflectionCheck.method2449('*', var0.length()); // L: 184
-	}
-
-	@ObfuscatedName("ht")
-	@ObfuscatedSignature(
-		descriptor = "(III)V",
-		garbageValue = "-483129503"
-	)
-	@Export("updateItemPile")
-	static final void updateItemPile(int var0, int var1) {
-		NodeDeque var2 = Client.groundItems[class90.Client_plane][var0][var1]; // L: 7523
-		if (var2 == null) { // L: 7524
-			MilliClock.scene.removeGroundItemPile(class90.Client_plane, var0, var1); // L: 7525
-		} else {
-			long var3 = -99999999L; // L: 7528
-			TileItem var5 = null; // L: 7529
-
-			TileItem var6;
-			for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7530 7531 7539
-				ItemComposition var7 = class281.ItemDefinition_get(var6.id); // L: 7532
-				long var11 = (long)var7.price; // L: 7533
-				if (var7.isStackable == 1) {
-					var11 *= (long)(var6.quantity + 1); // L: 7534
-				}
-
-				if (var11 > var3) { // L: 7535
-					var3 = var11; // L: 7536
-					var5 = var6; // L: 7537
-				}
-			}
-
-			if (var5 == null) { // L: 7541
-				MilliClock.scene.removeGroundItemPile(class90.Client_plane, var0, var1); // L: 7542
-			} else {
-				var2.addLast(var5); // L: 7545
-				TileItem var13 = null; // L: 7546
-				TileItem var8 = null; // L: 7547
-
-				for (var6 = (TileItem)var2.last(); var6 != null; var6 = (TileItem)var2.previous()) { // L: 7548 7549 7554
-					if (var5.id != var6.id) { // L: 7550
-						if (var13 == null) { // L: 7551
-							var13 = var6;
-						}
-
-						if (var6.id != var13.id && var8 == null) { // L: 7552
-							var8 = var6;
-						}
-					}
-				}
-
-				long var9 = TextureProvider.calculateTag(var0, var1, 3, false, 0); // L: 7556
-				MilliClock.scene.newGroundItemPile(class90.Client_plane, var0, var1, WorldMapRegion.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, class90.Client_plane), var5, var9, var13, var8); // L: 7557
-			}
+	@Export("newArchive")
+	static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
+		ArchiveDisk var4 = null; // L: 1674
+		if (JagexCache.JagexCache_dat2File != null) { // L: 1675
+			var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, PendingSpawn.JagexCache_idxFiles[var0], 1000000);
 		}
-	} // L: 7526 7543 7558
+
+		return new Archive(var4, FriendLoginUpdate.masterDisk, var0, var1, var2, var3); // L: 1676
+	}
 }