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

more RSClient refactoring

Browse Source
This commit is contained in:
Lucas
2019-07-08 22:41:26 +02:00
parent 112a2bcba7
commit ad565d3991
80 changed files with 714 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
runescape-client/src/main/java/MilliClock.java
View File

@@ -130,14 +130,15 @@ public class MilliClock extends Clock {
signature = "([Lbt;II[I[II)V",
garbageValue = "-1374398116"
)
static void method3400(World[] var0, int var1, int var2, int[] var3, int[] var4) {
if (var1 < var2) {
int var5 = var1 - 1;
int var6 = var2 + 1;
int var7 = (var2 + var1) / 2;
World var8 = var0[var7];
var0[var7] = var0[var1];
var0[var1] = var8;
@Export("sortWorlds")
static void sortWorlds(World[] worlds, int lowestUnsorted, int highestUnsorted, int[] sortOption1, int[] sortOption2) {
if (lowestUnsorted < highestUnsorted) {
int var5 = lowestUnsorted - 1;
int var6 = highestUnsorted + 1;
int var7 = (highestUnsorted + lowestUnsorted) / 2;
World var8 = worlds[var7];
worlds[var7] = worlds[lowestUnsorted];
worlds[lowestUnsorted] = var8;
while (var5 < var6) {
boolean var9 = true;
@@ -149,29 +150,29 @@ public class MilliClock extends Clock {
--var6;
for (var10 = 0; var10 < 4; ++var10) {
if (var3[var10] == 2) {
var11 = var0[var6].index;
if (sortOption1[var10] == 2) {
var11 = worlds[var6].index;
var12 = var8.index;
} else if (var3[var10] == 1) {
var11 = var0[var6].population;
} else if (sortOption1[var10] == 1) {
var11 = worlds[var6].population;
var12 = var8.population;
if (var11 == -1 && var4[var10] == 1) {
if (var11 == -1 && sortOption2[var10] == 1) {
var11 = 2001;
}
if (var12 == -1 && var4[var10] == 1) {
if (var12 == -1 && sortOption2[var10] == 1) {
var12 = 2001;
}
} else if (var3[var10] == 3) {
var11 = var0[var6].isMembersOnly() ? 1 : 0;
} else if (sortOption1[var10] == 3) {
var11 = worlds[var6].isMembersOnly() ? 1 : 0;
var12 = var8.isMembersOnly() ? 1 : 0;
} else {
var11 = var0[var6].id;
var11 = worlds[var6].id;
var12 = var8.id;
}
if (var12 != var11) {
if ((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) {
if ((sortOption2[var10] != 1 || var11 <= var12) && (sortOption2[var10] != 0 || var11 >= var12)) {
var9 = false;
}
break;
@@ -189,29 +190,29 @@ public class MilliClock extends Clock {
++var5;
for (var10 = 0; var10 < 4; ++var10) {
if (var3[var10] == 2) {
var11 = var0[var5].index;
if (sortOption1[var10] == 2) {
var11 = worlds[var5].index;
var12 = var8.index;
} else if (var3[var10] == 1) {
var11 = var0[var5].population;
} else if (sortOption1[var10] == 1) {
var11 = worlds[var5].population;
var12 = var8.population;
if (var11 == -1 && var4[var10] == 1) {
if (var11 == -1 && sortOption2[var10] == 1) {
var11 = 2001;
}
if (var12 == -1 && var4[var10] == 1) {
if (var12 == -1 && sortOption2[var10] == 1) {
var12 = 2001;
}
} else if (var3[var10] == 3) {
var11 = var0[var5].isMembersOnly() ? 1 : 0;
} else if (sortOption1[var10] == 3) {
var11 = worlds[var5].isMembersOnly() ? 1 : 0;
var12 = var8.isMembersOnly() ? 1 : 0;
} else {
var11 = var0[var5].id;
var11 = worlds[var5].id;
var12 = var8.id;
}
if (var11 != var12) {
if ((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) {
if ((sortOption2[var10] != 1 || var11 >= var12) && (sortOption2[var10] != 0 || var11 <= var12)) {
var9 = false;
}
break;
@@ -224,14 +225,14 @@ public class MilliClock extends Clock {
} while(var9);
if (var5 < var6) {
World var13 = var0[var5];
var0[var5] = var0[var6];
var0[var6] = var13;
World var13 = worlds[var5];
worlds[var5] = worlds[var6];
worlds[var6] = var13;
}
}
method3400(var0, var1, var6, var3, var4);
method3400(var0, var6 + 1, var2, var3, var4);
sortWorlds(worlds, lowestUnsorted, var6, sortOption1, sortOption2);
sortWorlds(worlds, var6 + 1, highestUnsorted, sortOption1, sortOption2);
}
}