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

Various mixin/injector additions

Browse Source
This commit is contained in:
Lucas
2019-06-08 11:58:34 +02:00
parent ffcb7b8b45
commit 2c38de7061
37 changed files with 852 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rs-client/src/main/java/Client.java
View File

@@ -4717,7 +4717,7 @@ public final class Client extends GameShell implements Usernamed {
var2 = GameShell.menuY;
var3 = class214.menuWidth;
var4 = AbstractWorldMapIcon.menuHeight;
int var5 = 6116423;
int var5 = 0x5d5447;
Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5);
Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0);
Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0);
@@ -4729,9 +4729,9 @@ public final class Client extends GameShell implements Usernamed {
int var10;
for(var8 = 0; var8 < menuOptionsCount; ++var8) {
var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31;
var10 = 16777215;
var10 = 0xffffff;
if(var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) {
var10 = 16776960;
var10 = 0xffff00;
}
Font var11 = class2.fontBold12;
@@ -4762,9 +4762,9 @@ public final class Client extends GameShell implements Usernamed {
if(gameDrawingMode == 3) {
for(var1 = 0; var1 < rootWidgetCount; ++var1) {
if(__client_oq[var1]) {
Rasterizer2D.Rasterizer2D_moreAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128);
Rasterizer2D.Rasterizer2D_moreAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff00ff, 128);
} else if(__client_ot[var1]) {
Rasterizer2D.Rasterizer2D_moreAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128);
Rasterizer2D.Rasterizer2D_moreAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff0000, 128);
}
}
}

2
rs-client/src/main/java/FontName.java
View File

