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

@@ -4,155 +4,160 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("bi")
@ObfuscatedName("by")
@Implements("Player")
public final class Player extends Actor {
@ObfuscatedName("x")
@ObfuscatedName("gi")
@ObfuscatedGetter(
intValue = 1432806709
)
static int field638;
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "Lku;"
signature = "Lkq;"
)
@Export("username")
Username username;
@ObfuscatedName("m")
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "Lhk;"
signature = "Lhv;"
)
@Export("appearance")
PlayerAppearance appearance;
@ObfuscatedName("k")
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = -955452579
intValue = 1861709523
)
@Export("headIconPk")
int headIconPk;
@ObfuscatedName("d")
@ObfuscatedName("j")
@ObfuscatedGetter(
intValue = -1682761079
intValue = 777321397
)
@Export("headIconPrayer")
int headIconPrayer;
@ObfuscatedName("v")
@ObfuscatedName("g")
@Export("actions")
String[] actions;
@ObfuscatedName("q")
@ObfuscatedName("n")
@ObfuscatedGetter(
intValue = -1517162387
intValue = 2047058123
)
@Export("combatLevel")
int combatLevel;
@ObfuscatedName("z")
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = 614146335
intValue = -1460634789
)
@Export("skillLevel")
int skillLevel;
@ObfuscatedName("t")
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = -550900363
intValue = -287002613
)
@Export("tileHeight")
int tileHeight;
@ObfuscatedName("e")
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = 1364374011
intValue = 1724096507
)
@Export("animationCycleStart")
int animationCycleStart;
@ObfuscatedName("s")
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -1470813775
intValue = -691368709
)
@Export("animationCycleEnd")
int animationCycleEnd;
@ObfuscatedName("p")
@ObfuscatedName("y")
@ObfuscatedGetter(
intValue = 168679087
intValue = 366626367
)
int field662;
@ObfuscatedName("n")
int field661;
@ObfuscatedName("c")
@ObfuscatedGetter(
intValue = 620810729
intValue = 1150589939
)
@Export("tileHeight2")
int tileHeight2;
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = -2027049547
)
int field657;
@ObfuscatedName("h")
@ObfuscatedGetter(
intValue = -1432568009
)
int field653;
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "Lel;"
signature = "Lef;"
)
@Export("model0")
Model model0;
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = 1127396435
)
int field659;
@ObfuscatedName("i")
@ObfuscatedGetter(
intValue = 240208849
)
int field660;
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = -2013432115
)
int field661;
@ObfuscatedName("b")
@ObfuscatedGetter(
intValue = -971151235
)
int field664;
@ObfuscatedName("l")
@Export("isUnanimated")
boolean isUnanimated;
@ObfuscatedName("r")
@ObfuscatedGetter(
intValue = -1431900799
intValue = 1121860103
)
int field648;
@ObfuscatedName("s")
@ObfuscatedGetter(
intValue = -1904203447
)
int field649;
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = -1087815703
)
int field650;
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = -910928239
)
int field651;
@ObfuscatedName("e")
@Export("isUnanimated")
boolean isUnanimated;
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = -136485713
)
@Export("team")
int team;
@ObfuscatedName("o")
@ObfuscatedName("t")
@Export("isHidden")
boolean isHidden;
@ObfuscatedName("c")
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = -777722891
intValue = 679078717
)
@Export("plane")
int plane;
@ObfuscatedName("j")
@ObfuscatedName("b")
@ObfuscatedGetter(
intValue = -1532250791
intValue = 445698711
)
@Export("index")
int index;
@ObfuscatedName("y")
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "Lkv;"
signature = "Lkf;"
)
@Export("isFriendTriBool")
TriBool isFriendTriBool;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Lkv;"
signature = "Lkf;"
)
@Export("isInClanChat")
TriBool isInClanChat;
@ObfuscatedName("ae")
boolean field670;
@ObfuscatedName("ah")
boolean field659;
@ObfuscatedName("ai")
@ObfuscatedGetter(
intValue = 1349885547
intValue = 1374290549
)
@Export("tileX")
int tileX;
@ObfuscatedName("ap")
@ObfuscatedName("ao")
@ObfuscatedGetter(
intValue = -1671422285
intValue = 499025605
)
@Export("tileY")
int tileY;
@@ -175,13 +180,13 @@ public final class Player extends Actor {
this.isHidden = false;
this.isFriendTriBool = TriBool.TriBool_unknown;
this.isInClanChat = TriBool.TriBool_unknown;
this.field670 = false;
this.field659 = false;
}
@ObfuscatedName("x")
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(Lkb;I)V",
garbageValue = "-2042142749"
signature = "(Lkn;I)V",
garbageValue = "1937390555"
)
@Export("read")
final void read(Buffer var1) {
@@ -208,7 +213,7 @@ public final class Player extends Actor {
}
if (var4[var5] >= 512) {
int var8 = AbstractWorldMapData.ItemDefinition_get(var4[var5] - 512).team;
int var8 = KitDefinition.ItemDefinition_get(var4[var5] - 512).team;
if (var8 != 0) {
this.team = var8;
}
@@ -220,7 +225,7 @@ public final class Player extends Actor {
for (var6 = 0; var6 < 5; ++var6) {
var7 = var1.readUnsignedByte();
if (var7 < 0 || var7 >= VertexNormal.field1764[var6].length) {
if (var7 < 0 || var7 >= PlayerAppearance.field2575[var6].length) {
var7 = 0;
}
@@ -263,10 +268,10 @@ public final class Player extends Actor {
super.runSequence = -1;
}
this.username = new Username(var1.readStringCp1252NullTerminated(), WorldMapIcon_0.loginType);
this.username = new Username(var1.readStringCp1252NullTerminated(), class195.loginType);
this.clearIsFriend();
this.clearIsInClanChat();
if (this == ByteArrayPool.localPlayer) {
if (this == class60.localPlayer) {
RunException.localPlayerName = this.username.getName();
}
@@ -284,10 +289,10 @@ public final class Player extends Actor {
this.appearance.update(var4, var9, var2 == 1, var3);
}
@ObfuscatedName("m")
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "990067508"
garbageValue = "-928055977"
)
@Export("isFriend")
boolean isFriend() {
@@ -298,30 +303,30 @@ public final class Player extends Actor {
return this.isFriendTriBool == TriBool.TriBool_true;
}
@ObfuscatedName("k")
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "77261851"
garbageValue = "1165782088"
)
@Export("clearIsFriend")
void clearIsFriend() {
this.isFriendTriBool = TriBool.TriBool_unknown;
}
@ObfuscatedName("d")
@ObfuscatedName("j")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-1863320246"
garbageValue = "-2131517341"
)
@Export("checkIsFriend")
void checkIsFriend() {
this.isFriendTriBool = Projectile.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
this.isFriendTriBool = ModeWhere.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
}
@ObfuscatedName("w")
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "1535464163"
garbageValue = "-1651593034"
)
@Export("isClanMember")
boolean isClanMember() {
@@ -332,48 +337,48 @@ public final class Player extends Actor {
return this.isInClanChat == TriBool.TriBool_true;
}
@ObfuscatedName("v")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "(B)V",
garbageValue = "81"
signature = "(I)V",
garbageValue = "1245879584"
)
@Export("clearIsInClanChat")
void clearIsInClanChat() {
this.isInClanChat = TriBool.TriBool_unknown;
}
@ObfuscatedName("q")
@ObfuscatedName("n")
@ObfuscatedSignature(
signature = "(B)V",
garbageValue = "101"
garbageValue = "0"
)
@Export("updateIsInClanChat")
void updateIsInClanChat() {
this.isInClanChat = InterfaceParent.clanChat != null && InterfaceParent.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
this.isInClanChat = ClientPreferences.clanChat != null && ClientPreferences.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
}
@ObfuscatedName("z")
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "(B)I",
garbageValue = "52"
signature = "(I)I",
garbageValue = "-6778929"
)
@Export("transformedSize")
int transformedSize() {
return this.appearance != null && this.appearance.npcTransformId != -1 ? class237.getNpcDefinition(this.appearance.npcTransformId).size : 1;
return this.appearance != null && this.appearance.npcTransformId != -1 ? StudioGame.getNpcDefinition(this.appearance.npcTransformId).size : 1;
}
@ObfuscatedName("t")
@ObfuscatedName("a")
@ObfuscatedSignature(
signature = "(I)Lel;",
garbageValue = "480835067"
signature = "(I)Lef;",
garbageValue = "1832696685"
)
@Export("getModel")
protected final Model getModel() {
if (this.appearance == null) {
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? SpotAnimationDefinition.SequenceDefinition_get(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : SpotAnimationDefinition.SequenceDefinition_get(super.movementSequence);
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? NetSocket.SequenceDefinition_get(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.movementSequence == super.idleSequence && var1 != null ? null : NetSocket.SequenceDefinition_get(super.movementSequence);
Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if (var3 == null) {
return null;
@@ -383,9 +388,9 @@ public final class Player extends Actor {
Model var4;
Model[] var5;
if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
var4 = MouseHandler.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
var4 = class4.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.field1033, 0);
var4.offsetBy(0, -super.field1005, 0);
var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
}
@@ -398,7 +403,7 @@ public final class Player extends Actor {
if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) {
var4 = this.model0;
var4.offsetBy(this.field662 - super.x, this.tileHeight2 - this.tileHeight, this.field657 - super.y);
var4.offsetBy(this.field661 - super.x, this.tileHeight2 - this.tileHeight, this.field653 - super.y);
if (super.orientation == 512) {
var4.rotateY90Ccw();
var4.rotateY90Ccw();
@@ -423,7 +428,7 @@ public final class Player extends Actor {
var4.rotateY90Ccw();
}
var4.offsetBy(super.x - this.field662, this.tileHeight - this.tileHeight2, super.y - this.field657);
var4.offsetBy(super.x - this.field661, this.tileHeight - this.tileHeight2, super.y - this.field653);
}
}
@@ -433,24 +438,24 @@ public final class Player extends Actor {
}
}
@ObfuscatedName("e")
@ObfuscatedName("z")
@ObfuscatedSignature(
signature = "(IIBI)V",
garbageValue = "-618087503"
garbageValue = "-1126022474"
)
final void method1339(int var1, int var2, byte var3) {
if (super.sequence != -1 && SpotAnimationDefinition.SequenceDefinition_get(super.sequence).field3524 == 1) {
final void method1300(int var1, int var2, byte var3) {
if (super.sequence != -1 && NetSocket.SequenceDefinition_get(super.sequence).field3560 == 1) {
super.sequence = -1;
}
super.field1015 = -1;
super.field992 = -1;
if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) {
if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) {
if (var3 == 2) {
SoundCache.method2609(this, var1, var2, (byte)2);
ApproximateRouteStrategy.method1284(this, var1, var2, (byte)2);
}
this.method1341(var1, var2, var3);
this.method1302(var1, var2, var3);
} else {
this.resetPath(var1, var2);
}
@@ -460,29 +465,29 @@ public final class Player extends Actor {
}
@ObfuscatedName("s")
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "(III)V",
garbageValue = "-2118599552"
garbageValue = "2675490"
)
@Export("resetPath")
void resetPath(int var1, int var2) {
super.pathLength = 0;
super.field1032 = 0;
super.field1031 = 0;
super.field1023 = 0;
super.field1022 = 0;
super.pathX[0] = var1;
super.pathY[0] = var2;
int var3 = this.transformedSize();
super.x = super.pathX[0] * 128 + var3 * 64;
super.y = super.pathY[0] * 128 + var3 * 64;
super.x = var3 * 64 + super.pathX[0] * 128;
super.y = var3 * 64 + super.pathY[0] * 128;
}
@ObfuscatedName("p")
@ObfuscatedName("y")
@ObfuscatedSignature(
signature = "(IIBI)V",
garbageValue = "1447911882"
garbageValue = "-1628655645"
)
final void method1341(int var1, int var2, byte var3) {
final void method1302(int var1, int var2, byte var3) {
if (super.pathLength < 9) {
++super.pathLength;
}
@@ -498,98 +503,114 @@ public final class Player extends Actor {
super.pathTraversed[0] = var3;
}
@ObfuscatedName("n")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "116176402"
signature = "(B)Z",
garbageValue = "1"
)
@Export("isVisible")
final boolean isVisible() {
return this.appearance != null;
}
@ObfuscatedName("x")
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "556074954"
signature = "(III)V",
garbageValue = "-2139314606"
)
static int method1342() {
return ++Messages.Messages_count - 1;
}
@Export("changeWorldSelectSorting")
static void changeWorldSelectSorting(int var0, int var1) {
int[] var2 = new int[4];
int[] var3 = new int[4];
var2[0] = var0;
var3[0] = var1;
int var4 = 1;
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "(IZIZI)V",
garbageValue = "1788243043"
)
@Export("sortWorldList")
static void sortWorldList(int var0, boolean var1, int var2, boolean var3) {
if (UserComparator2.World_worlds != null) {
ModelData0.doWorldSorting(0, UserComparator2.World_worlds.length - 1, var0, var1, var2, var3);
for (int var5 = 0; var5 < 4; ++var5) {
if (World.World_sortOption1[var5] != var0) {
var2[var4] = World.World_sortOption1[var5];
var3[var4] = World.World_sortOption2[var5];
++var4;
}
}
World.World_sortOption1 = var2;
World.World_sortOption2 = var3;
GrandExchangeOffer.sortWorlds(class13.World_worlds, 0, class13.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2);
}
@ObfuscatedName("z")
@ObfuscatedName("io")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-389992863"
signature = "(Lby;IIIS)V",
garbageValue = "160"
)
static void method1383() {
Players.Players_count = 0;
@Export("addPlayerToMenu")
static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
if (class60.localPlayer != var0) {
if (Client.menuOptionsCount < 400) {
String var4;
if (var0.skillLevel == 0) {
var4 = var0.actions[0] + var0.username + var0.actions[1] + Canvas.method924(var0.combatLevel, class60.localPlayer.combatLevel) + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2];
} else {
var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2];
}
for (int var0 = 0; var0 < 2048; ++var0) {
Players.field1269[var0] = null;
Players.field1273[var0] = 1;
}
int var5;
if (Client.isItemSelected == 1) {
ScriptEvent.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ItemContainer.colorStartTag(16777215) + var4, 14, var1, var2, var3);
} else if (Client.isSpellSelected) {
if ((WorldMapSprite.selectedSpellFlags & 8) == 8) {
ScriptEvent.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ItemContainer.colorStartTag(16777215) + var4, 15, var1, var2, var3);
}
} else {
for (var5 = 7; var5 >= 0; --var5) {
if (Client.playerMenuActions[var5] != null) {
short var6 = 0;
if (Client.playerMenuActions[var5].equalsIgnoreCase("Attack")) {
if (AttackOption.AttackOption_hidden == Client.playerAttackOption) {
continue;
}
}
if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || Client.playerAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > class60.localPlayer.combatLevel) {
var6 = 2000;
}
@ObfuscatedName("fg")
@ObfuscatedSignature(
signature = "(II)V",
garbageValue = "-357843101"
)
@Export("forceDisconnect")
static final void forceDisconnect(int var0) {
Huffman.logOut();
switch(var0) {
case 1:
ReflectionCheck.method2396();
break;
case 2:
Login.loginIndex = 24;
HealthBarUpdate.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", "");
}
if (class60.localPlayer.team != 0 && var0.team != 0) {
if (var0.team == class60.localPlayer.team) {
var6 = 2000;
} else {
var6 = 0;
}
}
} else if (Client.playerOptionsPriorities[var5]) {
var6 = 2000;
}
}
boolean var7 = false;
int var8 = Client.playerMenuOpcodes[var5] + var6;
ScriptEvent.insertMenuItemNoShift(Client.playerMenuActions[var5], ItemContainer.colorStartTag(16777215) + var4, var8, var1, var2, var3);
}
}
}
@ObfuscatedName("ju")
@ObfuscatedSignature(
signature = "(Lhe;IIB)V",
garbageValue = "2"
)
@Export("clickWidget")
static final void clickWidget(Widget var0, int var1, int var2) {
if (Client.clickedWidget == null && !Client.isMenuOpen) {
if (var0 != null && KitDefinition.method4538(var0) != null) {
Client.clickedWidget = var0;
Client.clickedWidgetParent = KitDefinition.method4538(var0);
Client.widgetClickX = var1;
Client.widgetClickY = var2;
MilliClock.widgetDragDuration = 0;
Client.isDraggingWidget = false;
int var3 = AbstractWorldMapData.method381();
if (var3 != -1) {
AbstractWorldMapIcon.tempMenuAction = new MenuAction();
AbstractWorldMapIcon.tempMenuAction.param0 = Client.menuArguments1[var3];
AbstractWorldMapIcon.tempMenuAction.param1 = Client.menuArguments2[var3];
AbstractWorldMapIcon.tempMenuAction.opcode = Client.menuOpcodes[var3];
AbstractWorldMapIcon.tempMenuAction.identifier = Client.menuIdentifiers[var3];
AbstractWorldMapIcon.tempMenuAction.action = Client.menuActions[var3];
for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
if (Client.menuOpcodes[var5] == 23) {
Client.menuTargets[var5] = ItemContainer.colorStartTag(16777215) + var4;
break;
}
}
}
}
}
@ObfuscatedName("iv")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "452106658"
)
@Export("getTapToDrop")
static boolean getTapToDrop() {
return Client.tapToDrop;
}
}