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

Revert "Merge branch 'master' into master"

Browse Source 
This reverts commit 43520c1958, reversing
changes made to 2e7aea3c62.
This commit is contained in:
zeruth
2019-06-22 02:38:35 -04:00
parent 43520c1958
commit c655c9f542
224 changed files with 16901 additions and 17108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
runescape-client/src/main/java/AttackOption.java
View File

@@ -33,7 +33,6 @@ public enum AttackOption implements Enumerated {
)
@Export("AttackOption_hidden")
AttackOption_hidden(3);
@ObfuscatedName("sp")
@Export("__cj_sp")
static short[] __cj_sp;
@@ -53,7 +52,7 @@ public enum AttackOption implements Enumerated {
@Export("id")
final int id;
private AttackOption(int var3) {
AttackOption(int var3) {
this.id = var3;
}
@@ -102,45 +101,45 @@ public enum AttackOption implements Enumerated {
char var9;
if(var7 != 0) {
var9 = (char)var7;
boolean var10 = false;
boolean var14 = false;
} else {
var9 = var0.charAt(var5++);
}
char var14;
char var10;
if(var8 != 0) {
var14 = (char)var8;
boolean var11 = false;
var10 = (char)var8;
boolean var15 = false;
} else {
var14 = var1.charAt(var6++);
var10 = var1.charAt(var6++);
}
byte var16;
byte var11;
if(var9 == 198) {
var16 = 69;
var11 = 69;
} else if(var9 == 230) {
var16 = 101;
var11 = 101;
} else if(var9 == 223) {
var16 = 115;
var11 = 115;
} else if(var9 == 338) {
var16 = 69;
var11 = 69;
} else if(var9 == 339) {
var16 = 101;
var11 = 101;
} else {
var16 = 0;
var11 = 0;
}
var7 = var16;
var7 = var11;
byte var12;
if(var14 == 198) {
if(var10 == 198) {
var12 = 69;
} else if(var14 == 230) {
} else if(var10 == 230) {
var12 = 101;
} else if(var14 == 223) {
} else if(var10 == 223) {
var12 = 115;
} else if(var14 == 338) {
} else if(var10 == 338) {
var12 = 69;
} else if(var14 == 339) {
} else if(var10 == 339) {
var12 = 101;
} else {
var12 = 0;
@@ -148,28 +147,28 @@ public enum AttackOption implements Enumerated {
var8 = var12;
var9 = class12.method155(var9, var2);
var14 = class12.method155(var14, var2);
if(var9 != var14 && Character.toUpperCase(var9) != Character.toUpperCase(var14)) {
var10 = class12.method155(var10, var2);
if(var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) {
var9 = Character.toLowerCase(var9);
var14 = Character.toLowerCase(var14);
if(var14 != var9) {
return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var14, var2);
var10 = Character.toLowerCase(var10);
if(var10 != var9) {
return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var10, var2);
}
}
}
int var15 = Math.min(var3, var4);
int var16 = Math.min(var3, var4);
int var17;
char var18;
for(var17 = 0; var17 < var15; ++var17) {
char var19 = var0.charAt(var17);
var18 = var1.charAt(var17);
if(var18 != var19 && Character.toUpperCase(var19) != Character.toUpperCase(var18)) {
var19 = Character.toLowerCase(var19);
char var20;
for(var17 = 0; var17 < var16; ++var17) {
char var18 = var0.charAt(var17);
var20 = var1.charAt(var17);
if(var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) {
var18 = Character.toLowerCase(var18);
if(var19 != var18) {
return CollisionMap.method3631(var19, var2) - CollisionMap.method3631(var18, var2);
var20 = Character.toLowerCase(var20);
if(var18 != var20) {
return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var20, var2);
}
}
}
@@ -178,11 +177,11 @@ public enum AttackOption implements Enumerated {
if(var17 != 0) {
return var17;
} else {
for(int var20 = 0; var20 < var15; ++var20) {
var18 = var0.charAt(var20);
char var13 = var1.charAt(var20);
if(var18 != var13) {
return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var13, var2);
for(int var19 = 0; var19 < var16; ++var19) {
var20 = var0.charAt(var19);
char var13 = var1.charAt(var19);
if(var20 != var13) {
return CollisionMap.method3631(var20, var2) - CollisionMap.method3631(var13, var2);
}
}
@@ -210,7 +209,7 @@ public enum AttackOption implements Enumerated {
if(var1 >= 24) {
throw new IOException();
}
} catch (Exception var3) {
} catch (Exception var4) {
for(int var2 = 0; var2 < 24; ++var2) {
var0[var2] = -1;
}