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

@@ -1,273 +1,330 @@
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;
import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("em")
@ObfuscatedName("eo")
@Implements("ModelData0")
public class ModelData0 {
@ObfuscatedName("gq")
@Export("xteaKeys")
static int[][] xteaKeys;
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = -80152223
)
public static int field1833;
@ObfuscatedName("lv")
@ObfuscatedGetter(
intValue = 1005444901
)
@Export("selectedItemSlot")
static int selectedItemSlot;
ModelData0() {
}
@ObfuscatedName("s")
@ObfuscatedSignature(
signature = "([Ljava/lang/String;[SIII)V",
garbageValue = "-2014451002"
)
@Export("sortItemsByName")
public static void sortItemsByName(String[] var0, short[] var1, int var2, int var3) {
if (var2 < var3) {
int var4 = (var3 + var2) / 2;
int var5 = var2;
String var6 = var0[var4];
var0[var4] = var0[var3];
var0[var3] = var6;
short var7 = var1[var4];
var1[var4] = var1[var3];
var1[var3] = var7;
for (int var8 = var2; var8 < var3; ++var8) {
if (var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) {
String var9 = var0[var8];
var0[var8] = var0[var5];
var0[var5] = var9;
short var10 = var1[var8];
var1[var8] = var1[var5];
var1[var5++] = var10;
}
}
var0[var3] = var0[var5];
var0[var5] = var6;
var1[var3] = var1[var5];
var1[var5] = var7;
sortItemsByName(var0, var1, var2, var5 - 1);
sortItemsByName(var0, var1, var5 + 1, var3);
}
}
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "(III)Lhp;",
garbageValue = "927119221"
signature = "(ILcu;ZI)I",
garbageValue = "-1253284688"
)
@Export("getWidgetChild")
public static Widget getWidgetChild(int var0, int var1) {
Widget var2 = WorldMapElement.getWidget(var0);
if (var1 == -1) {
return var2;
static int method3221(int var0, Script var1, boolean var2) {
Widget var3 = var2 ? UserComparator9.field1941 : MidiPcmStream.field2410;
if (var0 == ScriptOpcodes.CC_GETSCROLLX) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollX;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETSCROLLY) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollY;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETTEXT) {
Interpreter.Interpreter_stringStack[++TextureProvider.Interpreter_stringStackSize - 1] = var3.text;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollWidth;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.scrollHeight;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelZoom;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelAngleX;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelAngleZ;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelAngleY;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.transparencyTop;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.transparencyBot;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETCOLOUR) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.color;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.color2;
return 1;
} else if (var0 == ScriptOpcodes.CC_GETFILLMODE) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal();
return 1;
} else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0;
return 1;
} else {
return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null;
return 2;
}
}
@ObfuscatedName("gr")
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "1772928872"
signature = "(ILcu;ZB)I",
garbageValue = "44"
)
@Export("drawProjectiles")
static final void drawProjectiles() {
for (Projectile var0 = (Projectile)Client.projectiles.last(); var0 != null; var0 = (Projectile)Client.projectiles.previous()) {
if (var0.plane == ItemContainer.plane && Client.cycle <= var0.cycleEnd) {
if (Client.cycle >= var0.cycleStart) {
if (var0.targetIndex > 0) {
NPC var1 = Client.npcs[var0.targetIndex - 1];
if (var1 != null && var1.x >= 0 && var1.x < 13312 && var1.y >= 0 && var1.y < 13312) {
var0.setDestination(var1.x, var1.y, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var1.x, var1.y, var0.plane) - var0.endHeight, Client.cycle);
}
}
static int method3219(int var0, Script var1, boolean var2) {
Widget var3 = Player.getWidget(Interpreter.Interpreter_intStack[--class160.Interpreter_intStackSize]);
if (var0 == ScriptOpcodes.IF_GETX) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.x;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETY) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.y;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETWIDTH) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.width;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETHEIGHT) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.height;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETHIDE) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
return 1;
} else if (var0 == ScriptOpcodes.IF_GETLAYER) {
Interpreter.Interpreter_intStack[++class160.Interpreter_intStackSize - 1] = var3.parentId;
return 1;
} else {
return 2;
}
}
if (var0.targetIndex < 0) {
int var2 = -var0.targetIndex - 1;
Player var3;
if (var2 == Client.localPlayerIndex) {
var3 = WorldMapIcon_1.localPlayer;
} else {
var3 = Client.players[var2];
}
@ObfuscatedName("fh")
@ObfuscatedSignature(
signature = "(B)V",
garbageValue = "1"
)
@Export("playPcmPlayers")
static final void playPcmPlayers() {
if (ClientPreferences.pcmPlayer1 != null) {
ClientPreferences.pcmPlayer1.run();
}
if (var3 != null && var3.x >= 0 && var3.x < 13312 && var3.y >= 0 && var3.y < 13312) {
var0.setDestination(var3.x, var3.y, GrandExchangeOfferTotalQuantityComparator.getTileHeight(var3.x, var3.y, var0.plane) - var0.endHeight, Client.cycle);
}
}
var0.advance(Client.field879);
Player.scene.drawEntity(ItemContainer.plane, (int)var0.x, (int)var0.y, (int)var0.z, 60, var0, var0.yaw, -1L, false);
}
} else {
var0.remove();
}
if (WorldMapIcon_1.pcmPlayer0 != null) {
WorldMapIcon_1.pcmPlayer0.run();
}
}
@ObfuscatedName("gs")
@ObfuscatedName("io")
@ObfuscatedSignature(
signature = "(IIZI)V",
garbageValue = "1845013682"
signature = "(IIIII)V",
garbageValue = "353830109"
)
static final void method3198(int var0, int var1, boolean var2) {
if (!var2 || var0 != class13.field86 || class16.field101 != var1) {
class13.field86 = var0;
class16.field101 = var1;
FloorDecoration.updateGameState(25);
MusicPatch.drawLoadingMessage("Loading - please wait.", true);
int var3 = PacketWriter.baseX * 64;
int var4 = RouteStrategy.baseY * 64;
PacketWriter.baseX = (var0 - 6) * 8;
RouteStrategy.baseY = (var1 - 6) * 8;
int var5 = PacketWriter.baseX * 64 - var3;
int var6 = RouteStrategy.baseY * 64 - var4;
var3 = PacketWriter.baseX * 64;
var4 = RouteStrategy.baseY * 64;
@Export("addSceneMenuOptions")
static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
if (Client.isItemSelected == 0 && !Client.isSpellSelected) {
FontName.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3);
}
int var7;
int var9;
int[] var10000;
for (var7 = 0; var7 < 32768; ++var7) {
NPC var8 = Client.npcs[var7];
if (var8 != null) {
for (var9 = 0; var9 < 10; ++var9) {
var10000 = var8.pathX;
var10000[var9] -= var5;
var10000 = var8.pathY;
var10000[var9] -= var6;
long var4 = -1L;
long var6 = -1L;
int var8;
for (var8 = 0; var8 < WorldMapSection2.method300(); ++var8) {
long var9 = ViewportMouse.ViewportMouse_entityTags[var8];
if (var9 != var6) {
var6 = var9;
long var15 = ViewportMouse.ViewportMouse_entityTags[var8];
int var14 = (int)(var15 >>> 0 & 127L);
var14 = var14;
int var28 = Language.ViewportMouse_unpackX(ViewportMouse.ViewportMouse_entityTags[var8]);
int var16 = var28;
int var17 = UserComparator2.ViewportMouse_unpackY(ViewportMouse.ViewportMouse_entityTags[var8]);
int var19 = SecureRandomFuture.method2101(var8);
if (var17 == 2 && WorldMapIcon_1.scene.getObjectFlags(MouseRecorder.plane, var14, var28, var9) >= 0) {
ObjectDefinition var20 = WallDecoration.getObjectDefinition(var19);
if (var20.transforms != null) {
var20 = var20.transform();
}
var8.x -= var5 * 128;
var8.y -= var6 * 128;
}
}
for (var7 = 0; var7 < 2048; ++var7) {
Player var21 = Client.players[var7];
if (var21 != null) {
for (var9 = 0; var9 < 10; ++var9) {
var10000 = var21.pathX;
var10000[var9] -= var5;
var10000 = var21.pathY;
var10000[var9] -= var6;
if (var20 == null) {
continue;
}
var21.x -= var5 * 128;
var21.y -= var6 * 128;
if (Client.isItemSelected == 1) {
FontName.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator7.colorStartTag(65535) + var20.name, 1, var19, var14, var28);
} else if (Client.isSpellSelected) {
if ((BuddyRankComparator.selectedSpellFlags & 4) == 4) {
FontName.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator7.colorStartTag(65535) + var20.name, 2, var19, var14, var28);
}
} else {
String[] var29 = var20.actions;
if (var29 != null) {
for (int var30 = 4; var30 >= 0; --var30) {
if (var29[var30] != null) {
short var23 = 0;
if (var30 == 0) {
var23 = 3;
}
if (var30 == 1) {
var23 = 4;
}
if (var30 == 2) {
var23 = 5;
}
if (var30 == 3) {
var23 = 6;
}
if (var30 == 4) {
var23 = 1001;
}
FontName.insertMenuItemNoShift(var29[var30], UserComparator7.colorStartTag(65535) + var20.name, var23, var19, var14, var16);
}
}
}
FontName.insertMenuItemNoShift("Examine", UserComparator7.colorStartTag(65535) + var20.name, 1002, var20.id, var14, var16);
}
}
}
byte var20 = 0;
byte var18 = 104;
byte var22 = 1;
if (var5 < 0) {
var20 = 103;
var18 = -1;
var22 = -1;
}
int var21;
NPC var22;
Player var24;
int[] var36;
int var38;
if (var17 == 1) {
NPC var33 = Client.npcs[var19];
if (var33 == null) {
continue;
}
byte var10 = 0;
byte var11 = 104;
byte var12 = 1;
if (var6 < 0) {
var10 = 103;
var11 = -1;
var12 = -1;
}
if (var33.definition.size == 1 && (var33.x * -78439701 & 127) == 64 && (var33.y & 127) == 64) {
for (var21 = 0; var21 < Client.npcCount; ++var21) {
var22 = Client.npcs[Client.npcIndices[var21]];
if (var22 != null && var22 != var33 && var22.definition.size == 1 && var33.x * -78439701 == var22.x * -78439701 && var33.y == var22.y) {
InterfaceParent.addNpcToMenu(var22.definition, Client.npcIndices[var21], var14, var16);
}
}
int var14;
for (int var13 = var20; var18 != var13; var13 += var22) {
for (var14 = var10; var11 != var14; var14 += var12) {
int var15 = var5 + var13;
int var16 = var6 + var14;
var21 = Players.Players_count;
var36 = Players.Players_indices;
for (int var17 = 0; var17 < 4; ++var17) {
if (var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16];
} else {
Client.groundItems[var17][var13][var14] = null;
for (var38 = 0; var38 < var21; ++var38) {
var24 = Client.players[var36[var38]];
if (var24 != null && var24.x * -78439701 == var33.x * -78439701 && var24.y == var33.y) {
NetFileRequest.addPlayerToMenu(var24, var36[var38], var14, var16);
}
}
}
InterfaceParent.addNpcToMenu(var33.definition, var19, var14, var16);
}
if (var17 == 0) {
Player var34 = Client.players[var19];
if (var34 == null) {
continue;
}
if ((var34.x * -78439701 & 127) == 64 && (var34.y & 127) == 64) {
for (var21 = 0; var21 < Client.npcCount; ++var21) {
var22 = Client.npcs[Client.npcIndices[var21]];
if (var22 != null && var22.definition.size == 1 && var34.x * -78439701 == var22.x * -78439701 && var34.y == var22.y) {
InterfaceParent.addNpcToMenu(var22.definition, Client.npcIndices[var21], var14, var16);
}
}
var21 = Players.Players_count;
var36 = Players.Players_indices;
for (var38 = 0; var38 < var21; ++var38) {
var24 = Client.players[var36[var38]];
if (var24 != null && var24 != var34 && var34.x * -78439701 == var24.x * -78439701 && var34.y == var24.y) {
NetFileRequest.addPlayerToMenu(var24, var36[var38], var14, var16);
}
}
}
if (var19 != Client.combatTargetPlayerIndex) {
NetFileRequest.addPlayerToMenu(var34, var19, var14, var16);
} else {
var4 = var9;
}
}
if (var17 == 3) {
NodeDeque var35 = Client.groundItems[MouseRecorder.plane][var14][var16];
if (var35 != null) {
for (TileItem var39 = (TileItem)var35.first(); var39 != null; var39 = (TileItem)var35.next()) {
ItemDefinition var37 = Player.ItemDefinition_get(var39.id);
if (Client.isItemSelected == 1) {
FontName.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator7.colorStartTag(16748608) + var37.name, 16, var39.id, var14, var16);
} else if (Client.isSpellSelected) {
if ((BuddyRankComparator.selectedSpellFlags & 1) == 1) {
FontName.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator7.colorStartTag(16748608) + var37.name, 17, var39.id, var14, var16);
}
} else {
String[] var31 = var37.groundActions;
for (int var32 = 4; var32 >= 0; --var32) {
if (var31 != null && var31[var32] != null) {
byte var25 = 0;
if (var32 == 0) {
var25 = 18;
}
if (var32 == 1) {
var25 = 19;
}
if (var32 == 2) {
var25 = 20;
}
if (var32 == 3) {
var25 = 21;
}
if (var32 == 4) {
var25 = 22;
}
FontName.insertMenuItemNoShift(var31[var32], UserComparator7.colorStartTag(16748608) + var37.name, var25, var39.id, var14, var16);
} else if (var32 == 2) {
FontName.insertMenuItemNoShift("Take", UserComparator7.colorStartTag(16748608) + var37.name, 20, var39.id, var14, var16);
}
}
FontName.insertMenuItemNoShift("Examine", UserComparator7.colorStartTag(16748608) + var37.name, 1004, var39.id, var14, var16);
}
}
}
}
}
for (PendingSpawn var19 = (PendingSpawn)Client.pendingSpawns.last(); var19 != null; var19 = (PendingSpawn)Client.pendingSpawns.previous()) {
var19.x -= var5;
var19.y -= var6;
if (var19.x < 0 || var19.y < 0 || var19.x >= 104 || var19.y >= 104) {
var19.remove();
}
}
if (Client.destinationX != 0) {
Client.destinationX -= var5;
Client.destinationY -= var6;
}
Client.soundEffectCount = 0;
Client.isCameraLocked = false;
WallDecoration.cameraX -= var5 << 7;
UserComparator7.cameraZ -= var6 << 7;
DynamicObject.oculusOrbFocalPointX -= var5 << 7;
FriendSystem.oculusOrbFocalPointY -= var6 << 7;
Client.field651 = -1;
Client.graphicsObjects.clear();
Client.projectiles.clear();
for (var14 = 0; var14 < 4; ++var14) {
Client.collisionMaps[var14].clear();
}
}
}
@ObfuscatedName("hl")
@ObfuscatedSignature(
signature = "(ILjava/lang/String;B)V",
garbageValue = "-38"
)
static void method3201(int var0, String var1) {
int var2 = Players.Players_count;
int[] var3 = Players.Players_indices;
boolean var4 = false;
Username var5 = new Username(var1, FontName.loginType);
for (int var6 = 0; var6 < var2; ++var6) {
Player var7 = Client.players[var3[var6]];
if (var7 != null && var7 != WorldMapIcon_1.localPlayer && var7.username != null && var7.username.equals(var5)) {
PacketBufferNode var8;
if (var0 == 1) {
var8 = MenuAction.getPacketBufferNode(ClientPacket.field2272, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeShort(var3[var6]);
var8.packetBuffer.method5545(0);
Client.packetWriter.addNode(var8);
} else if (var0 == 4) {
var8 = MenuAction.getPacketBufferNode(ClientPacket.field2279, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5432(var3[var6]);
var8.packetBuffer.method5545(0);
Client.packetWriter.addNode(var8);
} else if (var0 == 6) {
var8 = MenuAction.getPacketBufferNode(ClientPacket.field2249, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5443(var3[var6]);
var8.packetBuffer.method5435(0);
Client.packetWriter.addNode(var8);
} else if (var0 == 7) {
var8 = MenuAction.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher);
var8.packetBuffer.method5435(0);
var8.packetBuffer.writeShortLE(var3[var6]);
Client.packetWriter.addNode(var8);
}
var4 = true;
break;
}
}
if (!var4) {
DirectByteArrayCopier.addGameMessage(4, "", "Unable to find " + var1);
if (var4 != -1L) {
var8 = (int)(var4 >>> 0 & 127L);
int var10 = Language.ViewportMouse_unpackX(var4);
Player var27 = Client.players[Client.combatTargetPlayerIndex];
NetFileRequest.addPlayerToMenu(var27, Client.combatTargetPlayerIndex, var8, var10);
}
}