update client to rev 183

This commit is contained in:
ThatGamerBlue
2019-09-12 14:00:01 +01:00
parent 0446151736
commit 12c08b271a
342 changed files with 41159 additions and 41468 deletions

View File

@@ -4,35 +4,35 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ia")
@ObfuscatedName("ii")
@Implements("VerticalAlignment")
public enum VerticalAlignment implements Enumerated {
@ObfuscatedName("s")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "Lia;"
signature = "Lii;"
)
field3172(1, 0),
@ObfuscatedName("j")
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "Lia;"
signature = "Lii;"
)
@Export("VerticalAlignment_centered")
VerticalAlignment_centered(0, 1),
@ObfuscatedName("i")
VerticalAlignment_centered(2, 1),
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "Lia;"
signature = "Lii;"
)
field3174(2, 2);
field3170(0, 2);
@ObfuscatedName("k")
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = -1694558565
intValue = 1133132541
)
@Export("value")
public final int value;
@ObfuscatedName("u")
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = 817798203
intValue = 544602367
)
@Export("id")
final int id;
@@ -42,13 +42,771 @@ public enum VerticalAlignment implements Enumerated {
this.id = var4;
}
@ObfuscatedName("j")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(B)I",
garbageValue = "-32"
signature = "(I)I",
garbageValue = "-1410702910"
)
@Export("rsOrdinal")
public int rsOrdinal() {
return this.id;
}
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(I)Ljava/lang/String;",
garbageValue = "441666520"
)
static String method4328() {
String var0;
if (Actor.clientPreferences.hideUsername) {
String var2 = Login.Login_username;
String var1 = HealthBarDefinition.method4481('*', var2.length());
var0 = var1;
} else {
var0 = Login.Login_username;
}
return var0;
}
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "(Lbb;Lbb;IZS)I",
garbageValue = "-22293"
)
@Export("compareWorlds")
static int compareWorlds(World var0, World var1, int var2, boolean var3) {
if (var2 == 1) {
int var4 = var0.population;
int var5 = var1.population;
if (!var3) {
if (var4 == -1) {
var4 = 2001;
}
if (var5 == -1) {
var5 = 2001;
}
}
return var4 - var5;
} else if (var2 == 2) {
return var0.location - var1.location;
} else if (var2 == 3) {
if (var0.activity.equals("-")) {
if (var1.activity.equals("-")) {
return 0;
} else {
return var3 ? -1 : 1;
}
} else if (var1.activity.equals("-")) {
return var3 ? 1 : -1;
} else {
return var0.activity.compareTo(var1.activity);
}
} else if (var2 == 4) {
return var0.method1753() ? (var1.method1753() ? 0 : 1) : (var1.method1753() ? -1 : 0);
} else if (var2 == 5) {
return var0.method1713() ? (var1.method1713() ? 0 : 1) : (var1.method1713() ? -1 : 0);
} else if (var2 == 6) {
return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0);
} else if (var2 == 7) {
return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0);
} else {
return var0.id - var1.id;
}
}
@ObfuscatedName("fm")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "1636025700"
)
static final void method4329() {
for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
int var10002 = Client.queuedSoundEffectDelays[var0]--;
if (Client.queuedSoundEffectDelays[var0] >= -10) {
SoundEffect var9 = Client.soundEffects[var0];
if (var9 == null) {
Object var10000 = null;
var9 = SoundEffect.readSoundEffect(class13.archive4, Client.soundEffectIds[var0], 0);
if (var9 == null) {
continue;
}
int[] var13 = Client.queuedSoundEffectDelays;
var13[var0] += var9.calculateDelay();
Client.soundEffects[var0] = var9;
}
if (Client.queuedSoundEffectDelays[var0] < 0) {
int var2;
if (Client.soundLocations[var0] != 0) {
int var3 = (Client.soundLocations[var0] & 255) * 128;
int var4 = Client.soundLocations[var0] >> 16 & 255;
int var5 = var4 * 128 + 64 - Varps.localPlayer.x * -78439701;
if (var5 < 0) {
var5 = -var5;
}
int var6 = Client.soundLocations[var0] >> 8 & 255;
int var7 = var6 * 128 + 64 - Varps.localPlayer.y;
if (var7 < 0) {
var7 = -var7;
}
int var8 = var5 + var7 - 128;
if (var8 > var3) {
Client.queuedSoundEffectDelays[var0] = -100;
continue;
}
if (var8 < 0) {
var8 = 0;
}
var2 = (var3 - var8) * Client.field860 / var3;
} else {
var2 = Client.soundEffectVolume;
}
if (var2 > 0) {
RawSound var10 = var9.toRawSound().resample(class81.decimator);
RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2);
var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1);
class51.pcmStreamMixer.addSubStream(var11);
}
Client.queuedSoundEffectDelays[var0] = -100;
}
} else {
--Client.soundEffectCount;
for (int var1 = var0; var1 < Client.soundEffectCount; ++var1) {
Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1];
Client.soundEffects[var1] = Client.soundEffects[var1 + 1];
Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1];
Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1];
Client.soundLocations[var1] = Client.soundLocations[var1 + 1];
}
--var0;
}
}
if (Client.field746) {
boolean var12;
if (class197.field2376 != 0) {
var12 = true;
} else {
var12 = class197.midiPcmStream.isReady();
}
if (!var12) {
if (Client.field638 != 0 && Client.field857 != -1) {
class49.method826(WorldMapDecoration.archive6, Client.field857, 0, Client.field638, false);
}
Client.field746 = false;
}
}
}
@ObfuscatedName("gq")
@ObfuscatedSignature(
signature = "(Lbe;IIIIII)V",
garbageValue = "2021063760"
)
@Export("drawActor2d")
static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
if (var0 != null && var0.isVisible()) {
if (var0 instanceof NPC) {
NPCDefinition var6 = ((NPC)var0).definition;
if (var6.transforms != null) {
var6 = var6.transform();
}
if (var6 == null) {
return;
}
}
int var75 = Players.Players_count;
int[] var7 = Players.Players_indices;
byte var8 = 0;
if (var1 < var75 && var0.playerCycle == Client.cycle && NetSocket.method3531((Player)var0)) {
Player var9 = (Player)var0;
if (var1 < var75) {
AttackOption.getActorScreenLocation(var0, var0.defaultHeight + 15);
AbstractFont var10 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12);
byte var11 = 9;
var10.drawCentered(var9.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var11, 16777215, 0);
var8 = 18;
}
}
int var76 = -2;
int var15;
int var22;
int var23;
if (!var0.healthBars.method4874()) {
AttackOption.getActorScreenLocation(var0, var0.defaultHeight + 15);
for (HealthBar var87 = (HealthBar)var0.healthBars.last(); var87 != null; var87 = (HealthBar)var0.healthBars.previous()) {
HealthBarUpdate var77 = var87.get(Client.cycle);
if (var77 == null) {
if (var87.isEmpty()) {
var87.remove();
}
} else {
HealthBarDefinition var12 = var87.definition;
Sprite var13 = var12.getBackSprite();
Sprite var14 = var12.getFrontSprite();
int var16 = 0;
if (var13 != null && var14 != null) {
if (var12.widthPadding * 2 < var14.subWidth) {
var16 = var12.widthPadding;
}
var15 = var14.subWidth - var16 * 2;
} else {
var15 = var12.width;
}
int var17 = 255;
boolean var18 = true;
int var19 = Client.cycle - var77.cycle;
int var20 = var15 * var77.health2 / var12.width;
int var21;
int var92;
if (var77.cycleOffset > var19) {
var21 = var12.int4 == 0 ? 0 : var12.int4 * (var19 / var12.int4);
var22 = var15 * var77.health / var12.width;
var92 = var21 * (var20 - var22) / var77.cycleOffset + var22;
} else {
var92 = var20;
var21 = var77.cycleOffset + var12.int5 - var19;
if (var12.int3 >= 0) {
var17 = (var21 << 8) / (var12.int5 - var12.int3);
}
}
if (var77.health2 > 0 && var92 < 1) {
var92 = 1;
}
if (var13 != null && var14 != null) {
if (var92 == var15) {
var92 += var16 * 2;
} else {
var92 += var16;
}
var21 = var13.subHeight;
var76 += var21;
var22 = var2 + Client.viewportTempX - (var15 >> 1);
var23 = var3 + Client.viewportTempY - var76;
var22 -= var16;
if (var17 >= 0 && var17 < 255) {
var13.drawTransAt(var22, var23, var17);
Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var92 + var22, var23 + var21);
var14.drawTransAt(var22, var23, var17);
} else {
var13.drawTransBgAt(var22, var23);
Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var92 + var22, var23 + var21);
var14.drawTransBgAt(var22, var23);
}
Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5);
var76 += 2;
} else {
var76 += 5;
if (Client.viewportTempX > -1) {
var21 = var2 + Client.viewportTempX - (var15 >> 1);
var22 = var3 + Client.viewportTempY - var76;
Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var92, 5, 65280);
Rasterizer2D.Rasterizer2D_fillRectangle(var92 + var21, var22, var15 - var92, 5, 16711680);
}
var76 += 2;
}
}
}
}
if (var76 == -2) {
var76 += 7;
}
var76 += var8;
if (var1 < var75) {
Player var88 = (Player)var0;
if (var88.isHidden) {
return;
}
if (var88.headIconPk != -1 || var88.headIconPrayer != -1) {
AttackOption.getActorScreenLocation(var0, var0.defaultHeight + 15);
if (Client.viewportTempX > -1) {
if (var88.headIconPk != -1) {
var76 += 25;
PlatformInfo.headIconPkSprites[var88.headIconPk].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76);
}
if (var88.headIconPrayer != -1) {
var76 += 25;
RouteStrategy.headIconPrayerSprites[var88.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76);
}
}
}
if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) {
AttackOption.getActorScreenLocation(var0, var0.defaultHeight + 15);
if (Client.viewportTempX > -1) {
var76 += GrandExchangeEvents.headIconHintSprites[1].subHeight;
GrandExchangeEvents.headIconHintSprites[1].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var76);
}
}
} else {
NPCDefinition var89 = ((NPC)var0).definition;
if (var89.transforms != null) {
var89 = var89.transform();
}
if (var89.headIconPrayer >= 0 && var89.headIconPrayer < RouteStrategy.headIconPrayerSprites.length) {
AttackOption.getActorScreenLocation(var0, var0.defaultHeight + 15);
if (Client.viewportTempX > -1) {
RouteStrategy.headIconPrayerSprites[var89.headIconPrayer].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30);
}
}
if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) {
AttackOption.getActorScreenLocation(var0, var0.defaultHeight + 15);
if (Client.viewportTempX > -1) {
GrandExchangeEvents.headIconHintSprites[0].drawTransBgAt(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
}
}
}
if (var0.overheadText != null && (var1 >= var75 || !var0.field956 && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) {
AttackOption.getActorScreenLocation(var0, var0.defaultHeight);
if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) {
Client.overheadTextXOffsets[Client.overheadTextCount] = HealthBar.fontBold12.stringWidth(var0.overheadText) / 2;
Client.overheadTextAscents[Client.overheadTextCount] = HealthBar.fontBold12.ascent;
Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX;
Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY;
Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor;
Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect;
Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining;
Client.overheadText[Client.overheadTextCount] = var0.overheadText;
++Client.overheadTextCount;
}
}
for (int var78 = 0; var78 < 4; ++var78) {
int var90 = var0.hitSplatCycles[var78];
int var79 = var0.hitSplatTypes[var78];
HitSplatDefinition var91 = null;
int var80 = 0;
if (var79 >= 0) {
if (var90 <= Client.cycle) {
continue;
}
var91 = Interpreter.HitSplatDefinition_get(var0.hitSplatTypes[var78]);
var80 = var91.field3306;
if (var91 != null && var91.transforms != null) {
var91 = var91.transform();
if (var91 == null) {
var0.hitSplatCycles[var78] = -1;
continue;
}
}
} else if (var90 < 0) {
continue;
}
var15 = var0.hitSplatTypes2[var78];
HitSplatDefinition var81 = null;
if (var15 >= 0) {
var81 = Interpreter.HitSplatDefinition_get(var15);
if (var81 != null && var81.transforms != null) {
var81 = var81.transform();
}
}
if (var90 - var80 <= Client.cycle) {
if (var91 == null) {
var0.hitSplatCycles[var78] = -1;
} else {
AttackOption.getActorScreenLocation(var0, var0.defaultHeight / 2);
if (Client.viewportTempX > -1) {
if (var78 == 1) {
Client.viewportTempY -= 20;
}
if (var78 == 2) {
Client.viewportTempX -= 15;
Client.viewportTempY -= 10;
}
if (var78 == 3) {
Client.viewportTempX += 15;
Client.viewportTempY -= 10;
}
Sprite var82 = null;
Sprite var83 = null;
Sprite var84 = null;
Sprite var85 = null;
var22 = 0;
var23 = 0;
int var24 = 0;
int var25 = 0;
int var26 = 0;
int var27 = 0;
int var28 = 0;
int var29 = 0;
Sprite var30 = null;
Sprite var31 = null;
Sprite var32 = null;
Sprite var33 = null;
int var34 = 0;
int var35 = 0;
int var36 = 0;
int var37 = 0;
int var38 = 0;
int var39 = 0;
int var40 = 0;
int var41 = 0;
int var42 = 0;
var82 = var91.method4568();
int var43;
if (var82 != null) {
var22 = var82.subWidth;
var43 = var82.subHeight;
if (var43 > var42) {
var42 = var43;
}
var26 = var82.xOffset;
}
var83 = var91.method4581();
if (var83 != null) {
var23 = var83.subWidth;
var43 = var83.subHeight;
if (var43 > var42) {
var42 = var43;
}
var27 = var83.xOffset;
}
var84 = var91.method4570();
if (var84 != null) {
var24 = var84.subWidth;
var43 = var84.subHeight;
if (var43 > var42) {
var42 = var43;
}
var28 = var84.xOffset;
}
var85 = var91.method4561();
if (var85 != null) {
var25 = var85.subWidth;
var43 = var85.subHeight;
if (var43 > var42) {
var42 = var43;
}
var29 = var85.xOffset;
}
if (var81 != null) {
var30 = var81.method4568();
if (var30 != null) {
var34 = var30.subWidth;
var43 = var30.subHeight;
if (var43 > var42) {
var42 = var43;
}
var38 = var30.xOffset;
}
var31 = var81.method4581();
if (var31 != null) {
var35 = var31.subWidth;
var43 = var31.subHeight;
if (var43 > var42) {
var42 = var43;
}
var39 = var31.xOffset;
}
var32 = var81.method4570();
if (var32 != null) {
var36 = var32.subWidth;
var43 = var32.subHeight;
if (var43 > var42) {
var42 = var43;
}
var40 = var32.xOffset;
}
var33 = var81.method4561();
if (var33 != null) {
var37 = var33.subWidth;
var43 = var33.subHeight;
if (var43 > var42) {
var42 = var43;
}
var41 = var33.xOffset;
}
}
Font var86 = var91.getFont();
if (var86 == null) {
var86 = GrandExchangeEvent.fontPlain11;
}
Font var44;
if (var81 != null) {
var44 = var81.getFont();
if (var44 == null) {
var44 = GrandExchangeEvent.fontPlain11;
}
} else {
var44 = GrandExchangeEvent.fontPlain11;
}
String var45 = null;
String var46 = null;
boolean var47 = false;
int var48 = 0;
var45 = var91.getString(var0.hitSplatValues[var78]);
int var93 = var86.stringWidth(var45);
if (var81 != null) {
var46 = var81.getString(var0.hitSplatValues2[var78]);
var48 = var44.stringWidth(var46);
}
int var49 = 0;
int var50 = 0;
if (var23 > 0) {
if (var84 == null && var85 == null) {
var49 = 1;
} else {
var49 = var93 / var23 + 1;
}
}
if (var81 != null && var35 > 0) {
if (var32 == null && var33 == null) {
var50 = 1;
} else {
var50 = var48 / var35 + 1;
}
}
int var51 = 0;
int var52 = var51;
if (var22 > 0) {
var51 += var22;
}
var51 += 2;
int var53 = var51;
if (var24 > 0) {
var51 += var24;
}
int var54 = var51;
int var55 = var51;
int var56;
if (var23 > 0) {
var56 = var23 * var49;
var51 += var56;
var55 += (var56 - var93) / 2;
} else {
var51 += var93;
}
var56 = var51;
if (var25 > 0) {
var51 += var25;
}
int var57 = 0;
int var58 = 0;
int var59 = 0;
int var60 = 0;
int var61 = 0;
int var62;
if (var81 != null) {
var51 += 2;
var57 = var51;
if (var34 > 0) {
var51 += var34;
}
var51 += 2;
var58 = var51;
if (var36 > 0) {
var51 += var36;
}
var59 = var51;
var61 = var51;
if (var35 > 0) {
var62 = var35 * var50;
var51 += var62;
var61 += (var62 - var48) / 2;
} else {
var51 += var48;
}
var60 = var51;
if (var37 > 0) {
var51 += var37;
}
}
var62 = var0.hitSplatCycles[var78] - Client.cycle;
int var63 = var91.field3311 - var62 * var91.field3311 / var91.field3306;
int var64 = var62 * var91.field3310 / var91.field3306 + -var91.field3310;
int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1));
int var66 = var3 + Client.viewportTempY - 12 + var64;
int var67 = var66;
int var68 = var42 + var66;
int var69 = var66 + var91.field3316 + 15;
int var70 = var69 - var86.maxAscent;
int var71 = var69 + var86.maxDescent;
if (var70 < var66) {
var67 = var70;
}
if (var71 > var68) {
var68 = var71;
}
int var72 = 0;
int var73;
int var74;
if (var81 != null) {
var72 = var66 + var81.field3316 + 15;
var73 = var72 - var44.maxAscent;
var74 = var72 + var44.maxDescent;
if (var73 < var67) {
;
}
if (var74 > var68) {
;
}
}
var73 = 255;
if (var91.field3307 >= 0) {
var73 = (var62 << 8) / (var91.field3306 - var91.field3307);
}
if (var73 >= 0 && var73 < 255) {
if (var82 != null) {
var82.drawTransAt(var52 + var65 - var26, var66, var73);
}
if (var84 != null) {
var84.drawTransAt(var65 + var53 - var28, var66, var73);
}
if (var83 != null) {
for (var74 = 0; var74 < var49; ++var74) {
var83.drawTransAt(var74 * var23 + (var65 + var54 - var27), var66, var73);
}
}
if (var85 != null) {
var85.drawTransAt(var56 + var65 - var29, var66, var73);
}
var86.drawAlpha(var45, var65 + var55, var69, var91.textColor, 0, var73);
if (var81 != null) {
if (var30 != null) {
var30.drawTransAt(var65 + var57 - var38, var66, var73);
}
if (var32 != null) {
var32.drawTransAt(var58 + var65 - var40, var66, var73);
}
if (var31 != null) {
for (var74 = 0; var74 < var50; ++var74) {
var31.drawTransAt(var35 * var74 + (var59 + var65 - var39), var66, var73);
}
}
if (var33 != null) {
var33.drawTransAt(var60 + var65 - var41, var66, var73);
}
var44.drawAlpha(var46, var65 + var61, var72, var81.textColor, 0, var73);
}
} else {
if (var82 != null) {
var82.drawTransBgAt(var65 + var52 - var26, var66);
}
if (var84 != null) {
var84.drawTransBgAt(var53 + var65 - var28, var66);
}
if (var83 != null) {
for (var74 = 0; var74 < var49; ++var74) {
var83.drawTransBgAt(var74 * var23 + (var54 + var65 - var27), var66);
}
}
if (var85 != null) {
var85.drawTransBgAt(var56 + var65 - var29, var66);
}
var86.draw(var45, var65 + var55, var69, var91.textColor | -16777216, 0);
if (var81 != null) {
if (var30 != null) {
var30.drawTransBgAt(var65 + var57 - var38, var66);
}
if (var32 != null) {
var32.drawTransBgAt(var65 + var58 - var40, var66);
}
if (var31 != null) {
for (var74 = 0; var74 < var50; ++var74) {
var31.drawTransBgAt(var74 * var35 + (var65 + var59 - var39), var66);
}
}
if (var33 != null) {
var33.drawTransBgAt(var65 + var60 - var41, var66);
}
var44.draw(var46, var65 + var61, var72, var81.textColor | -16777216, 0);
}
}
}
}
}
}
}
}
}