chore: rev 190

This commit is contained in:
ThatGamerBlue
2020-06-18 12:15:38 +01:00
parent c97f7b196e
commit 655106b9df
351 changed files with 41484 additions and 41558 deletions

View File

@@ -3,62 +3,61 @@ 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("ep")
@ObfuscatedName("ez")
@Implements("BoundaryObject")
public final class BoundaryObject {
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = 2013637089
)
@Export("y")
int y;
@ObfuscatedName("m")
@ObfuscatedGetter(
intValue = 1191949217
intValue = 175264999
)
@Export("tileHeight")
int tileHeight;
@ObfuscatedName("k")
@ObfuscatedName("o")
@ObfuscatedGetter(
intValue = -935099037
intValue = 782033861
)
@Export("x")
int x;
@ObfuscatedName("d")
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = 2050214703
intValue = 1104746355
)
@Export("y")
int y;
@ObfuscatedName("j")
@ObfuscatedGetter(
intValue = -742181125
)
@Export("orientationA")
int orientationA;
@ObfuscatedName("w")
@ObfuscatedName("p")
@ObfuscatedGetter(
intValue = -1637656997
intValue = -1690066511
)
@Export("orientationB")
int orientationB;
@ObfuscatedName("v")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "Lee;"
signature = "Lel;"
)
@Export("entity1")
public Entity entity1;
@ObfuscatedName("q")
@ObfuscatedName("n")
@ObfuscatedSignature(
signature = "Lee;"
signature = "Lel;"
)
@Export("entity2")
public Entity entity2;
@ObfuscatedName("z")
@ObfuscatedName("u")
@ObfuscatedGetter(
longValue = 8712969699368096229L
longValue = 3086546930439306913L
)
@Export("tag")
public long tag;
@ObfuscatedName("t")
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = 1289122601
intValue = 485971219
)
@Export("flags")
int flags;
@@ -70,354 +69,178 @@ public final class BoundaryObject {
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(IIII)Lce;",
garbageValue = "-719728055"
signature = "(I)V",
garbageValue = "1351583068"
)
@Export("getWorldMapScript")
static Script getWorldMapScript(int var0, int var1, int var2) {
int var3 = (var1 << 8) + var0;
Script var6 = (Script)Script.Script_cached.get((long)(var3 << 16));
Script var5;
if (var6 != null) {
var5 = var6;
} else {
String var7 = String.valueOf(var3);
int var8 = class41.archive12.getGroupId(var7);
if (var8 == -1) {
var5 = null;
} else {
label56: {
byte[] var9 = class41.archive12.takeFileFlat(var8);
if (var9 != null) {
if (var9.length <= 1) {
var5 = null;
break label56;
}
var6 = SecureRandomCallable.newScript(var9);
if (var6 != null) {
Script.Script_cached.put(var6, (long)(var3 << 16));
var5 = var6;
break label56;
}
}
var5 = null;
}
}
}
if (var5 != null) {
return var5;
} else {
int var4 = class58.method963(var2, var0);
Script var12 = (Script)Script.Script_cached.get((long)(var4 << 16));
Script var13;
if (var12 != null) {
var13 = var12;
} else {
String var14 = String.valueOf(var4);
int var10 = class41.archive12.getGroupId(var14);
if (var10 == -1) {
var13 = null;
} else {
byte[] var11 = class41.archive12.takeFileFlat(var10);
if (var11 != null) {
if (var11.length <= 1) {
var13 = null;
return var13 != null ? var13 : null;
}
var12 = SecureRandomCallable.newScript(var11);
if (var12 != null) {
Script.Script_cached.put(var12, (long)(var4 << 16));
var13 = var12;
return var13 != null ? var13 : null;
}
}
var13 = null;
}
}
return var13 != null ? var13 : null;
}
static void method3390() {
Tiles.field530 = null;
Tiles.field524 = null;
Tiles.field525 = null;
WorldMapLabel.field269 = null;
HealthBarUpdate.field1031 = null;
class171.field2036 = null;
Tiles.field526 = null;
BuddyRankComparator.Tiles_hue = null;
GrandExchangeOfferAgeComparator.Tiles_saturation = null;
TextureProvider.Tiles_lightness = null;
class237.Tiles_hueMultiplier = null;
WorldMapRectangle.field198 = null;
}
@ObfuscatedName("am")
@ObfuscatedName("hz")
@ObfuscatedSignature(
signature = "(ILce;ZI)I",
garbageValue = "-522510299"
signature = "(Lkb;I)V",
garbageValue = "-1547224129"
)
static int method3376(int var0, Script var1, boolean var2) {
if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.publicChatMode;
return 1;
} else if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
Interpreter.Interpreter_intStackSize -= 3;
Client.publicChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
UserComparator3.privateChatMode = class219.method4052(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
if (UserComparator3.privateChatMode == null) {
UserComparator3.privateChatMode = PrivateChatMode.field3806;
static final void method3389(PacketBuffer var0) {
for (int var1 = 0; var1 < Client.field718; ++var1) {
int var2 = Client.field719[var1];
NPC var3 = Client.npcs[var2];
int var4 = var0.readUnsignedByte();
int var5;
int var6;
int var7;
if ((var4 & 128) != 0) {
var5 = var0.method5755();
if (var5 == 65535) {
var5 = -1;
}
var6 = var0.method5746();
if (var5 == var3.sequence && var5 != -1) {
var7 = NetSocket.SequenceDefinition_get(var5).field3561;
if (var7 == 1) {
var3.sequenceFrame = 0;
var3.sequenceFrameCycle = 0;
var3.sequenceDelay = var6;
var3.field1000 = 0;
}
if (var7 == 2) {
var3.field1000 = 0;
}
} else if (var5 == -1 || var3.sequence == -1 || NetSocket.SequenceDefinition_get(var5).field3543 >= NetSocket.SequenceDefinition_get(var3.sequence).field3543) {
var3.sequence = var5;
var3.sequenceFrame = 0;
var3.sequenceFrameCycle = 0;
var3.sequenceDelay = var6;
var3.field1000 = 0;
var3.field1023 = var3.pathLength;
}
}
Client.tradeChatMode = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
PacketBufferNode var18 = FaceNormal.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher);
var18.packetBuffer.writeByte(Client.publicChatMode);
var18.packetBuffer.writeByte(UserComparator3.privateChatMode.field3804);
var18.packetBuffer.writeByte(Client.tradeChatMode);
Client.packetWriter.addNode(var18);
return 1;
} else {
String var3;
int var4;
if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
Interpreter.Interpreter_intStackSize -= 2;
var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
int var5 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
PacketBufferNode var6 = FaceNormal.getPacketBufferNode(ClientPacket.field2289, Client.packetWriter.isaacCipher);
var6.packetBuffer.writeByte(class234.stringCp1252NullTerminatedByteSize(var3) + 2);
var6.packetBuffer.writeStringCp1252NullTerminated(var3);
var6.packetBuffer.writeByte(var4 - 1);
var6.packetBuffer.writeByte(var5);
Client.packetWriter.addNode(var6);
return 1;
} else {
int var8;
if ((var4 & 16) != 0) {
var5 = var0.readUnsignedShort();
var6 = var0.method5755();
var7 = var3.x - (var5 - class182.baseX - class182.baseX) * 64;
var8 = var3.y - (var6 - SecureRandomFuture.baseY - SecureRandomFuture.baseY) * 64;
if (var7 != 0 || var8 != 0) {
var3.field992 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
}
}
if ((var4 & 2) != 0) {
var3.field995 = var0.method5751();
var3.field1008 = var0.readByte();
var3.field1007 = var0.readByte();
var3.field1009 = var0.method5751();
var3.field966 = var0.method5757() + Client.cycle;
var3.field1011 = var0.method5755() + Client.cycle;
var3.field1006 = var0.readUnsignedShort();
var3.pathLength = 1;
var3.field1023 = 0;
var3.field995 += var3.pathX[0];
var3.field1008 += var3.pathY[0];
var3.field1007 += var3.pathX[0];
var3.field1009 += var3.pathY[0];
}
if ((var4 & 1) != 0) {
var5 = var0.method5748();
int var9;
int var10;
if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) {
Interpreter.Interpreter_intStackSize -= 2;
var10 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
Message var15 = class1.Messages_getByChannelAndID(var10, var4);
if (var15 != null) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.count;
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.cycle;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : "";
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0);
} else {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
}
int var11;
if (var5 > 0) {
for (var6 = 0; var6 < var5; ++var6) {
var8 = -1;
var9 = -1;
var10 = -1;
var7 = var0.readUShortSmart();
if (var7 == 32767) {
var7 = var0.readUShortSmart();
var9 = var0.readUShortSmart();
var8 = var0.readUShortSmart();
var10 = var0.readUShortSmart();
} else if (var7 != 32766) {
var9 = var0.readUShortSmart();
} else {
var7 = -1;
}
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) {
var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
Message var16 = PendingSpawn.Messages_getMessage(var10);
if (var16 != null) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.type;
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.cycle;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : "";
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0);
} else {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
var11 = var0.readUShortSmart();
var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11);
}
}
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
if (UserComparator3.privateChatMode == null) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = UserComparator3.privateChatMode.field3804;
}
return 1;
} else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
var4 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
String var14 = var3.toLowerCase();
byte var17 = 0;
if (var14.startsWith("yellow:")) {
var17 = 0;
var3 = var3.substring("yellow:".length());
} else if (var14.startsWith("red:")) {
var17 = 1;
var3 = var3.substring("red:".length());
} else if (var14.startsWith("green:")) {
var17 = 2;
var3 = var3.substring("green:".length());
} else if (var14.startsWith("cyan:")) {
var17 = 3;
var3 = var3.substring("cyan:".length());
} else if (var14.startsWith("purple:")) {
var17 = 4;
var3 = var3.substring("purple:".length());
} else if (var14.startsWith("white:")) {
var17 = 5;
var3 = var3.substring("white:".length());
} else if (var14.startsWith("flash1:")) {
var17 = 6;
var3 = var3.substring("flash1:".length());
} else if (var14.startsWith("flash2:")) {
var17 = 7;
var3 = var3.substring("flash2:".length());
} else if (var14.startsWith("flash3:")) {
var17 = 8;
var3 = var3.substring("flash3:".length());
} else if (var14.startsWith("glow1:")) {
var17 = 9;
var3 = var3.substring("glow1:".length());
} else if (var14.startsWith("glow2:")) {
var17 = 10;
var3 = var3.substring("glow2:".length());
} else if (var14.startsWith("glow3:")) {
var17 = 11;
var3 = var3.substring("glow3:".length());
} else if (Language.Language_EN != IgnoreList.clientLanguage) {
if (var14.startsWith("yellow:")) {
var17 = 0;
var3 = var3.substring("yellow:".length());
} else if (var14.startsWith("red:")) {
var17 = 1;
var3 = var3.substring("red:".length());
} else if (var14.startsWith("green:")) {
var17 = 2;
var3 = var3.substring("green:".length());
} else if (var14.startsWith("cyan:")) {
var17 = 3;
var3 = var3.substring("cyan:".length());
} else if (var14.startsWith("purple:")) {
var17 = 4;
var3 = var3.substring("purple:".length());
} else if (var14.startsWith("white:")) {
var17 = 5;
var3 = var3.substring("white:".length());
} else if (var14.startsWith("flash1:")) {
var17 = 6;
var3 = var3.substring("flash1:".length());
} else if (var14.startsWith("flash2:")) {
var17 = 7;
var3 = var3.substring("flash2:".length());
} else if (var14.startsWith("flash3:")) {
var17 = 8;
var3 = var3.substring("flash3:".length());
} else if (var14.startsWith("glow1:")) {
var17 = 9;
var3 = var3.substring("glow1:".length());
} else if (var14.startsWith("glow2:")) {
var17 = 10;
var3 = var3.substring("glow2:".length());
} else if (var14.startsWith("glow3:")) {
var17 = 11;
var3 = var3.substring("glow3:".length());
var6 = var0.readUnsignedByte();
if (var6 > 0) {
for (var7 = 0; var7 < var6; ++var7) {
var8 = var0.readUShortSmart();
var9 = var0.readUShortSmart();
if (var9 != 32767) {
var10 = var0.readUShortSmart();
var11 = var0.readUnsignedByte();
int var12 = var9 > 0 ? var0.readUnsignedByte() : var11;
var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12);
} else {
var3.removeHealthBar(var8);
}
}
}
}
var14 = var3.toLowerCase();
byte var7 = 0;
if (var14.startsWith("wave:")) {
var7 = 1;
var3 = var3.substring("wave:".length());
} else if (var14.startsWith("wave2:")) {
var7 = 2;
var3 = var3.substring("wave2:".length());
} else if (var14.startsWith("shake:")) {
var7 = 3;
var3 = var3.substring("shake:".length());
} else if (var14.startsWith("scroll:")) {
var7 = 4;
var3 = var3.substring("scroll:".length());
} else if (var14.startsWith("slide:")) {
var7 = 5;
var3 = var3.substring("slide:".length());
} else if (IgnoreList.clientLanguage != Language.Language_EN) {
if (var14.startsWith("wave:")) {
var7 = 1;
var3 = var3.substring("wave:".length());
} else if (var14.startsWith("wave2:")) {
var7 = 2;
var3 = var3.substring("wave2:".length());
} else if (var14.startsWith("shake:")) {
var7 = 3;
var3 = var3.substring("shake:".length());
} else if (var14.startsWith("scroll:")) {
var7 = 4;
var3 = var3.substring("scroll:".length());
} else if (var14.startsWith("slide:")) {
var7 = 5;
var3 = var3.substring("slide:".length());
}
}
if ((var4 & 32) != 0) {
var3.overheadText = var0.readStringCp1252NullTerminated();
var3.overheadTextCyclesRemaining = 100;
}
PacketBufferNode var8 = FaceNormal.getPacketBufferNode(ClientPacket.field2229, Client.packetWriter.isaacCipher);
var8.packetBuffer.writeByte(0);
int var9 = var8.packetBuffer.offset;
var8.packetBuffer.writeByte(var4);
var8.packetBuffer.writeByte(var17);
var8.packetBuffer.writeByte(var7);
GraphicsDefaults.method5966(var8.packetBuffer, var3);
var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9);
Client.packetWriter.addNode(var8);
return 1;
} else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
Interpreter.Interpreter_stringStackSize -= 2;
var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
String var12 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
PacketBufferNode var11 = FaceNormal.getPacketBufferNode(ClientPacket.field2283, Client.packetWriter.isaacCipher);
var11.packetBuffer.writeShort(0);
int var13 = var11.packetBuffer.offset;
var11.packetBuffer.writeStringCp1252NullTerminated(var3);
GraphicsDefaults.method5966(var11.packetBuffer, var12);
var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13);
Client.packetWriter.addNode(var11);
return 1;
} else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) {
if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.tradeChatMode;
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = PacketWriter.Messages_getHistorySize(var10);
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = ObjectSound.Messages_getNextChatID(var10);
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
var10 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = class58.Messages_getLastChatID(var10);
return 1;
} else if (var0 == ScriptOpcodes.DOCHEAT) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
class60.doCheat(var3);
return 1;
} else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) {
Client.field814 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
return 1;
} else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) {
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field814;
return 1;
} else if (var0 == ScriptOpcodes.DEBUGMES) {
var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
System.out.println(var3);
return 1;
} else {
return 2;
}
} else {
if (ByteArrayPool.localPlayer != null && ByteArrayPool.localPlayer.username != null) {
var3 = ByteArrayPool.localPlayer.username.getName();
} else {
var3 = "";
}
if ((var4 & 4) != 0) {
var3.definition = StudioGame.getNpcDefinition(var0.method5757());
var3.field967 = var3.definition.size;
var3.field1017 = var3.definition.rotation;
var3.walkSequence = var3.definition.walkSequence;
var3.walkBackSequence = var3.definition.walkBackSequence;
var3.walkLeftSequence = var3.definition.walkLeftSequence;
var3.walkRightSequence = var3.definition.walkRightSequence;
var3.idleSequence = var3.definition.idleSequence;
var3.turnLeftSequence = var3.definition.turnLeftSequence;
var3.turnRightSequence = var3.definition.turnRightSequence;
}
Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
return 1;
if ((var4 & 8) != 0) {
var3.targetIndex = var0.readUnsignedShort();
if (var3.targetIndex == 65535) {
var3.targetIndex = -1;
}
}
if ((var4 & 64) != 0) {
var3.spotAnimation = var0.method5757();
var5 = var0.method5767();
var3.field1005 = var5 >> 16;
var3.field987 = (var5 & 65535) + Client.cycle;
var3.spotAnimationFrame = 0;
var3.spotAnimationFrameCycle = 0;
if (var3.field987 > Client.cycle) {
var3.spotAnimationFrame = -1;
}
if (var3.spotAnimation == 65535) {
var3.spotAnimation = -1;
}
}
}
}
}