@@ -581,7 +581,7 @@ public class FontName {
static final void method5635() {
for(int var0 = 0; var0 < Players.Players_count; ++var0) {
Player var1 = Client.players[Players.Players_indices[var0]];
var1.__u_128();
var1.clearIsInClanChat();
}
}

2
rs-client/src/main/java/GrandExchangeOffer.java
View File

@@ -163,7 +163,7 @@ public class GrandExchangeOffer {
static final void method121() {
for(int var0 = 0; var0 < Players.Players_count; ++var0) {
Player var1 = Client.players[Players.Players_indices[var0]];
var1.__q_125();
var1.clearIsFriend();
}
Iterator var2 = Messages.Messages_hashTable.iterator();

24
rs-client/src/main/java/IndexCacheLoader.java
View File

@@ -384,7 +384,7 @@ public class IndexCacheLoader {
var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16776960, 0);
var48 += 15;
var48 += 7;
if(Login.__cu_aw != 4) {
if(Login.loginIndex != 4) {
var0.draw("Login: ", Login.__cu_y + 180 - 110, var48, 16777215, 0);
var49 = 200;
if(ReflectionCheck.clientPreferences.hideUsername) {
@@ -412,7 +412,7 @@ public class IndexCacheLoader {
if(Client.gameState == 10 || Client.gameState == 11) {
Login.__cu_o.__q_496(Login.__cu_y, 171);
short var5;
if(Login.__cu_aw == 0) {
if(Login.loginIndex == 0) {
var47 = 251;
var0.drawCentered("Welcome to RuneScape", Login.__cu_y + 180, var47, 16776960, 0);
var48 = var47 + 30;
@@ -423,7 +423,7 @@ public class IndexCacheLoader {
var24 = Login.__cu_y + 180 + 80;
__bd_u.__q_496(var24 - 73, var5 - 20);
var0.drawLines("Existing User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0);
} else if(Login.__cu_aw == 1) {
} else if(Login.loginIndex == 1) {
var0.drawCentered(Login.Login_response0, Login.__cu_y + 180, 201, 16776960, 0);
var47 = 236;
var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16777215, 0);
@@ -439,7 +439,7 @@ public class IndexCacheLoader {
var24 = Login.__cu_y + 180 + 80;
__bd_u.__q_496(var24 - 73, var5 - 20);
var0.drawCentered("Cancel", var24, var5 + 5, 16777215, 0);
} else if(Login.__cu_aw == 2) {
} else if(Login.loginIndex == 2) {
var47 = 201;
var0.drawCentered(Login.Login_response1, Varps.__hv_h, var47, 16776960, 0);
var48 = var47 + 15;
@@ -504,7 +504,7 @@ public class IndexCacheLoader {
TilePaint.__eb_ah = new Bounds(Varps.__hv_h, var47, var1.stringWidth(AttackOption.__cj_ay), 11);
UrlRequester.__eo_ak = new Bounds(Varps.__hv_h, var47, var1.stringWidth("Still having trouble logging in?"), 11);
var1.drawCentered(AttackOption.__cj_ay, Varps.__hv_h, var47, 16777215, 0);
} else if(Login.__cu_aw == 3) {
} else if(Login.loginIndex == 3) {
var47 = 201;
var0.drawCentered("Invalid credentials.", Login.__cu_y + 180, var47, 16776960, 0);
var48 = var47 + 20;
@@ -522,7 +522,7 @@ public class IndexCacheLoader {
var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0);
} else {
String var26;
if(Login.__cu_aw == 4) {
if(Login.loginIndex == 4) {
var0.drawCentered("Authenticator", Login.__cu_y + 180, 201, 16776960, 0);
var47 = 236;
var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16777215, 0);
@@ -532,7 +532,7 @@ public class IndexCacheLoader {
var0.drawCentered(Login.Login_response3, Login.__cu_y + 180, var48, 16777215, 0);
var48 += 15;
var26 = "PIN: ";
var7 = Login.__cu_ai;
var7 = Login.otp;
var25 = class168.method3450('*', var7.length());
var0.draw(var26 + var25 + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.__cu_y + 180 - 108, var48, 16777215, 0);
var48 -= 8;
@@ -560,7 +560,7 @@ public class IndexCacheLoader {
var1.drawCentered("<u=ff>Can\'t Log In?</u>", Login.__cu_y + 180, var12 + 36, 255, 0);
} else {
short var50;
if(Login.__cu_aw == 5) {
if(Login.loginIndex == 5) {
var0.drawCentered("Forgotten your password?", Login.__cu_y + 180, 201, 16776960, 0);
var47 = 221;
var2.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16776960, 0);
@@ -595,7 +595,7 @@ public class IndexCacheLoader {
var0.drawCentered("Back", var27, var50 + 5, 16777215, 0);
var50 = 356;
var1.drawCentered("Still having trouble logging in?", Varps.__hv_h, var50, 268435455, 0);
} else if(Login.__cu_aw == 6) {
} else if(Login.loginIndex == 6) {
var47 = 201;
var0.drawCentered(Login.Login_response1, Login.__cu_y + 180, var47, 16776960, 0);
var48 = var47 + 15;
@@ -607,7 +607,7 @@ public class IndexCacheLoader {
var5 = 321;
__bd_u.__q_496(var24 - 73, var5 - 20);
var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
} else if(Login.__cu_aw == 7) {
} else if(Login.loginIndex == 7) {
var47 = 216;
var0.drawCentered("Your date of birth isn\'t set.", Login.__cu_y + 180, var47, 16776960, 0);
var48 = var47 + 15;
@@ -622,7 +622,7 @@ public class IndexCacheLoader {
var24 = Login.__cu_y + 180 + 80;
__bd_u.__q_496(var24 - 73, var5 - 20);
var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
} else if(Login.__cu_aw == 8) {
} else if(Login.loginIndex == 8) {
var47 = 216;
var0.drawCentered("Sorry, but your account is not eligible to play.", Login.__cu_y + 180, var47, 16776960, 0);
var48 = var47 + 15;
@@ -637,7 +637,7 @@ public class IndexCacheLoader {
var24 = Login.__cu_y + 180 + 80;
__bd_u.__q_496(var24 - 73, var5 - 20);
var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
} else if(Login.__cu_aw == 12) {
} else if(Login.loginIndex == 12) {
var47 = 201;
String var4 = "";
var26 = "";

6
rs-client/src/main/java/IsaacCipher.java
View File

@@ -267,7 +267,7 @@ public final class IsaacCipher {
} else if(var0 == -1) {
class54.method1089("No response from server.", "Please try using a different world.", "");
} else if(var0 == 3) {
Login.__cu_aw = 3;
Login.loginIndex = 3;
Login.__cu_ac = 1;
} else if(var0 == 4) {
class32.method578(0);
@@ -322,7 +322,7 @@ public final class IsaacCipher {
} else if(var0 == 38) {
class54.method1089("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
} else if(var0 == 55) {
Login.__cu_aw = 8;
Login.loginIndex = 8;
} else {
if(var0 == 56) {
class54.method1089("Enter the 6-digit code generated by your", "authenticator app.", "");
@@ -337,7 +337,7 @@ public final class IsaacCipher {
}
if(var0 == 61) {
Login.__cu_aw = 7;
Login.loginIndex = 7;
} else {
class54.method1089("Unexpected server response", "Please try using a different world.", "");
}

10
rs-client/src/main/java/Login.java
View File

@@ -72,8 +72,8 @@ public class Login {
@ObfuscatedGetter(
intValue = 1861681835
)
@Export("__cu_aw")
static int __cu_aw;
@Export("loginIndex")
static int loginIndex;
@ObfuscatedName("al")
@Export("Login_response0")
static String Login_response0;
@@ -99,8 +99,8 @@ public class Login {
@Export("__cu_ax")
static boolean __cu_ax;
@ObfuscatedName("ai")
@Export("__cu_ai")
static String __cu_ai;
@Export("otp")
static String otp;
@ObfuscatedName("ba")
@Export("__cu_ba")
static boolean __cu_ba;
@@ -157,7 +157,7 @@ public class Login {
Login_loadingText = "";
__cu_aj = -1;
__cu_ac = 1;
__cu_aw = 0;
loginIndex = 0;
Login_response0 = "";
Login_response1 = "";
Login_response2 = "";

2
rs-client/src/main/java/MouseHandler.java
View File

@@ -282,7 +282,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
Login.Login_response1 = "";
Login.Login_response2 = "Enter your username/email & password.";
Login.Login_response3 = "";
Login.__cu_aw = 2;
Login.loginIndex = 2;
if(var0) {
Login.Login_password = "";
}

2
rs-client/src/main/java/NpcDefinition.java
View File

@@ -705,7 +705,7 @@ public class NpcDefinition extends DualNode {
switch(var0) {
case 2:
class54.method1089(Strings.__id_jr, Strings.__id_jv, Strings.__id_ju);
Login.__cu_aw = 6;
Login.loginIndex = 6;
break;
case 3:
class54.method1089("", "Error connecting to server.", "");

10
rs-client/src/main/java/Player.java
View File

@@ -305,7 +305,7 @@ public final class Player extends Actor {
@Export("isFriend")
boolean isFriend() {
if(this.isFriendTriBool == TriBool.TriBool_unknown) {
this.__w_126();
this.checkIsFriend();
}
return this.isFriendTriBool == TriBool.TriBool_true;
@@ -316,8 +316,8 @@ public final class Player extends Actor {
signature = "(I)V",
garbageValue = "-2059706128"
)
@Export("__q_125")
void __q_125() {
@Export("clearIsFriend")
void clearIsFriend() {
this.isFriendTriBool = TriBool.TriBool_unknown;
}
@@ -326,8 +326,8 @@ public final class Player extends Actor {
signature = "(I)V",
garbageValue = "2126310249"
)
@Export("__w_126")
void __w_126() {
@Export("checkIsFriend")
void checkIsFriend() {
this.isFriendTriBool = WorldMapArea.friendSystem.__t_161(this.username)?TriBool.TriBool_true:TriBool.TriBool_false;
}

6
rs-client/src/main/java/class2.java
View File

@@ -59,11 +59,11 @@ final class class2 implements class0 {
static void method27(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2, int var3) {
if(Login.__cu_f) {
if(var3 == 4) {
Login.__cu_aw = 4;
Login.loginIndex = 4;
}
} else {
Login.__cu_aw = var3;
Login.loginIndex = var3;
Rasterizer2D.Rasterizer2D_clear();
byte[] var4 = var0.takeRecordByNames("title.jpg", "");
Login.__cu_g = class27.method438(var4);
@@ -109,7 +109,7 @@ final class class2 implements class0 {
}
class13.__i_af = 0;
Login.__cu_ai = "";
Login.otp = "";
Login.__cu_ba = true;
Login.__cu_bk = false;
if(!ReflectionCheck.clientPreferences.titleMusicDisabled) {

2
rs-client/src/main/java/class32.java
View File

@@ -78,7 +78,7 @@ public class class32 {
garbageValue = "972977798"
)
static void method578(int var0) {
Login.__cu_aw = 12;
Login.loginIndex = 12;
Login.__cu_aj = var0;
}

80
rs-client/src/main/java/class54.java
View File

@@ -190,7 +190,7 @@ public final class class54 {
int var7;
short var8;
if(Login.__cu_aw == 0) {
if(Login.loginIndex == 0) {
boolean var17 = false;
while(Decimator.method2490()) {
@@ -212,7 +212,7 @@ public final class class54 {
Login.Login_response1 = "This is a <col=00ffff>Beta<col=ffffff> world.";
Login.Login_response2 = "Your normal account will not be affected.";
Login.Login_response3 = "";
Login.__cu_aw = 1;
Login.loginIndex = 1;
class196.method3740();
} else if((Client.worldProperties & 4) != 0) {
if((Client.worldProperties & 1024) != 0) {
@@ -226,14 +226,14 @@ public final class class54 {
}
Login.Login_response0 = "Warning!";
Login.__cu_aw = 1;
Login.loginIndex = 1;
class196.method3740();
} else if((Client.worldProperties & 1024) != 0) {
Login.Login_response1 = "This is a <col=ffff00>High Risk<col=ffffff> world.";
Login.Login_response2 = "The Protect Item prayer will";
Login.Login_response3 = "not work on this world.";
Login.Login_response0 = "Warning!";
Login.__cu_aw = 1;
Login.loginIndex = 1;
class196.method3740();
} else {
MouseHandler.method1084(false);
@@ -242,11 +242,11 @@ public final class class54 {
} else {
int var18;
short var20;
if(Login.__cu_aw != 1) {
if(Login.loginIndex != 1) {
boolean var9;
int var10;
short var19;
if(Login.__cu_aw == 2) {
if(Login.loginIndex == 2) {
var19 = 201;
var18 = var19 + 52;
if(var3 == 1 && var16 >= var18 - 12 && var16 < var18 + 2) {
@@ -266,7 +266,7 @@ public final class class54 {
switch(Login.__cu_ac) {
case 1:
method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
Login.__cu_aw = 5;
Login.loginIndex = 5;
return;
case 2:
WorldMapCacheName.method635("https://support.runescape.com/hc/en-gb", true, false);
@@ -296,11 +296,11 @@ public final class class54 {
var7 = Login.__cu_y + 180 + 80;
if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
Login.__cu_aw = 0;
Login.loginIndex = 0;
Login.Login_username = "";
Login.Login_password = "";
class13.__i_af = 0;
Login.__cu_ai = "";
Login.otp = "";
Login.__cu_ba = true;
}
@@ -341,11 +341,11 @@ public final class class54 {
}
if(IndexStoreAction.__ik_cn == 13) {
Login.__cu_aw = 0;
Login.loginIndex = 0;
Login.Login_username = "";
Login.Login_password = "";
class13.__i_af = 0;
Login.__cu_ai = "";
Login.otp = "";
Login.__cu_ba = true;
} else if(Login.currentLoginField == 0) {
if(IndexStoreAction.__ik_cn == 85 && Login.Login_username.length() > 0) {
@@ -394,7 +394,7 @@ public final class class54 {
return;
}
} else if(Login.__cu_aw == 3) {
} else if(Login.loginIndex == 3) {
var18 = Login.__cu_y + 180;
var20 = 276;
if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
@@ -405,23 +405,23 @@ public final class class54 {
var20 = 326;
if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
Login.__cu_aw = 5;
Login.loginIndex = 5;
return;
}
} else {
int var22;
if(Login.__cu_aw == 4) {
if(Login.loginIndex == 4) {
var18 = Login.__cu_y + 180 - 80;
var20 = 321;
if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
Login.__cu_ai.trim();
if(Login.__cu_ai.length() != 6) {
Login.otp.trim();
if(Login.otp.length() != 6) {
method1089("", "Please enter a 6-digit PIN.", "");
return;
}
class13.__i_af = Integer.parseInt(Login.__cu_ai);
Login.__cu_ai = "";
class13.__i_af = Integer.parseInt(Login.otp);
Login.otp = "";
class15.method184(true);
method1089("", "Connecting to server...", "");
GameShell.updateGameState(20);
@@ -438,11 +438,11 @@ public final class class54 {
var18 = Login.__cu_y + 180 + 80;
if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
Login.__cu_aw = 0;
Login.loginIndex = 0;
Login.Login_username = "";
Login.Login_password = "";
class13.__i_af = 0;
Login.__cu_ai = "";
Login.otp = "";
}
while(Decimator.method2490()) {
@@ -456,37 +456,37 @@ public final class class54 {
}
if(IndexStoreAction.__ik_cn == 13) {
Login.__cu_aw = 0;
Login.loginIndex = 0;
Login.Login_username = "";
Login.Login_password = "";
class13.__i_af = 0;
Login.__cu_ai = "";
Login.otp = "";
} else {
if(IndexStoreAction.__ik_cn == 85 && Login.__cu_ai.length() > 0) {
Login.__cu_ai = Login.__cu_ai.substring(0, Login.__cu_ai.length() - 1);
if(IndexStoreAction.__ik_cn == 85 && Login.otp.length() > 0) {
Login.otp = Login.otp.substring(0, Login.otp.length() - 1);
}
if(IndexStoreAction.__ik_cn == 84) {
Login.__cu_ai.trim();
if(Login.__cu_ai.length() != 6) {
Login.otp.trim();
if(Login.otp.length() != 6) {
method1089("", "Please enter a 6-digit PIN.", "");
return;
}
class13.__i_af = Integer.parseInt(Login.__cu_ai);
Login.__cu_ai = "";
class13.__i_af = Integer.parseInt(Login.otp);
Login.otp = "";
class15.method184(true);
method1089("", "Connecting to server...", "");
GameShell.updateGameState(20);
return;
}
if(var21 && Login.__cu_ai.length() < 6) {
Login.__cu_ai = Login.__cu_ai + GzipDecompressor.__go_ck;
if(var21 && Login.otp.length() < 6) {
Login.otp = Login.otp + GzipDecompressor.__go_ck;
}
}
}
} else if(Login.__cu_aw == 5) {
} else if(Login.loginIndex == 5) {
var18 = Login.__cu_y + 180 - 80;
var20 = 321;
if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
@@ -534,7 +534,7 @@ public final class class54 {
}
}
}
} else if(Login.__cu_aw == 6) {
} else if(Login.loginIndex == 6) {
while(true) {
do {
if(!Decimator.method2490()) {
@@ -549,13 +549,13 @@ public final class class54 {
MouseHandler.method1084(true);
}
} else if(Login.__cu_aw == 7) {
} else if(Login.loginIndex == 7) {
var18 = Login.__cu_y + 180 - 80;
var20 = 321;
if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
WorldMapCacheName.method635(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false);
method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
Login.__cu_aw = 6;
Login.loginIndex = 6;
return;
}
@@ -563,13 +563,13 @@ public final class class54 {
if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
MouseHandler.method1084(true);
}
} else if(Login.__cu_aw == 8) {
} else if(Login.loginIndex == 8) {
var18 = Login.__cu_y + 180 - 80;
var20 = 321;
if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
WorldMapCacheName.method635("https://www.jagex.com/terms/privacy/#eight", true, false);
method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
Login.__cu_aw = 6;
Login.loginIndex = 6;
return;
}
@@ -577,7 +577,7 @@ public final class class54 {
if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
MouseHandler.method1084(true);
}
} else if(Login.__cu_aw == 12) {
} else if(Login.loginIndex == 12) {
String var14 = "";
switch(Login.__cu_aj) {
case 0:
@@ -595,7 +595,7 @@ public final class class54 {
if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
WorldMapCacheName.method635(var14, true, false);
method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
Login.__cu_aw = 6;
Login.loginIndex = 6;
return;
}
@@ -611,7 +611,7 @@ public final class class54 {
if(IndexStoreAction.__ik_cn == 84) {
MouseHandler.method1084(false);
} else if(IndexStoreAction.__ik_cn == 13) {
Login.__cu_aw = 0;
Login.loginIndex = 0;
}
}
@@ -623,7 +623,7 @@ public final class class54 {
var18 = Varps.__hv_h + 80;
if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
Login.__cu_aw = 0;
Login.loginIndex = 0;
}
}
}