chore: revision 189

This commit is contained in:
ThatGamerBlue
2020-03-26 14:17:06 +00:00
parent 60b7d0413f
commit acd339fd70
392 changed files with 43289 additions and 42917 deletions

View File

@@ -1,65 +1,56 @@
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
import java.util.Iterator;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("l")
@ObfuscatedName("i")
@Implements("GrandExchangeEvent")
public class GrandExchangeEvent {
@ObfuscatedName("j")
@ObfuscatedName("sx")
@ObfuscatedSignature(
signature = "Lg;"
)
@Export("grandExchangeEvents")
static GrandExchangeEvents grandExchangeEvents;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = -1568217923
intValue = -1236605669
)
static int field45;
@ObfuscatedName("n")
static int field75;
@ObfuscatedName("bt")
@ObfuscatedSignature(
signature = "Lhe;"
signature = "[Lle;"
)
@Export("NetCache_currentResponse")
public static NetFileRequest NetCache_currentResponse;
@ObfuscatedName("bn")
@ObfuscatedSignature(
signature = "Lli;"
)
@Export("worldSelectLeftSprite")
static IndexedSprite worldSelectLeftSprite;
@ObfuscatedName("dj")
@ObfuscatedSignature(
signature = "Lia;"
)
@Export("archive0")
static Archive archive0;
@ObfuscatedName("c")
@Export("worldSelectFlagSprites")
static IndexedSprite[] worldSelectFlagSprites;
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = 1956147033
intValue = 658095085
)
@Export("world")
public final int world;
@ObfuscatedName("t")
@ObfuscatedName("m")
@ObfuscatedGetter(
longValue = 7213176078958271683L
longValue = 2297014437459523259L
)
@Export("age")
public final long age;
@ObfuscatedName("o")
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "Lm;"
signature = "Lb;"
)
@Export("grandExchangeOffer")
public final GrandExchangeOffer grandExchangeOffer;
@ObfuscatedName("e")
@ObfuscatedName("d")
@Export("offerName")
String offerName;
@ObfuscatedName("i")
@ObfuscatedName("w")
@Export("previousOfferName")
String previousOfferName;
@ObfuscatedSignature(
signature = "(Lkp;BI)V"
signature = "(Lkb;BI)V"
)
GrandExchangeEvent(Buffer var1, byte var2, int var3) {
this.offerName = var1.readStringCp1252NullTerminated();
@@ -69,8 +60,8 @@ public class GrandExchangeEvent {
int var4 = var1.readInt();
int var5 = var1.readInt();
this.grandExchangeOffer = new GrandExchangeOffer();
this.grandExchangeOffer.method120(2);
this.grandExchangeOffer.method112(var2);
this.grandExchangeOffer.method211(2);
this.grandExchangeOffer.method187(var2);
this.grandExchangeOffer.unitPrice = var4;
this.grandExchangeOffer.totalQuantity = var5;
this.grandExchangeOffer.currentQuantity = 0;
@@ -78,145 +69,562 @@ public class GrandExchangeEvent {
this.grandExchangeOffer.id = var3;
}
@ObfuscatedName("c")
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "(I)Ljava/lang/String;",
garbageValue = "1646612919"
garbageValue = "1636604960"
)
@Export("getOfferName")
public String getOfferName() {
return this.offerName;
}
@ObfuscatedName("t")
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(I)Ljava/lang/String;",
garbageValue = "-81405509"
signature = "(B)Ljava/lang/String;",
garbageValue = "-119"
)
@Export("getPreviousOfferName")
public String getPreviousOfferName() {
return this.previousOfferName;
}
@ObfuscatedName("i")
public static int method96(long var0) {
return (int)(var0 >>> 0 & 127L);
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "([Lgo;II)Lgo;",
garbageValue = "-1609956543"
)
@Export("findEnumerated")
public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
Enumerated[] var2 = var0;
for (int var3 = 0; var3 < var2.length; ++var3) {
Enumerated var4 = var2[var3];
if (var1 == var4.rsOrdinal()) {
return var4;
}
}
return null;
}
@ObfuscatedName("aw")
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "(II)I",
garbageValue = "193251724"
signature = "(IIIIIIB)I",
garbageValue = "30"
)
static int method97(int var0) {
return (int)Math.pow(2.0D, (double)((float)var0 / 256.0F + 7.0F));
public static int method166(int var0, int var1, int var2, int var3, int var4, int var5) {
if ((var5 & 1) == 1) {
int var6 = var3;
var3 = var4;
var4 = var6;
}
var2 &= 3;
if (var2 == 0) {
return var1;
} else if (var2 == 1) {
return 7 - var0 - (var3 - 1);
} else {
return var2 == 2 ? 7 - var1 - (var4 - 1) : var0;
}
}
@ObfuscatedName("at")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "550527389"
signature = "(Ljava/lang/String;I)V",
garbageValue = "62688093"
)
@Export("getGcDuration")
protected static int getGcDuration() {
int var0 = 0;
if (SecureRandomFuture.garbageCollector == null || !SecureRandomFuture.garbageCollector.isValid()) {
try {
Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator();
static final void method165(String var0) {
Skeleton.addGameMessage(30, "", var0);
}
while (var1.hasNext()) {
GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next();
if (var2.isValid()) {
SecureRandomFuture.garbageCollector = var2;
GameShell.garbageCollectorLastCheckTimeMs = -1L;
GameShell.garbageCollectorLastCollectionTime = -1L;
@ObfuscatedName("hf")
@ObfuscatedSignature(
signature = "(B)V",
garbageValue = "-97"
)
static final void method161() {
class303.method5397(false);
Client.field818 = 0;
boolean var0 = true;
int var1;
for (var1 = 0; var1 < WorldMapData_0.regionLandArchives.length; ++var1) {
if (KeyHandler.regionMapArchiveIds[var1] != -1 && WorldMapData_0.regionLandArchives[var1] == null) {
WorldMapData_0.regionLandArchives[var1] = WorldMapIcon_0.archive5.takeFile(KeyHandler.regionMapArchiveIds[var1], 0);
if (WorldMapData_0.regionLandArchives[var1] == null) {
var0 = false;
++Client.field818;
}
}
if (WorldMapArea.regionLandArchiveIds[var1] != -1 && class23.regionMapArchives[var1] == null) {
class23.regionMapArchives[var1] = WorldMapIcon_0.archive5.takeFileEncrypted(WorldMapArea.regionLandArchiveIds[var1], 0, UrlRequester.xteaKeys[var1]);
if (class23.regionMapArchives[var1] == null) {
var0 = false;
++Client.field818;
}
}
}
if (!var0) {
Client.field899 = 1;
} else {
Client.field734 = 0;
var0 = true;
int var3;
int var4;
Buffer var8;
int var9;
int var10;
int var11;
int var13;
int var14;
int var15;
int var16;
int var17;
int var18;
for (var1 = 0; var1 < WorldMapData_0.regionLandArchives.length; ++var1) {
byte[] var2 = class23.regionMapArchives[var1];
if (var2 != null) {
var3 = (StructDefinition.regions[var1] >> 8) * 64 - class69.baseX;
var4 = (StructDefinition.regions[var1] & 255) * 64 - class89.baseY;
if (Client.isInInstance) {
var3 = 10;
var4 = 10;
}
boolean var7 = true;
var8 = new Buffer(var2);
var9 = -1;
label645:
while (true) {
var10 = var8.method5589();
if (var10 == 0) {
var0 &= var7;
break;
}
var9 += var10;
var11 = 0;
boolean var12 = false;
while (true) {
while (!var12) {
var13 = var8.readUShortSmart();
if (var13 == 0) {
continue label645;
}
var11 += var13 - 1;
var14 = var11 & 63;
var15 = var11 >> 6 & 63;
var16 = var8.readUnsignedByte() >> 2;
var17 = var3 + var15;
var18 = var14 + var4;
if (var17 > 0 && var18 > 0 && var17 < 103 && var18 < 103) {
ObjectDefinition var19 = WorldMapSection2.getObjectDefinition(var9);
if (var16 != 22 || !Client.isLowDetail || var19.int1 != 0 || var19.interactType == 1 || var19.boolean2) {
if (!var19.needsModelFiles()) {
++Client.field734;
var7 = false;
}
var12 = true;
}
}
}
var13 = var8.readUShortSmart();
if (var13 == 0) {
break;
}
var8.readUnsignedByte();
}
}
}
} catch (Throwable var11) {
}
}
if (SecureRandomFuture.garbageCollector != null) {
long var9 = WorldMapIcon_0.currentTimeMillis();
long var3 = SecureRandomFuture.garbageCollector.getCollectionTime();
if (-1L != GameShell.garbageCollectorLastCollectionTime) {
long var5 = var3 - GameShell.garbageCollectorLastCollectionTime;
long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs;
if (var7 != 0L) {
var0 = (int)(var5 * 100L / var7);
if (!var0) {
Client.field899 = 2;
} else {
if (Client.field899 != 0) {
AbstractByteArrayCopier.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + 100 + "%" + ")", true);
}
ChatChannel.playPcmPlayers();
GrandExchangeOfferWorldComparator.scene.clear();
for (var1 = 0; var1 < 4; ++var1) {
Client.collisionMaps[var1].clear();
}
int var35;
for (var1 = 0; var1 < 4; ++var1) {
for (var35 = 0; var35 < 104; ++var35) {
for (var3 = 0; var3 < 104; ++var3) {
Tiles.Tiles_renderFlags[var1][var35][var3] = 0;
}
}
}
ChatChannel.playPcmPlayers();
UserComparator9.method3498();
var1 = WorldMapData_0.regionLandArchives.length;
TriBool.method5249();
class303.method5397(true);
int var5;
int var20;
int var21;
int var40;
int var51;
if (!Client.isInInstance) {
byte[] var36;
for (var35 = 0; var35 < var1; ++var35) {
var3 = (StructDefinition.regions[var35] >> 8) * 64 - class69.baseX;
var4 = (StructDefinition.regions[var35] & 255) * 64 - class89.baseY;
var36 = WorldMapData_0.regionLandArchives[var35];
if (var36 != null) {
ChatChannel.playPcmPlayers();
WorldMapData_0.method275(var36, var3, var4, class69.field585 * 8 - 48, MouseHandler.field529 * 8 - 48, Client.collisionMaps);
}
}
for (var35 = 0; var35 < var1; ++var35) {
var3 = (StructDefinition.regions[var35] >> 8) * 64 - class69.baseX;
var4 = (StructDefinition.regions[var35] & 255) * 64 - class89.baseY;
var36 = WorldMapData_0.regionLandArchives[var35];
if (var36 == null && MouseHandler.field529 < 800) {
ChatChannel.playPcmPlayers();
WorldMapSprite.method514(var3, var4, 64, 64);
}
}
class303.method5397(true);
for (var35 = 0; var35 < var1; ++var35) {
byte[] var41 = class23.regionMapArchives[var35];
if (var41 != null) {
var4 = (StructDefinition.regions[var35] >> 8) * 64 - class69.baseX;
var5 = (StructDefinition.regions[var35] & 255) * 64 - class89.baseY;
ChatChannel.playPcmPlayers();
Scene var42 = GrandExchangeOfferWorldComparator.scene;
CollisionMap[] var43 = Client.collisionMaps;
var8 = new Buffer(var41);
var9 = -1;
while (true) {
var10 = var8.method5589();
if (var10 == 0) {
break;
}
var9 += var10;
var11 = 0;
while (true) {
var51 = var8.readUShortSmart();
if (var51 == 0) {
break;
}
var11 += var51 - 1;
var13 = var11 & 63;
var14 = var11 >> 6 & 63;
var15 = var11 >> 12;
var16 = var8.readUnsignedByte();
var17 = var16 >> 2;
var18 = var16 & 3;
var40 = var14 + var4;
var20 = var13 + var5;
if (var40 > 0 && var20 > 0 && var40 < 103 && var20 < 103) {
var21 = var15;
if ((Tiles.Tiles_renderFlags[1][var40][var20] & 2) == 2) {
var21 = var15 - 1;
}
CollisionMap var47 = null;
if (var21 >= 0) {
var47 = var43[var21];
}
PacketBuffer.method5554(var15, var40, var20, var9, var18, var17, var42, var47);
}
}
}
}
}
}
int var6;
int var37;
int var50;
if (Client.isInInstance) {
int var22;
int var25;
int var27;
int var28;
int var29;
CollisionMap[] var39;
Buffer var52;
for (var35 = 0; var35 < 4; ++var35) {
ChatChannel.playPcmPlayers();
for (var3 = 0; var3 < 13; ++var3) {
for (var4 = 0; var4 < 13; ++var4) {
boolean var49 = false;
var6 = Client.instanceChunkTemplates[var35][var3][var4];
if (var6 != -1) {
var50 = var6 >> 24 & 3;
var37 = var6 >> 1 & 3;
var9 = var6 >> 14 & 1023;
var10 = var6 >> 3 & 2047;
var11 = (var9 / 8 << 8) + var10 / 8;
for (var51 = 0; var51 < StructDefinition.regions.length; ++var51) {
if (StructDefinition.regions[var51] == var11 && WorldMapData_0.regionLandArchives[var51] != null) {
byte[] var38 = WorldMapData_0.regionLandArchives[var51];
var14 = var3 * 8;
var15 = var4 * 8;
var16 = (var9 & 7) * 8;
var17 = (var10 & 7) * 8;
var39 = Client.collisionMaps;
for (var40 = 0; var40 < 8; ++var40) {
for (var20 = 0; var20 < 8; ++var20) {
if (var14 + var40 > 0 && var14 + var40 < 103 && var20 + var15 > 0 && var15 + var20 < 103) {
int[] var10000 = var39[var35].flags[var40 + var14];
var10000[var20 + var15] &= -16777217;
}
}
}
var52 = new Buffer(var38);
for (var20 = 0; var20 < 4; ++var20) {
for (var21 = 0; var21 < 64; ++var21) {
for (var22 = 0; var22 < 64; ++var22) {
if (var50 == var20 && var21 >= var16 && var21 < var16 + 8 && var22 >= var17 && var22 < var17 + 8) {
var25 = var14 + WorldMapSection1.method663(var21 & 7, var22 & 7, var37);
var28 = var21 & 7;
var29 = var22 & 7;
int var30 = var37 & 3;
if (var30 == 0) {
var27 = var29;
} else if (var30 == 1) {
var27 = 7 - var28;
} else if (var30 == 2) {
var27 = 7 - var29;
} else {
var27 = var28;
}
MusicPatchNode2.loadTerrain(var52, var35, var25, var27 + var15, 0, 0, var37);
} else {
MusicPatchNode2.loadTerrain(var52, 0, -1, -1, 0, 0, 0);
}
}
}
}
var49 = true;
break;
}
}
}
if (!var49) {
FontName.method5385(var35, var3 * 8, var4 * 8);
}
}
}
}
for (var35 = 0; var35 < 13; ++var35) {
for (var3 = 0; var3 < 13; ++var3) {
var4 = Client.instanceChunkTemplates[0][var35][var3];
if (var4 == -1) {
WorldMapSprite.method514(var35 * 8, var3 * 8, 8, 8);
}
}
}
class303.method5397(true);
for (var35 = 0; var35 < 4; ++var35) {
ChatChannel.playPcmPlayers();
for (var3 = 0; var3 < 13; ++var3) {
label473:
for (var4 = 0; var4 < 13; ++var4) {
var5 = Client.instanceChunkTemplates[var35][var3][var4];
if (var5 != -1) {
var6 = var5 >> 24 & 3;
var50 = var5 >> 1 & 3;
var37 = var5 >> 14 & 1023;
var9 = var5 >> 3 & 2047;
var10 = (var37 / 8 << 8) + var9 / 8;
for (var11 = 0; var11 < StructDefinition.regions.length; ++var11) {
if (StructDefinition.regions[var11] == var10 && class23.regionMapArchives[var11] != null) {
byte[] var44 = class23.regionMapArchives[var11];
var13 = var3 * 8;
var14 = var4 * 8;
var15 = (var37 & 7) * 8;
var16 = (var9 & 7) * 8;
Scene var45 = GrandExchangeOfferWorldComparator.scene;
var39 = Client.collisionMaps;
var52 = new Buffer(var44);
var20 = -1;
while (true) {
var21 = var52.method5589();
if (var21 == 0) {
continue label473;
}
var20 += var21;
var22 = 0;
while (true) {
int var46 = var52.readUShortSmart();
if (var46 == 0) {
break;
}
var22 += var46 - 1;
int var24 = var22 & 63;
var25 = var22 >> 6 & 63;
int var26 = var22 >> 12;
var27 = var52.readUnsignedByte();
var28 = var27 >> 2;
var29 = var27 & 3;
if (var6 == var26 && var25 >= var15 && var25 < var15 + 8 && var24 >= var16 && var24 < var16 + 8) {
ObjectDefinition var48 = WorldMapSection2.getObjectDefinition(var20);
int var31 = var13 + Language.method3749(var25 & 7, var24 & 7, var50, var48.sizeX, var48.sizeY, var29);
int var32 = var14 + method166(var25 & 7, var24 & 7, var50, var48.sizeX, var48.sizeY, var29);
if (var31 > 0 && var32 > 0 && var31 < 103 && var32 < 103) {
int var33 = var35;
if ((Tiles.Tiles_renderFlags[1][var31][var32] & 2) == 2) {
var33 = var35 - 1;
}
CollisionMap var34 = null;
if (var33 >= 0) {
var34 = var39[var33];
}
PacketBuffer.method5554(var35, var31, var32, var20, var29 + var50 & 3, var28, var45, var34);
}
}
}
}
}
}
}
}
}
}
}
class303.method5397(true);
ChatChannel.playPcmPlayers();
GrandExchangeOfferAgeComparator.method248(GrandExchangeOfferWorldComparator.scene, Client.collisionMaps);
class303.method5397(true);
var35 = Tiles.Tiles_minPlane;
if (var35 > ScriptEvent.Client_plane) {
var35 = ScriptEvent.Client_plane;
}
if (var35 < ScriptEvent.Client_plane - 1) {
var35 = ScriptEvent.Client_plane - 1;
}
if (Client.isLowDetail) {
GrandExchangeOfferWorldComparator.scene.init(Tiles.Tiles_minPlane);
} else {
GrandExchangeOfferWorldComparator.scene.init(0);
}
for (var3 = 0; var3 < 104; ++var3) {
for (var4 = 0; var4 < 104; ++var4) {
World.updateItemPile(var3, var4);
}
}
ChatChannel.playPcmPlayers();
ScriptFrame.method1241();
ObjectDefinition.ObjectDefinition_cachedModelData.clear();
PacketBufferNode var53;
if (WorldMapSection1.client.hasFrame()) {
var53 = FaceNormal.getPacketBufferNode(ClientPacket.field2215, Client.packetWriter.isaacCipher);
var53.packetBuffer.writeInt(1057001181);
Client.packetWriter.addNode(var53);
}
if (!Client.isInInstance) {
var3 = (class69.field585 - 6) / 8;
var4 = (class69.field585 + 6) / 8;
var5 = (MouseHandler.field529 - 6) / 8;
var6 = (MouseHandler.field529 + 6) / 8;
for (var50 = var3 - 1; var50 <= var4 + 1; ++var50) {
for (var37 = var5 - 1; var37 <= var6 + 1; ++var37) {
if (var50 < var3 || var50 > var4 || var37 < var5 || var37 > var6) {
WorldMapIcon_0.archive5.loadRegionFromName("m" + var50 + "_" + var37);
WorldMapIcon_0.archive5.loadRegionFromName("l" + var50 + "_" + var37);
}
}
}
}
MouseRecorder.updateGameState(30);
ChatChannel.playPcmPlayers();
Tiles.field538 = null;
class348.field4061 = null;
Tiles.field539 = null;
Tiles.field540 = null;
class51.field404 = null;
SoundCache.field1462 = null;
Tiles.field545 = null;
GrandExchangeOfferAgeComparator.Tiles_hue = null;
UserComparator6.Tiles_saturation = null;
StructDefinition.Tiles_lightness = null;
Tiles.Tiles_hueMultiplier = null;
FriendSystem.field1086 = null;
var53 = FaceNormal.getPacketBufferNode(ClientPacket.field2241, Client.packetWriter.isaacCipher);
Client.packetWriter.addNode(var53);
GameShell.clock.mark();
for (var4 = 0; var4 < 32; ++var4) {
GameShell.graphicsTickTimes[var4] = 0L;
}
for (var4 = 0; var4 < 32; ++var4) {
GameShell.clientTickTimes[var4] = 0L;
}
ModelData0.gameCyclesToDo = 0;
}
GameShell.garbageCollectorLastCollectionTime = var3;
GameShell.garbageCollectorLastCheckTimeMs = var9;
}
return var0;
}
@ObfuscatedName("gy")
@ObfuscatedName("kn")
@ObfuscatedSignature(
signature = "(Lbx;I)V",
garbageValue = "2089906351"
signature = "(Ljava/lang/String;I)V",
garbageValue = "209958068"
)
static final void method88(Actor var0) {
if (var0.field986 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > GraphicsDefaults.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) {
int var1 = var0.field986 - var0.field985;
int var2 = Client.cycle - var0.field985;
int var3 = var0.field981 * 128 + var0.field942 * 2013925376;
int var4 = var0.field957 * 128 + var0.field942 * 2013925376;
int var5 = var0.field961 * 128 + var0.field942 * 2013925376;
int var6 = var0.field991 * 128 + var0.field942 * 2013925376;
var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1;
var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1;
}
var0.field997 = 0;
var0.orientation = var0.field987;
var0.rotation = var0.orientation;
}
@ObfuscatedName("jd")
@ObfuscatedSignature(
signature = "(Lhn;I)V",
garbageValue = "948929027"
)
static final void method93(Widget var0) {
int var1 = var0.contentType;
if (var1 == 324) {
if (Client.field910 == -1) {
Client.field910 = var0.spriteId2;
Client.field911 = var0.spriteId;
}
if (Client.playerAppearance.isFemale) {
var0.spriteId2 = Client.field910;
} else {
var0.spriteId2 = Client.field911;
}
} else if (var1 == 325) {
if (Client.field910 == -1) {
Client.field910 = var0.spriteId2;
Client.field911 = var0.spriteId;
}
if (Client.playerAppearance.isFemale) {
var0.spriteId2 = Client.field911;
} else {
var0.spriteId2 = Client.field910;
}
} else if (var1 == 327) {
var0.modelAngleX = 150;
var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
var0.modelType = 5;
var0.modelId = 0;
} else if (var1 == 328) {
var0.modelAngleX = 150;
var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
var0.modelType = 5;
var0.modelId = 1;
@Export("Clan_joinChat")
static final void Clan_joinChat(String var0) {
if (!var0.equals("")) {
PacketBufferNode var1 = FaceNormal.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher);
var1.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var0));
var1.packetBuffer.writeStringCp1252NullTerminated(var0);
Client.packetWriter.addNode(var1);
}
}
}