ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'upstream-master' into runelite

Browse Source 
# Conflicts:
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	http-api/pom.xml
#	http-service/pom.xml
#	pom.xml
#	runelite-api/pom.xml
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/events/MenuEntryAdded.java
#	runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/PlayerMenuOptionClicked.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
#	runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
#	runelite-script-assembler-plugin/pom.xml
This commit is contained in:
zeruth
2021-01-29 21:19:28 -05:00
parent 48fdf79e65 e3b0755385
commit 7b0678d0a1
55 changed files with 1763 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
runescape-client/src/main/java/UserComparator8.java
View File

@@ -44,11 +44,11 @@ public class UserComparator8 extends AbstractUserComparator {
@Export("getLoginError")
static void getLoginError(int var0) {
if (var0 == -3) { // L: 2791
GameShell.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
} else if (var0 == -2) { // L: 2792
GameShell.setLoginResponseString("Error connecting to server.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("Error connecting to server.", "Please try using a different world.", "");
} else if (var0 == -1) { // L: 2793
GameShell.setLoginResponseString("No response from server.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("No response from server.", "Please try using a different world.", "");
} else if (var0 == 3) { // L: 2794
Login.loginIndex = 3; // L: 2795
Login.field1190 = 1; // L: 2796
@@ -57,66 +57,66 @@ public class UserComparator8 extends AbstractUserComparator {
Login.field1199 = 0; // L: 2801
} else if (var0 == 5) { // L: 2804
Login.field1190 = 2; // L: 2805
GameShell.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: 2806
GameEngine.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: 2806
} else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2808
if (var0 == 7) { // L: 2811
GameShell.setLoginResponseString("This world is full.", "Please use a different world.", "");
GameEngine.setLoginResponseString("This world is full.", "Please use a different world.", "");
} else if (var0 == 8) { // L: 2812
GameShell.setLoginResponseString("Unable to connect.", "Login server offline.", "");
GameEngine.setLoginResponseString("Unable to connect.", "Login server offline.", "");
} else if (var0 == 9) { // L: 2813
GameShell.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
GameEngine.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
} else if (var0 == 10) { // L: 2814
GameShell.setLoginResponseString("Unable to connect.", "Bad session id.", "");
GameEngine.setLoginResponseString("Unable to connect.", "Bad session id.", "");
} else if (var0 == 11) { // L: 2815
GameShell.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
GameEngine.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
} else if (var0 == 12) { // L: 2816
GameShell.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
GameEngine.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
} else if (var0 == 13) { // L: 2817
GameShell.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
} else if (var0 == 14) { // L: 2818
GameShell.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
GameEngine.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
} else if (var0 == 16) { // L: 2819
GameShell.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
GameEngine.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
} else if (var0 == 17) { // L: 2820
GameShell.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
GameEngine.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: 2821
Login.loginIndex = 12; // L: 2823
Login.field1199 = 1; // L: 2824
} else if (var0 == 19) { // L: 2827
GameShell.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
GameEngine.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
} else if (var0 == 20) { // L: 2828
GameShell.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
} else if (var0 == 22) { // L: 2829
GameShell.setLoginResponseString("Malformed login packet.", "Please try again.", "");
GameEngine.setLoginResponseString("Malformed login packet.", "Please try again.", "");
} else if (var0 == 23) { // L: 2830
GameShell.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
GameEngine.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
} else if (var0 == 24) { // L: 2831
GameShell.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
GameEngine.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
} else if (var0 == 25) { // L: 2832
GameShell.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
} else if (var0 == 26) { // L: 2833
GameShell.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
GameEngine.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
} else if (var0 == 27) { // L: 2834
GameShell.setLoginResponseString("", "Service unavailable.", "");
GameEngine.setLoginResponseString("", "Service unavailable.", "");
} else if (var0 == 31) { // L: 2835
GameShell.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game.");
GameEngine.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) {
GameShell.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2836
GameEngine.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2836
} else if (var0 == 37) { // L: 2837
GameShell.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
GameEngine.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
} else if (var0 == 38) { // L: 2838
GameShell.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
GameEngine.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
} else if (var0 == 55) { // L: 2839
Login.loginIndex = 8; // L: 2840
} else {
if (var0 == 56) { // L: 2842
GameShell.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2843
GameEngine.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2843
WorldMapCacheName.updateGameState(11); // L: 2844
return; // L: 2845
}
if (var0 == 57) { // L: 2847
GameShell.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2848
GameEngine.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2848
WorldMapCacheName.updateGameState(11); // L: 2849
return; // L: 2850
}
@@ -124,11 +124,11 @@ public class UserComparator8 extends AbstractUserComparator {
if (var0 == 61) { // L: 2852
Login.loginIndex = 7; // L: 2853
} else {
GameShell.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2855
GameEngine.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2855
}
}
} else {
GameShell.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2809
GameEngine.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2809
}
WorldMapCacheName.updateGameState(10); // L: 2856