chore: rev 188

This commit is contained in:
Owain van Brakel
2020-01-29 14:20:08 +01:00
parent c785d0015b
commit add4ca8005
357 changed files with 41366 additions and 41447 deletions

View File

@@ -1,95 +1,104 @@
import java.util.concurrent.ScheduledExecutorService;
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("bi")
@ObfuscatedName("bu")
@Implements("FriendSystem")
public class FriendSystem {
@ObfuscatedName("x")
@Export("soundSystemExecutor")
static ScheduledExecutorService soundSystemExecutor;
@ObfuscatedName("w")
@ObfuscatedName("ha")
@ObfuscatedGetter(
intValue = -1970559655
)
@Export("cameraYaw")
static int cameraYaw;
@ObfuscatedName("ix")
@ObfuscatedGetter(
intValue = -1654190039
)
@Export("selectedItemWidget")
static int selectedItemWidget;
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "Lll;"
signature = "Lmv;"
)
@Export("loginType")
final LoginType loginType;
@ObfuscatedName("p")
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "Ljr;"
signature = "Ljd;"
)
@Export("friendsList")
public final FriendsList friendsList;
@ObfuscatedName("b")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "Lju;"
signature = "Ljf;"
)
@Export("ignoreList")
public final IgnoreList ignoreList;
@ObfuscatedName("e")
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = 1346758177
intValue = -154816357
)
int field1045;
int field1063;
@ObfuscatedSignature(
signature = "(Lll;)V"
signature = "(Lmv;)V"
)
FriendSystem(LoginType var1) {
this.field1045 = 0;
this.field1063 = 0;
this.loginType = var1;
this.friendsList = new FriendsList(var1);
this.ignoreList = new IgnoreList(var1);
}
@ObfuscatedName("f")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "-1542848201"
garbageValue = "-1947292888"
)
boolean method1844() {
return this.field1045 == 2;
boolean method1857() {
return this.field1063 == 2;
}
@ObfuscatedName("i")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(B)V",
garbageValue = "0"
signature = "(I)V",
garbageValue = "1940001821"
)
final void method1845() {
this.field1045 = 1;
final void method1858() {
this.field1063 = 1;
}
@ObfuscatedName("y")
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(Lkq;II)V",
garbageValue = "818210154"
signature = "(Lkp;II)V",
garbageValue = "224283434"
)
@Export("readUpdate")
final void readUpdate(Buffer var1, int var2) {
this.friendsList.read(var1, var2);
this.field1045 = 2;
Friend.FriendSystem_invalidateFriends();
this.field1063 = 2;
WorldMapID.FriendSystem_invalidateFriends();
}
@ObfuscatedName("w")
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "(B)V",
garbageValue = "64"
signature = "(I)V",
garbageValue = "291777380"
)
@Export("processFriendUpdates")
final void processFriendUpdates() {
for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
if ((long)var1.field3623 < WorldMapID.currentTimeMillis() / 1000L - 5L) {
if ((long)var1.field3632 < WorldMapIcon_0.currentTimeMillis() / 1000L - 5L) {
if (var1.world > 0) {
class83.addGameMessage(5, "", var1.username + " has logged in.");
ClientPreferences.addGameMessage(5, "", var1.username + " has logged in.");
}
if (var1.world == 0) {
class83.addGameMessage(5, "", var1.username + " has logged out.");
ClientPreferences.addGameMessage(5, "", var1.username + " has logged out.");
}
var1.remove();
@@ -98,38 +107,38 @@ public class FriendSystem {
}
@ObfuscatedName("p")
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "(B)V",
garbageValue = "-3"
signature = "(I)V",
garbageValue = "-1660346454"
)
@Export("clear")
final void clear() {
this.field1045 = 0;
this.field1063 = 0;
this.friendsList.clear();
this.ignoreList.clear();
}
@ObfuscatedName("b")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "(Ljc;ZI)Z",
garbageValue = "-1562604277"
signature = "(Ljz;ZI)Z",
garbageValue = "1100778689"
)
@Export("isFriended")
final boolean isFriended(Username var1, boolean var2) {
if (var1 == null) {
return false;
} else if (var1.equals(Message.localPlayer.username)) {
} else if (var1.equals(class192.localPlayer.username)) {
return true;
} else {
return this.friendsList.isFriended(var1, var2);
}
}
@ObfuscatedName("e")
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "(Ljc;I)Z",
garbageValue = "-408948257"
signature = "(Ljz;I)Z",
garbageValue = "819479662"
)
@Export("isIgnored")
final boolean isIgnored(Username var1) {
@@ -140,10 +149,10 @@ public class FriendSystem {
}
}
@ObfuscatedName("x")
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "(Ljava/lang/String;B)V",
garbageValue = "-28"
signature = "(Ljava/lang/String;I)V",
garbageValue = "-340804777"
)
@Export("addFriend")
final void addFriend(String var1) {
@@ -151,16 +160,16 @@ public class FriendSystem {
Username var2 = new Username(var1, this.loginType);
if (var2.hasCleanName()) {
if (this.friendsListIsFull()) {
WorldMapRegion.method446();
} else if (Message.localPlayer.username.equals(var2)) {
Tiles.method1143("You can't add yourself to your own friend list");
WorldMapArea.method425();
} else if (class192.localPlayer.username.equals(var2)) {
WorldMapLabel.method439();
} else if (this.isFriended(var2, false)) {
class288.method5335(var1);
LoginScreenAnimation.method1837(var1);
} else if (this.isIgnored(var2)) {
Tiles.method1143("Please remove " + var1 + " from your ignore list first");
Calendar.method4014(var1);
} else {
PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2236, Client.packetWriter.isaacCipher);
var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher);
var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
var3.packetBuffer.writeStringCp1252NullTerminated(var1);
Client.packetWriter.addNode(var3);
}
@@ -168,20 +177,20 @@ public class FriendSystem {
}
}
@ObfuscatedName("o")
@ObfuscatedName("n")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "1773395073"
garbageValue = "-1302160469"
)
@Export("friendsListIsFull")
final boolean friendsListIsFull() {
return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field746 != 1;
return this.friendsList.isFull() || this.friendsList.getSize() >= 200 && Client.field763 != 1;
}
@ObfuscatedName("l")
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "(Ljava/lang/String;I)V",
garbageValue = "1243376516"
garbageValue = "-1143439097"
)
@Export("addIgnore")
final void addIgnore(String var1) {
@@ -189,37 +198,34 @@ public class FriendSystem {
Username var2 = new Username(var1, this.loginType);
if (var2.hasCleanName()) {
if (this.canAddIgnore()) {
VertexNormal.method2996();
} else if (Message.localPlayer.username.equals(var2)) {
WorldMapCacheName.method620();
class60.method1188("Your ignore list is full. Max of 100 for free users, and 400 for members");
} else if (class192.localPlayer.username.equals(var2)) {
class80.method2097();
} else if (this.isIgnored(var2)) {
Tiles.method1143(var1 + " is already on your ignore list");
ModelData0.method3323(var1);
} else if (this.isFriended(var2, false)) {
class191.method3640(var1);
FloorDecoration.method2912(var1);
} else {
PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2206, Client.packetWriter.isaacCipher);
var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
var3.packetBuffer.writeStringCp1252NullTerminated(var1);
Client.packetWriter.addNode(var3);
class43.method817(var1);
}
}
}
}
@ObfuscatedName("u")
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "-1684864200"
garbageValue = "-1820924219"
)
@Export("canAddIgnore")
final boolean canAddIgnore() {
return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field746 != 1;
return this.ignoreList.isFull() || this.ignoreList.getSize() >= 100 && Client.field763 != 1;
}
@ObfuscatedName("z")
@ObfuscatedName("a")
@ObfuscatedSignature(
signature = "(Ljava/lang/String;I)V",
garbageValue = "975666104"
garbageValue = "561828243"
)
@Export("removeFriend")
final void removeFriend(String var1) {
@@ -227,22 +233,22 @@ public class FriendSystem {
Username var2 = new Username(var1, this.loginType);
if (var2.hasCleanName()) {
if (this.friendsList.removeByUsername(var2)) {
VertexNormal.method2995();
PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2238, Client.packetWriter.isaacCipher);
var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
Client.field839 = Client.cycleCntr;
PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2213, Client.packetWriter.isaacCipher);
var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
var3.packetBuffer.writeStringCp1252NullTerminated(var1);
Client.packetWriter.addNode(var3);
}
Friend.FriendSystem_invalidateFriends();
WorldMapID.FriendSystem_invalidateFriends();
}
}
}
@ObfuscatedName("h")
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "(Ljava/lang/String;I)V",
garbageValue = "2048585665"
garbageValue = "-892672688"
)
@Export("removeIgnore")
final void removeIgnore(String var1) {
@@ -250,22 +256,22 @@ public class FriendSystem {
Username var2 = new Username(var1, this.loginType);
if (var2.hasCleanName()) {
if (this.ignoreList.removeByUsername(var2)) {
VertexNormal.method2995();
PacketBufferNode var3 = class2.getPacketBufferNode(ClientPacket.field2260, Client.packetWriter.isaacCipher);
var3.packetBuffer.writeByte(ViewportMouse.stringCp1252NullTerminatedByteSize(var1));
Client.field839 = Client.cycleCntr;
PacketBufferNode var3 = TilePaint.getPacketBufferNode(ClientPacket.field2288, Client.packetWriter.isaacCipher);
var3.packetBuffer.writeByte(Buddy.stringCp1252NullTerminatedByteSize(var1));
var3.packetBuffer.writeStringCp1252NullTerminated(var1);
Client.packetWriter.addNode(var3);
}
GameShell.FriendSystem_invalidateIgnoreds();
class96.FriendSystem_invalidateIgnoreds();
}
}
}
@ObfuscatedName("aa")
@ObfuscatedName("af")
@ObfuscatedSignature(
signature = "(Ljc;I)Z",
garbageValue = "-2137551829"
signature = "(Ljz;I)Z",
garbageValue = "431116625"
)
@Export("isFriendAndHasWorld")
final boolean isFriendAndHasWorld(Username var1) {
@@ -273,63 +279,42 @@ public class FriendSystem {
return var2 != null && var2.hasWorld();
}
@ObfuscatedName("y")
@ObfuscatedName("ak")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-435303731"
signature = "(ILce;ZB)I",
garbageValue = "0"
)
@Export("savePreferences")
static void savePreferences() {
AccessFile var0 = null;
try {
var0 = Messages.getPreferencesFile("", AbstractWorldMapIcon.field284.name, true);
Buffer var1 = Interpreter.clientPreferences.toBuffer();
var0.write(var1.array, 0, var1.offset);
} catch (Exception var3) {
}
try {
if (var0 != null) {
var0.closeSync(true);
}
} catch (Exception var2) {
}
}
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "(II)V",
garbageValue = "2090172291"
)
@Export("clearItemContainer")
static void clearItemContainer(int var0) {
ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
if (var1 != null) {
for (int var2 = 0; var2 < var1.ids.length; ++var2) {
var1.ids[var2] = -1;
var1.quantities[var2] = 0;
static int method1920(int var0, Script var1, boolean var2) {
int var3;
if (var0 == ScriptOpcodes.CAM_FORCEANGLE) {
class320.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize];
int var4 = Interpreter.Interpreter_intStack[class320.Interpreter_intStackSize + 1];
if (!Client.isCameraLocked) {
Client.camAngleX = var3;
Client.camAngleY = var4;
}
}
}
@ObfuscatedName("km")
@ObfuscatedSignature(
signature = "(Lha;IIII)V",
garbageValue = "688328393"
)
@Export("drawCompass")
static final void drawCompass(Widget var0, int var1, int var2, int var3) {
SpriteMask var4 = var0.getSpriteMask(false);
if (var4 != null) {
if (Client.minimapState < 3) {
GrandExchangeOfferTotalQuantityComparator.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
} else {
Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths);
return 1;
} else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) {
Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camAngleX;
return 1;
} else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) {
Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camAngleY;
return 1;
} else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) {
var3 = Interpreter.Interpreter_intStack[--class320.Interpreter_intStackSize];
if (var3 < 0) {
var3 = 0;
}
Client.camFollowHeight = var3;
return 1;
} else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) {
Interpreter.Interpreter_intStack[++class320.Interpreter_intStackSize - 1] = Client.camFollowHeight;
return 1;
} else {
return 2;
}
}
}