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

Nice insider info btw, be nice if you shared it, so-called "open source" client.
This commit is contained in:
ThatGamerBlue
2021-05-28 21:39:25 +01:00
481 changed files with 53410 additions and 51723 deletions

View File

@@ -3,183 +3,83 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("s")
@ObfuscatedName("t")
public class class22 extends class14 {
@ObfuscatedName("dc")
@ObfuscatedSignature(
descriptor = "Lji;"
)
@Export("archive12")
static Archive archive12;
@ObfuscatedName("h")
@ObfuscatedName("t")
@Export("userHomeDirectory")
public static String userHomeDirectory;
@ObfuscatedName("kh")
@ObfuscatedGetter(
intValue = -518379391
intValue = 1115122599
)
int field187;
@Export("Client_plane")
static int Client_plane;
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = 242899457
)
int field194;
// $FF: synthetic field
@ObfuscatedSignature(
descriptor = "Lo;"
descriptor = "Lf;"
)
final class2 this$0;
@ObfuscatedSignature(
descriptor = "(Lo;)V"
descriptor = "(Lf;)V"
)
class22(class2 var1) {
this.this$0 = var1;
this.field187 = -1; // L: 114
this.field194 = -1; // L: 114
} // L: 116
@ObfuscatedName("h")
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(Lnk;I)V",
garbageValue = "110401227"
descriptor = "(Lnd;I)V",
garbageValue = "-1281352827"
)
void vmethod339(Buffer var1) {
this.field187 = var1.readUnsignedShort(); // L: 119
void vmethod276(Buffer var1) {
this.field194 = var1.readUnsignedShort(); // L: 119
} // L: 120
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(Lx;I)V",
garbageValue = "-1535989118"
descriptor = "(Ll;B)V",
garbageValue = "29"
)
void vmethod338(class11 var1) {
var1.method157(this.field187); // L: 123
void vmethod281(ClanSettings var1) {
var1.method121(this.field194); // L: 123
} // L: 124
@ObfuscatedName("o")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(Lnk;B)Ljava/lang/String;",
garbageValue = "3"
descriptor = "(I)Lhq;",
garbageValue = "-115271413"
)
public static String method299(Buffer var0) {
return ServerPacket.method4314(var0, 32767); // L: 26
}
@ObfuscatedName("ag")
@ObfuscatedSignature(
descriptor = "(ILci;ZI)I",
garbageValue = "1565593981"
)
static int method290(int var0, Script var1, boolean var2) {
if (var0 != 3700 && var0 != 3701) { // L: 2409
if (var0 == 3702) { // L: 2414
++WorldMapCacheName.Interpreter_intStackSize; // L: 2415
return 1; // L: 2416
} else {
return 2; // L: 2418
}
public static PacketBufferNode method247() {
PacketBufferNode var0;
if (PacketBufferNode.PacketBufferNode_packetBufferNodeCount == 0) { // L: 47
var0 = new PacketBufferNode(); // L: 48
} else {
--WorldMapCacheName.Interpreter_intStackSize; // L: 2410
--class13.Interpreter_stringStackSize; // L: 2411
return 1; // L: 2412
}
}
@ObfuscatedName("fs")
@ObfuscatedSignature(
descriptor = "(IB)V",
garbageValue = "38"
)
@Export("getLoginError")
static void getLoginError(int var0) {
if (var0 == -3) { // L: 2943
class44.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
} else if (var0 == -2) { // L: 2944
class44.setLoginResponseString("Error connecting to server.", "Please try using a different world.", "");
} else if (var0 == -1) { // L: 2945
class44.setLoginResponseString("No response from server.", "Please try using a different world.", "");
} else if (var0 == 3) { // L: 2946
Login.loginIndex = 3; // L: 2947
Login.field997 = 1; // L: 2948
} else if (var0 == 4) { // L: 2950
UserComparator7.method2455(0); // L: 2951
} else if (var0 == 5) { // L: 2953
Login.field997 = 2; // L: 2954
class44.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 2955
} else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2957
if (var0 == 7) { // L: 2960
class44.setLoginResponseString("This world is full.", "Please use a different world.", "");
} else if (var0 == 8) { // L: 2961
class44.setLoginResponseString("Unable to connect.", "Login server offline.", "");
} else if (var0 == 9) { // L: 2962
class44.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
} else if (var0 == 10) { // L: 2963
class44.setLoginResponseString("Unable to connect.", "Bad session id.", "");
} else if (var0 == 11) { // L: 2964
class44.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
} else if (var0 == 12) { // L: 2965
class44.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
} else if (var0 == 13) { // L: 2966
class44.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
} else if (var0 == 14) { // L: 2967
class44.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
} else if (var0 == 16) { // L: 2968
class44.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
} else if (var0 == 17) { // L: 2969
class44.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
} else if (var0 == 18) { // L: 2970
UserComparator7.method2455(1); // L: 2971
} else if (var0 == 19) { // L: 2973
class44.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
} else if (var0 == 20) { // L: 2974
class44.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
} else if (var0 == 22) { // L: 2975
class44.setLoginResponseString("Malformed login packet.", "Please try again.", "");
} else if (var0 == 23) { // L: 2976
class44.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
} else if (var0 == 24) { // L: 2977
class44.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
} else if (var0 == 25) { // L: 2978
class44.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
} else if (var0 == 26) { // L: 2979
class44.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
} else if (var0 == 27) { // L: 2980
class44.setLoginResponseString("", "Service unavailable.", "");
} else if (var0 == 31) { // L: 2981
class44.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game.");
} else if (var0 == 32) {
class44.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2982
} else if (var0 == 37) { // L: 2983
class44.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
} else if (var0 == 38) { // L: 2984
class44.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
} else if (var0 == 55) { // L: 2985
Login.loginIndex = 8; // L: 2986
} else {
if (var0 == 56) { // L: 2988
class44.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2989
Client.updateGameState(11); // L: 2990
return; // L: 2991
}
if (var0 == 57) { // L: 2993
class44.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2994
Client.updateGameState(11); // L: 2995
return; // L: 2996
}
if (var0 == 61) { // L: 2998
Login.loginIndex = 7; // L: 2999
} else {
class44.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 3001
}
}
} else {
class44.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2958
var0 = PacketBufferNode.PacketBufferNode_packetBufferNodes[--PacketBufferNode.PacketBufferNode_packetBufferNodeCount]; // L: 51
}
Client.updateGameState(10); // L: 3002
} // L: 3003
var0.clientPacket = null; // L: 54
var0.clientPacketLength = 0; // L: 55
var0.packetBuffer = new PacketBuffer(5000); // L: 56
return var0; // L: 57
}
@ObfuscatedName("kg")
@ObfuscatedName("ii")
@ObfuscatedSignature(
descriptor = "(I)V",
garbageValue = "1530715236"
descriptor = "(III)V",
garbageValue = "188298202"
)
static final void method297() {
Client.field822 = Client.cycleCntr; // L: 11522
Script.field1055 = true; // L: 11523
} // L: 11524
@Export("resumePauseWidget")
static void resumePauseWidget(int var0, int var1) {
PacketBufferNode var2 = class21.getPacketBufferNode(ClientPacket.field2652, Client.packetWriter.isaacCipher); // L: 8662
var2.packetBuffer.method6619(var1); // L: 8663
var2.packetBuffer.writeIntME(var0); // L: 8664
Client.packetWriter.addNode(var2); // L: 8665
} // L: 8666
}