rs-client: Cleanup (#1087)
* rs-client: name SpriteBuffer * rs-client: (re)name spritebuffer methods * rs-client/deob: Add missed @Export's, make updatemappings fix this next time * rs-client: run intellij redundant else inspection * rs-client: invert some script interpreter if's * deob: checkstyle fixes * rs-client: SpriteBuffer_loadSprite -> SpriteBuffer_bufferFile
This commit is contained in:
Lucwousin
GitHub
@@ -122,11 +122,11 @@ public class FriendSystem {
|
||||
final boolean isFriended(Username var1, boolean var2) {
|
||||
if (var1 == null) {
|
||||
return false;
|
||||
} else if (var1.equals(Client.localPlayer.username)) {
|
||||
return true;
|
||||
} else {
|
||||
return this.friendsList.isFriended(var1, var2);
|
||||
}
|
||||
if (var1.equals(Client.localPlayer.username)) {
|
||||
return true;
|
||||
}
|
||||
return this.friendsList.isFriended(var1, var2);
|
||||
}
|
||||
|
||||
@ObfuscatedName("b")
|
||||
@@ -138,9 +138,8 @@ public class FriendSystem {
|
||||
final boolean isIgnored(Username var1) {
|
||||
if (var1 == null) {
|
||||
return false;
|
||||
} else {
|
||||
return this.ignoreList.contains(var1);
|
||||
}
|
||||
return this.ignoreList.contains(var1);
|
||||
}
|
||||
|
||||
@ObfuscatedName("i")
|
||||
@@ -357,138 +356,153 @@ public class FriendSystem {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type();
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
|
||||
}
|
||||
if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
|
||||
}
|
||||
if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
|
||||
}
|
||||
if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
|
||||
}
|
||||
if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
|
||||
}
|
||||
if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice;
|
||||
return 1;
|
||||
} else {
|
||||
int var12;
|
||||
if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var12 = Client.grandExchangeOffers[var3].status();
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var12 = Client.grandExchangeOffers[var3].status();
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var12 = Client.grandExchangeOffers[var3].status();
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var12 = Client.grandExchangeOffers[var3].status();
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0;
|
||||
return 1;
|
||||
} else {
|
||||
boolean var13;
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
|
||||
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
|
||||
if (PendingSpawn.grandExchangeEvents != null) {
|
||||
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13);
|
||||
}
|
||||
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
|
||||
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
|
||||
if (PendingSpawn.grandExchangeEvents != null) {
|
||||
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13);
|
||||
}
|
||||
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
|
||||
HealthBarUpdate.Interpreter_intStackSize -= 2;
|
||||
var13 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] == 1;
|
||||
boolean var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
|
||||
if (PendingSpawn.grandExchangeEvents != null) {
|
||||
Client.GrandExchangeEvents_worldComparator.filterWorlds = var4;
|
||||
PendingSpawn.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13);
|
||||
}
|
||||
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
|
||||
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
|
||||
if (PendingSpawn.grandExchangeEvents != null) {
|
||||
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13);
|
||||
}
|
||||
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
|
||||
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
|
||||
if (PendingSpawn.grandExchangeEvents != null) {
|
||||
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13);
|
||||
}
|
||||
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = PendingSpawn.grandExchangeEvents == null ? 0 : PendingSpawn.grandExchangeEvents.events.size();
|
||||
return 1;
|
||||
} else {
|
||||
GrandExchangeEvent var11;
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.world;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getOfferName();
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName();
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
long var5 = DirectByteArrayCopier.currentTimeMs() - Buddy.field3632 - var11.age;
|
||||
int var7 = (int)(var5 / 3600000L);
|
||||
int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L);
|
||||
int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L);
|
||||
String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10;
|
||||
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var10;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
|
||||
return 1;
|
||||
} else {
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
int var12;
|
||||
if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var12 = Client.grandExchangeOffers[var3].status();
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0;
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var12 = Client.grandExchangeOffers[var3].status();
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0;
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var12 = Client.grandExchangeOffers[var3].status();
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0;
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var12 = Client.grandExchangeOffers[var3].status();
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0;
|
||||
return 1;
|
||||
}
|
||||
boolean var13;
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
|
||||
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
|
||||
if (PendingSpawn.grandExchangeEvents != null) {
|
||||
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
|
||||
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
|
||||
if (PendingSpawn.grandExchangeEvents != null) {
|
||||
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
|
||||
HealthBarUpdate.Interpreter_intStackSize -= 2;
|
||||
var13 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] == 1;
|
||||
boolean var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1;
|
||||
if (PendingSpawn.grandExchangeEvents != null) {
|
||||
Client.GrandExchangeEvents_worldComparator.filterWorlds = var4;
|
||||
PendingSpawn.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
|
||||
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
|
||||
if (PendingSpawn.grandExchangeEvents != null) {
|
||||
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
|
||||
var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
|
||||
if (PendingSpawn.grandExchangeEvents != null) {
|
||||
PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = PendingSpawn.grandExchangeEvents == null ? 0 : PendingSpawn.grandExchangeEvents.events.size();
|
||||
return 1;
|
||||
}
|
||||
GrandExchangeEvent var11;
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.world;
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getOfferName();
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName();
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
long var5 = DirectByteArrayCopier.currentTimeMs() - Buddy.field3632 - var11.age;
|
||||
int var7 = (int)(var5 / 3600000L);
|
||||
int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L);
|
||||
int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L);
|
||||
String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10;
|
||||
Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var10;
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
|
||||
return 1;
|
||||
}
|
||||
if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
|
||||
var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
|
||||
var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3);
|
||||
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
|
||||
return 1;
|
||||
}
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user