Merge remote-tracking branch 'upstream/master' into master

Nice insider info btw, be nice if you shared it, so-called "open source" client.
2021-05-28 21:39:25 +01:00
parent a0ae15df6e 04dc76bbfd
commit 38634fcad3
481 changed files with 53410 additions and 51723 deletions
--- a/runescape-client/src/main/java/class258.java
+++ b/runescape-client/src/main/java/class258.java
@@ -1,71 +1,94 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;

-@ObfuscatedName("ib")
+@ObfuscatedName("iy")
 public class class258 {
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;B)I",
-		garbageValue = "-76"
-	)
-	@Export("hashString")
-	public static int hashString(CharSequence var0) {
-		int var1 = var0.length(); // L: 144
-		int var2 = 0; // L: 145
-
-		for (int var3 = 0; var3 < var1; ++var3) { // L: 146
-			var2 = (var2 << 5) - var2 + DirectByteArrayCopier.charToByteCp1252(var0.charAt(var3));
-		}
-
-		return var2; // L: 147
-	}
-
-	@ObfuscatedName("al")
-	@ObfuscatedSignature(
-		descriptor = "(ILci;ZI)I",
-		garbageValue = "209273359"
-	)
-	static int method4787(int var0, Script var1, boolean var2) {
-		if (var0 == ScriptOpcodes.GETWINDOWMODE) { // L: 3425
-			Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = HitSplatDefinition.getWindowedMode(); // L: 3426
-			return 1; // L: 3427
-		} else {
-			int var3;
-			if (var0 == ScriptOpcodes.SETWINDOWMODE) { // L: 3429
-				var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3430
-				if (var3 == 1 || var3 == 2) { // L: 3431
-					class374.setWindowedMode(var3);
-				}
-
-				return 1; // L: 3432
-			} else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { // L: 3434
-				Interpreter.Interpreter_intStack[++WorldMapCacheName.Interpreter_intStackSize - 1] = class12.clientPreferences.windowMode; // L: 3435
-				return 1; // L: 3436
-			} else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { // L: 3438
-				if (var0 == 5310) { // L: 3446
-					--WorldMapCacheName.Interpreter_intStackSize; // L: 3447
-					return 1; // L: 3448
-				} else if (var0 == 5350) { // L: 3450
-					class13.Interpreter_stringStackSize -= 2; // L: 3451
-					--WorldMapCacheName.Interpreter_intStackSize; // L: 3452
-					return 1; // L: 3453
-				} else if (var0 == 5351) { // L: 3455
-					--class13.Interpreter_stringStackSize; // L: 3456
-					return 1; // L: 3457
-				} else {
-					return 2; // L: 3459
-				}
+	@ObfuscatedName("v")
+	@Export("base37DecodeLong")
+	public static String base37DecodeLong(long var0) {
+		if (var0 > 0L && var0 < 6582952005840035281L) { // L: 16
+			if (var0 % 37L == 0L) { // L: 17
+				return null;
 			} else {
-				var3 = Interpreter.Interpreter_intStack[--WorldMapCacheName.Interpreter_intStackSize]; // L: 3439
-				if (var3 == 1 || var3 == 2) { // L: 3440
-					class12.clientPreferences.windowMode = var3; // L: 3441
-					KeyHandler.savePreferences(); // L: 3442
+				int var2 = 0; // L: 18
+
+				for (long var3 = var0; 0L != var3; var3 /= 37L) { // L: 19 20 22
+					++var2; // L: 21
 				}

-				return 1; // L: 3444
+				StringBuilder var5;
+				char var8;
+				for (var5 = new StringBuilder(var2); 0L != var0; var5.append(var8)) { // L: 24 25 34
+					long var6 = var0; // L: 26
+					var0 /= 37L; // L: 27
+					var8 = class305.base37Table[(int)(var6 - 37L * var0)]; // L: 28
+					if (var8 == '_') { // L: 29
+						int var9 = var5.length() - 1; // L: 30
+						var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); // L: 31
+						var8 = 160; // L: 32
+					}
+				}
+
+				var5.reverse(); // L: 36
+				var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); // L: 37
+				return var5.toString(); // L: 38
 			}
+		} else {
+			return null;
 		}
 	}
+
+	@ObfuscatedName("y")
+	@ObfuscatedSignature(
+		descriptor = "(I)[Ljn;",
+		garbageValue = "1808084531"
+	)
+	public static class268[] method4835() {
+		return new class268[]{class268.field3540, class268.field3537, class268.field3538, class268.field3539}; // L: 15
+	}
+
+	@ObfuscatedName("kl")
+	@ObfuscatedSignature(
+		descriptor = "(Lio;I)V",
+		garbageValue = "1084146758"
+	)
+	static final void method4836(Widget var0) {
+		int var1 = var0.contentType; // L: 10993
+		if (var1 == 324) { // L: 10994
+			if (Client.field908 == -1) { // L: 10995
+				Client.field908 = var0.spriteId2; // L: 10996
+				Client.field752 = var0.spriteId; // L: 10997
+			}
+
+			if (Client.playerAppearance.isFemale) { // L: 10999
+				var0.spriteId2 = Client.field908;
+			} else {
+				var0.spriteId2 = Client.field752; // L: 11000
+			}
+
+		} else if (var1 == 325) { // L: 11003
+			if (Client.field908 == -1) { // L: 11004
+				Client.field908 = var0.spriteId2; // L: 11005
+				Client.field752 = var0.spriteId; // L: 11006
+			}
+
+			if (Client.playerAppearance.isFemale) { // L: 11008
+				var0.spriteId2 = Client.field752;
+			} else {
+				var0.spriteId2 = Client.field908; // L: 11009
+			}
+
+		} else if (var1 == 327) { // L: 11012
+			var0.modelAngleX = 150; // L: 11013
+			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11014
+			var0.modelType = 5; // L: 11015
+			var0.modelId = 0; // L: 11016
+		} else if (var1 == 328) { // L: 11019
+			var0.modelAngleX = 150; // L: 11020
+			var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047; // L: 11021
+			var0.modelType = 5; // L: 11022
+			var0.modelId = 1; // L: 11023
+		}
+	} // L: 11001 11010 11017 11024 11026
 }