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

rs-client: Cleanup (#1087)

Browse Source 
* 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
2019-07-23 19:43:31 +02:00
committed by GitHub
parent 61b4531a0d
commit 596689a4f7
175 changed files with 9825 additions and 9776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
runescape-client/src/main/java/Timer.java
View File

@@ -182,35 +182,35 @@ public class Timer {
public static String method5015(CharSequence[] var0, int var1, int var2) {
if (var2 == 0) {
return "";
} else if (var2 == 1) {
}
if (var2 == 1) {
CharSequence var3 = var0[var1];
return var3 == null ? "null" : var3.toString();
} else {
int var8 = var2 + var1;
int var4 = 0;
for (int var5 = var1; var5 < var8; ++var5) {
CharSequence var6 = var0[var5];
if (var6 == null) {
var4 += 4;
} else {
var4 += var6.length();
}
}
StringBuilder var9 = new StringBuilder(var4);
for (int var10 = var1; var10 < var8; ++var10) {
CharSequence var7 = var0[var10];
if (var7 == null) {
var9.append("null");
} else {
var9.append(var7);
}
}
return var9.toString();
}
int var8 = var2 + var1;
int var4 = 0;
for (int var5 = var1; var5 < var8; ++var5) {
CharSequence var6 = var0[var5];
if (var6 == null) {
var4 += 4;
} else {
var4 += var6.length();
}
}
StringBuilder var9 = new StringBuilder(var4);
for (int var10 = var1; var10 < var8; ++var10) {
CharSequence var7 = var0[var10];
if (var7 == null) {
var9.append("null");
} else {
var9.append(var7);
}
}
return var9.toString();
}
@ObfuscatedName("ed")
@@ -491,67 +491,67 @@ public class Timer {
} else if (Client.titleLoadingStage == 80) {
var0 = 0;
if (Message.compass == null) {
Message.compass = class65.loadSprite(Client.archive8, UserComparator6.spriteIds.compass, 0);
Message.compass = class65.SpriteBuffer_getSprite(Client.archive8, UserComparator6.spriteIds.compass, 0);
} else {
++var0;
}
if (UserComparator4.redHintArrowSprite == null) {
UserComparator4.redHintArrowSprite = class65.loadSprite(Client.archive8, UserComparator6.spriteIds.field3823, 0);
UserComparator4.redHintArrowSprite = class65.SpriteBuffer_getSprite(Client.archive8, UserComparator6.spriteIds.field3823, 0);
} else {
++var0;
}
if (ClanChat.mapSceneSprites == null) {
ClanChat.mapSceneSprites = class289.method5281(Client.archive8, UserComparator6.spriteIds.mapScenes, 0);
ClanChat.mapSceneSprites = class289.SpriteBuffer_getIndexedSpriteArray(Client.archive8, UserComparator6.spriteIds.mapScenes, 0);
} else {
++var0;
}
if (UserComparator3.headIconPkSprites == null) {
UserComparator3.headIconPkSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.headIconsPk, 0);
UserComparator3.headIconPkSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.headIconsPk, 0);
} else {
++var0;
}
if (SoundCache.headIconPrayerSprites == null) {
SoundCache.headIconPrayerSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.field3830, 0);
SoundCache.headIconPrayerSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3830, 0);
} else {
++var0;
}
if (class173.headIconHintSprites == null) {
class173.headIconHintSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.field3827, 0);
class173.headIconHintSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3827, 0);
} else {
++var0;
}
if (WorldMapData_1.mapMarkerSprites == null) {
WorldMapData_1.mapMarkerSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.field3828, 0);
WorldMapData_1.mapMarkerSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3828, 0);
} else {
++var0;
}
if (Occluder.crossSprites == null) {
Occluder.crossSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.field3829, 0);
Occluder.crossSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3829, 0);
} else {
++var0;
}
if (Skills.mapDotSprites == null) {
Skills.mapDotSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.field3832, 0);
Skills.mapDotSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3832, 0);
} else {
++var0;
}
if (GrandExchangeOfferAgeComparator.scrollBarSprites == null) {
GrandExchangeOfferAgeComparator.scrollBarSprites = class289.method5281(Client.archive8, UserComparator6.spriteIds.field3831, 0);
GrandExchangeOfferAgeComparator.scrollBarSprites = class289.SpriteBuffer_getIndexedSpriteArray(Client.archive8, UserComparator6.spriteIds.field3831, 0);
} else {
++var0;
}
if (GrandExchangeOfferNameComparator.modIconSprites == null) {
GrandExchangeOfferNameComparator.modIconSprites = class289.method5281(Client.archive8, UserComparator6.spriteIds.field3822, 0);
GrandExchangeOfferNameComparator.modIconSprites = class289.SpriteBuffer_getIndexedSpriteArray(Client.archive8, UserComparator6.spriteIds.field3822, 0);
} else {
++var0;
}