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

update client to rev 183

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

415
runescape-client/src/main/java/PendingSpawn.java
View File

@@ -3,77 +3,79 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("bm")
@ObfuscatedName("bo")
@Implements("PendingSpawn")
public final class PendingSpawn extends Node {
@ObfuscatedName("s")
@ObfuscatedName("ar")
@Export("hasFocus")
protected static boolean hasFocus;
@ObfuscatedName("c")
@ObfuscatedGetter(
intValue = 520550313
intValue = 912800159
)
@Export("plane")
int plane;
@ObfuscatedName("j")
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = -1382168131
)
@Export("type")
int type;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = -1841764773
)
@Export("x")
int x;
@ObfuscatedName("k")
@ObfuscatedGetter(
intValue = -677953367
intValue = -639221859
)
@Export("y")
int y;
@ObfuscatedName("u")
@ObfuscatedName("t")
@ObfuscatedGetter(
intValue = -1218871691
intValue = 458809523
)
@Export("type")
int type;
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = 87359327
)
@Export("x")
int x;
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = -1751315985
)
@Export("objectId")
int objectId;
@ObfuscatedName("n")
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = -1853437901
intValue = -470640353
)
int field907;
@ObfuscatedName("t")
int field900;
@ObfuscatedName("j")
@ObfuscatedGetter(
intValue = -1490063309
intValue = -402504459
)
int field903;
@ObfuscatedName("q")
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = 1310509737
intValue = -1760011819
)
@Export("id")
int id;
@ObfuscatedName("x")
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = -1509033293
intValue = -316029459
)
@Export("orientation")
int orientation;
@ObfuscatedName("d")
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = -1964885807
intValue = 2139915221
)
int field911;
@ObfuscatedName("f")
@ObfuscatedName("n")
@ObfuscatedGetter(
intValue = 679658845
intValue = -1581206037
)
@Export("delay")
int delay;
@ObfuscatedName("c")
@ObfuscatedName("h")
@ObfuscatedGetter(
intValue = 2126284793
intValue = -1067091679
)
@Export("hitpoints")
int hitpoints;
@@ -83,286 +85,73 @@ public final class PendingSpawn extends Node {
this.hitpoints = -1;
}
@ObfuscatedName("p")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(Lhz;III)[Lli;",
garbageValue = "1975064075"
)
@Export("SpriteBuffer_getSpriteArray")
public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) {
byte[] var4 = var0.takeFile(var1, var2);
boolean var3;
if (var4 == null) {
var3 = false;
} else {
GrandExchangeOfferWorldComparator.SpriteBuffer_decode(var4);
var3 = true;
}
return !var3 ? null : RouteStrategy.method3578();
}
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(III)I",
garbageValue = "-1406470873"
)
static int method1683(int var0, int var1) {
ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
if (var2 == null) {
return 0;
} else if (var1 == -1) {
return 0;
} else {
int var3 = 0;
for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
if (var2.ids[var4] == var1) {
var3 += var2.quantities[var4];
}
}
return var3;
}
}
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "(ILhz;Ljava/lang/String;Ljava/lang/String;IZI)V",
garbageValue = "-2128555897"
)
public static void method1681(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) {
int var6 = var1.getGroupId(var2);
int var7 = var1.getFileId(var6, var3);
class197.field2376 = 1;
class197.musicTrackArchive = var1;
class197.musicTrackGroupId = var6;
class197.musicTrackFileId = var7;
Canvas.field395 = var4;
MouseRecorder.musicTrackBoolean = var5;
ModelData0.field1833 = var0;
}
@ObfuscatedName("v")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-1879382681"
garbageValue = "-789098612"
)
static void method1661() {
Login.loginIndex = 24;
GrandExchangeOfferOwnWorldComparator.setLoginResponseString("", "You were disconnected from the server.", "");
}
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(ILcr;ZI)I",
garbageValue = "1685357339"
)
static int method1660(int var0, Script var1, boolean var2) {
if (var0 == ScriptOpcodes.CLIENTCLOCK) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.cycle;
return 1;
} else {
int var3;
int var4;
if (var0 == ScriptOpcodes.INV_GETOBJ) {
Interpreter.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.method3605(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.INV_GETNUM) {
Interpreter.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.ItemContainer_getCount(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.INV_TOTAL) {
Interpreter.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class43.method761(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.INV_SIZE) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Actor.getInvDefinition(var3).size;
return 1;
} else if (var0 == ScriptOpcodes.STAT) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.currentLevels[var3];
return 1;
} else if (var0 == ScriptOpcodes.STAT_BASE) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.levels[var3];
return 1;
} else if (var0 == ScriptOpcodes.STAT_XP) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.experience[var3];
return 1;
} else {
int var5;
if (var0 == ScriptOpcodes.COORD) {
var3 = ItemContainer.plane;
var4 = PacketWriter.baseX * 64 + (WorldMapIcon_1.localPlayer.x >> 7);
var5 = RouteStrategy.baseY * 64 + (WorldMapIcon_1.localPlayer.y >> 7);
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28);
return 1;
} else if (var0 == ScriptOpcodes.COORDX) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 14 & 16383;
return 1;
} else if (var0 == ScriptOpcodes.COORDZ) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 >> 28;
return 1;
} else if (var0 == ScriptOpcodes.COORDY) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3 & 16383;
return 1;
} else if (var0 == ScriptOpcodes.MAP_MEMBERS) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) {
Interpreter.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768;
var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Language.method3605(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) {
Interpreter.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768;
var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Decimator.ItemContainer_getCount(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) {
Interpreter.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize] + 32768;
var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class43.method761(var3, var4);
return 1;
} else if (var0 == ScriptOpcodes.STAFFMODLEVEL) {
if (Client.staffModLevel >= 2) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.staffModLevel;
} else {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
}
return 1;
} else if (var0 == ScriptOpcodes.REBOOTTIMER) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.rebootTimer;
return 1;
} else if (var0 == ScriptOpcodes.MAP_WORLD) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldId;
return 1;
} else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.runEnergy;
return 1;
} else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.weight;
return 1;
} else if (var0 == ScriptOpcodes.PLAYERMOD) {
if (Client.playerMod) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 1;
} else {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
}
return 1;
} else if (var0 == ScriptOpcodes.WORLDFLAGS) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.worldProperties;
return 1;
} else if (var0 == ScriptOpcodes.MOVECOORD) {
Interpreter.Interpreter_intStackSize -= 4;
var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
int var6 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
var3 += var4 << 14;
var3 += var5 << 28;
var3 += var6;
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3;
return 1;
} else {
return 2;
}
}
}
}
@ObfuscatedName("gy")
@ObfuscatedSignature(
signature = "(ZLkx;B)V",
garbageValue = "4"
)
@Export("loadRegions")
static final void loadRegions(boolean var0, PacketBuffer var1) {
Client.isInInstance = var0;
int var2;
int var3;
int var5;
int var6;
int var7;
int var8;
if (!Client.isInInstance) {
var2 = var1.method5447();
var3 = var1.method5446();
int var4 = var1.readUnsignedShort();
ModelData0.xteaKeys = new int[var4][4];
for (var5 = 0; var5 < var4; ++var5) {
for (var6 = 0; var6 < 4; ++var6) {
ModelData0.xteaKeys[var5][var6] = var1.readInt();
}
}
class186.regions = new int[var4];
MouseHandler.regionMapArchiveIds = new int[var4];
ClanChat.regionLandArchiveIds = new int[var4];
GraphicsObject.regionLandArchives = new byte[var4][];
Messages.regionMapArchives = new byte[var4][];
boolean var16 = false;
if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) {
var16 = true;
}
if (var3 / 8 == 48 && var2 / 8 == 148) {
var16 = true;
}
var4 = 0;
for (var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) {
for (var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) {
var8 = var7 + (var6 << 8);
if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) {
class186.regions[var4] = var8;
MouseHandler.regionMapArchiveIds[var4] = WorldMapDecoration.archive5.getGroupId("m" + var6 + "_" + var7);
ClanChat.regionLandArchiveIds[var4] = WorldMapDecoration.archive5.getGroupId("l" + var6 + "_" + var7);
++var4;
}
}
}
ModelData0.method3198(var3, var2, true);
} else {
var2 = var1.method5446();
var3 = var1.method5447();
boolean var15 = var1.readUnsignedByte() == 1;
var5 = var1.readUnsignedShort();
var1.importIndex();
int var9;
for (var6 = 0; var6 < 4; ++var6) {
for (var7 = 0; var7 < 13; ++var7) {
for (var8 = 0; var8 < 13; ++var8) {
var9 = var1.readBits(1);
if (var9 == 1) {
Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26);
} else {
Client.instanceChunkTemplates[var6][var7][var8] = -1;
}
}
}
}
var1.exportIndex();
ModelData0.xteaKeys = new int[var5][4];
for (var6 = 0; var6 < var5; ++var6) {
for (var7 = 0; var7 < 4; ++var7) {
ModelData0.xteaKeys[var6][var7] = var1.readInt();
}
}
class186.regions = new int[var5];
MouseHandler.regionMapArchiveIds = new int[var5];
ClanChat.regionLandArchiveIds = new int[var5];
GraphicsObject.regionLandArchives = new byte[var5][];
Messages.regionMapArchives = new byte[var5][];
var5 = 0;
for (var6 = 0; var6 < 4; ++var6) {
for (var7 = 0; var7 < 13; ++var7) {
for (var8 = 0; var8 < 13; ++var8) {
var9 = Client.instanceChunkTemplates[var6][var7][var8];
if (var9 != -1) {
int var10 = var9 >> 14 & 1023;
int var11 = var9 >> 3 & 2047;
int var12 = (var10 / 8 << 8) + var11 / 8;
int var13;
for (var13 = 0; var13 < var5; ++var13) {
if (class186.regions[var13] == var12) {
var12 = -1;
break;
}
}
if (var12 != -1) {
class186.regions[var5] = var12;
var13 = var12 >> 8 & 255;
int var14 = var12 & 255;
MouseHandler.regionMapArchiveIds[var5] = WorldMapDecoration.archive5.getGroupId("m" + var13 + "_" + var14);
ClanChat.regionLandArchiveIds[var5] = WorldMapDecoration.archive5.getGroupId("l" + var13 + "_" + var14);
++var5;
}
}
}
}
}
ModelData0.method3198(var3, var2, !var15);
}
}
@ObfuscatedName("iq")
@ObfuscatedSignature(
signature = "(II)Z",
garbageValue = "215444906"
)
@Export("isWidgetMenuOpcode")
static boolean isWidgetMenuOpcode(int var0) {
return var0 == 57 || var0 == 58 || var0 == 1007 || var0 == 25 || var0 == 30;
public static final void method1682() {
ViewportMouse.ViewportMouse_isInViewport = false;
ViewportMouse.ViewportMouse_entityCount = 0;
}
}