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
2019-07-23 19:43:31 +02:00
committed by GitHub
parent 61b4531a0d
commit 596689a4f7
175 changed files with 9825 additions and 9776 deletions

View File

@@ -23,23 +23,29 @@ public class Friend extends Buddy {
int compareToFriend(Friend var1) {
if (super.world == Client.worldId && Client.worldId != var1.world) {
return -1;
} else if (Client.worldId == var1.world && super.world != Client.worldId) {
return 1;
} else if (super.world != 0 && var1.world == 0) {
return -1;
} else if (var1.world != 0 && super.world == 0) {
return 1;
} else if (this.field3650 && !var1.field3650) {
return -1;
} else if (!this.field3650 && var1.field3650) {
return 1;
} else if (this.field3651 && !var1.field3651) {
return -1;
} else if (!this.field3651 && var1.field3651) {
return 1;
} else {
return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
}
if (Client.worldId == var1.world && super.world != Client.worldId) {
return 1;
}
if (super.world != 0 && var1.world == 0) {
return -1;
}
if (var1.world != 0 && super.world == 0) {
return 1;
}
if (this.field3650 && !var1.field3650) {
return -1;
}
if (!this.field3650 && var1.field3650) {
return 1;
}
if (this.field3651 && !var1.field3651) {
return -1;
}
if (!this.field3651 && var1.field3651) {
return 1;
}
return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2;
}
@ObfuscatedName("ax")
@@ -61,15 +67,14 @@ public class Friend extends Buddy {
signature = "(Lhp;IIB)Z",
garbageValue = "-3"
)
@Export("doesSpriteExist")
public static boolean doesSpriteExist(AbstractArchive var0, int var1, int var2) {
@Export("SpriteBuffer_bufferFile")
public static boolean SpriteBuffer_bufferFile(AbstractArchive var0, int var1, int var2) {
byte[] var3 = var0.takeFile(var1, var2);
if (var3 == null) {
return false;
} else {
class185.SpriteBuffer_decode(var3);
return true;
}
class185.SpriteBuffer_decode(var3);
return true;
}
@ObfuscatedName("fv")