rsclient: rev 191

This commit is contained in:
ThatGamerBlue
2020-08-26 21:11:23 +01:00
parent 106de31a9d
commit b6ea56781c
354 changed files with 61347 additions and 61083 deletions

View File

@@ -1,4 +1,3 @@
import java.applet.Applet;
import java.io.DataInputStream;
import java.net.InetAddress;
import java.net.Socket;
@@ -8,558 +7,208 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("fm")
@ObfuscatedName("fo")
@Implements("TaskHandler")
public class TaskHandler implements Runnable {
@ObfuscatedName("m")
@ObfuscatedName("z")
@Export("javaVendor")
public static String javaVendor;
@ObfuscatedName("o")
@ObfuscatedName("k")
@Export("javaVersion")
public static String javaVersion;
@ObfuscatedName("jq")
@ObfuscatedName("w")
@Export("SpriteBuffer_spritePalette")
static int[] SpriteBuffer_spritePalette;
@ObfuscatedName("lp")
@ObfuscatedSignature(
descriptor = "Lhd;"
descriptor = "Lcf;"
)
@Export("hoveredItemContainer")
static Widget hoveredItemContainer;
@ObfuscatedName("q")
@Export("tempMenuAction")
static MenuAction tempMenuAction;
@ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "Lfa;"
descriptor = "Lfl;"
)
@Export("current")
Task current;
@ObfuscatedName("j")
@ObfuscatedName("t")
@ObfuscatedSignature(
descriptor = "Lfa;"
descriptor = "Lfl;"
)
@Export("task")
Task task;
@ObfuscatedName("p")
@ObfuscatedName("i")
@Export("thread")
Thread thread;
@ObfuscatedName("g")
@ObfuscatedName("o")
@Export("isClosed")
boolean isClosed;
public TaskHandler() {
this.current = null;
this.task = null;
this.isClosed = false;
this.isClosed = false; // L: 14
javaVendor = "Unknown";
javaVersion = "1.6";
try {
javaVendor = System.getProperty("java.vendor");
javaVersion = System.getProperty("java.version");
} catch (Exception var2) {
} catch (Exception var2) { // L: 26
}
this.isClosed = false;
this.thread = new Thread(this);
this.thread.setPriority(10);
this.thread.setDaemon(true);
this.thread.start();
}
this.isClosed = false; // L: 27
this.thread = new Thread(this); // L: 28
this.thread.setPriority(10); // L: 29
this.thread.setDaemon(true); // L: 30
this.thread.start(); // L: 31
} // L: 32
@ObfuscatedName("m")
@ObfuscatedName("z")
@ObfuscatedSignature(
descriptor = "(I)V",
garbageValue = "622783218"
garbageValue = "-1905813436"
)
@Export("close")
public final void close() {
synchronized(this) {
this.isClosed = true;
this.notifyAll();
}
synchronized(this) { // L: 35
this.isClosed = true; // L: 36
this.notifyAll(); // L: 37
} // L: 38
try {
this.thread.join();
} catch (InterruptedException var3) {
this.thread.join(); // L: 40
} catch (InterruptedException var3) { // L: 42
}
}
} // L: 43
@ObfuscatedName("o")
@ObfuscatedName("k")
@ObfuscatedSignature(
descriptor = "(IIILjava/lang/Object;I)Lfa;",
garbageValue = "962190485"
descriptor = "(IIILjava/lang/Object;B)Lfl;",
garbageValue = "1"
)
@Export("newTask")
final Task newTask(int var1, int var2, int var3, Object var4) {
Task var5 = new Task();
var5.type = var1;
var5.intArgument = var2;
var5.objectArgument = var4;
synchronized(this) {
if (this.task != null) {
this.task.next = var5;
this.task = var5;
Task var5 = new Task(); // L: 90
var5.type = var1; // L: 91
var5.intArgument = var2; // L: 92
var5.objectArgument = var4; // L: 93
synchronized(this) { // L: 94
if (this.task != null) { // L: 95
this.task.next = var5; // L: 96
this.task = var5; // L: 97
} else {
this.task = this.current = var5;
this.task = this.current = var5; // L: 100
}
this.notify();
return var5;
this.notify(); // L: 102
return var5; // L: 104
}
}
@ObfuscatedName("q")
@ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;II)Lfa;",
garbageValue = "746026781"
descriptor = "(Ljava/lang/String;II)Lfl;",
garbageValue = "-1230716173"
)
@Export("newSocketTask")
public final Task newSocketTask(String var1, int var2) {
return this.newTask(1, var2, 0, var1);
return this.newTask(1, var2, 0, var1); // L: 108
}
@ObfuscatedName("j")
@ObfuscatedName("t")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/Runnable;II)Lfa;",
garbageValue = "2089571271"
descriptor = "(Ljava/lang/Runnable;II)Lfl;",
garbageValue = "1199992408"
)
@Export("newThreadTask")
public final Task newThreadTask(Runnable var1, int var2) {
return this.newTask(2, var2, 0, var1);
return this.newTask(2, var2, 0, var1); // L: 112
}
public final void run() {
while (true) {
Task var1;
synchronized(this) {
synchronized(this) { // L: 48
while (true) {
if (this.isClosed) {
if (this.isClosed) { // L: 50
return;
}
if (this.current != null) {
var1 = this.current;
this.current = this.current.next;
if (this.current == null) {
if (this.current != null) { // L: 51
var1 = this.current; // L: 52
this.current = this.current.next; // L: 53
if (this.current == null) { // L: 54
this.task = null;
}
break;
}
try {
this.wait();
} catch (InterruptedException var8) {
this.wait(); // L: 58
} catch (InterruptedException var8) { // L: 60
}
}
}
try {
int var5 = var1.type;
if (var5 == 1) {
var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument);
} else if (var5 == 2) {
Thread var3 = new Thread((Runnable)var1.objectArgument);
var3.setDaemon(true);
var3.start();
var3.setPriority(var1.intArgument);
var1.result = var3;
} else if (var5 == 4) {
var1.result = new DataInputStream(((URL)var1.objectArgument).openStream());
int var5 = var1.type; // L: 64
if (var5 == 1) { // L: 65
var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument); // L: 66
} else if (var5 == 2) { // L: 68
Thread var3 = new Thread((Runnable)var1.objectArgument); // L: 69
var3.setDaemon(true); // L: 70
var3.start(); // L: 71
var3.setPriority(var1.intArgument); // L: 72
var1.result = var3; // L: 73
} else if (var5 == 4) { // L: 75
var1.result = new DataInputStream(((URL)var1.objectArgument).openStream()); // L: 76
}
var1.status = 1;
} catch (ThreadDeath var6) {
throw var6;
} catch (Throwable var7) {
var1.status = 2;
var1.status = 1; // L: 78
} catch (ThreadDeath var6) { // L: 80
throw var6; // L: 81
} catch (Throwable var7) { // L: 83
var1.status = 2; // L: 84
}
}
}
@ObfuscatedName("m")
@ObfuscatedName("z")
@ObfuscatedSignature(
descriptor = "(Ljava/applet/Applet;Ljava/lang/String;I)V",
garbageValue = "-1144544095"
descriptor = "(II)Liy;",
garbageValue = "960281764"
)
public static void method3606(Applet var0, String var1) {
class60.applet = var0;
if (var1 != null) {
class60.field450 = var1;
}
}
@ObfuscatedName("fa")
@ObfuscatedSignature(
descriptor = "(Lcc;IB)V",
garbageValue = "-73"
)
@Export("updateActorSequence")
static final void updateActorSequence(Actor var0, int var1) {
int var2;
int var3;
int var4;
SequenceDefinition var11;
if (var0.field966 >= Client.cycle) {
var2 = Math.max(1, var0.field966 - Client.cycle);
var3 = var0.field967 * 64 + var0.field995 * 128;
var4 = var0.field967 * 64 + var0.field1008 * 128;
var0.x += (var3 - var0.x) / var2;
var0.y += (var4 - var0.y) / var2;
var0.field1022 = 0;
var0.orientation = var0.field1006;
public static VarbitDefinition method3567(int var0) {
VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0); // L: 19
if (var1 != null) { // L: 20
return var1;
} else {
int var5;
int var7;
if (var0.field1011 >= Client.cycle) {
if (var0.field1011 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > NetSocket.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) {
var2 = var0.field1011 - var0.field966;
var3 = Client.cycle - var0.field966;
var4 = var0.field967 * 64 + var0.field995 * 128;
var5 = var0.field967 * 64 + var0.field1008 * 128;
int var6 = var0.field967 * 64 + var0.field1007 * 128;
var7 = var0.field967 * 64 + var0.field1009 * 128;
var0.x = (var6 * var3 + var4 * (var2 - var3)) / var2;
var0.y = (var7 * var3 + var5 * (var2 - var3)) / var2;
}
var0.field1022 = 0;
var0.orientation = var0.field1006;
var0.rotation = var0.orientation;
} else {
var0.movementSequence = var0.idleSequence;
if (var0.pathLength == 0) {
var0.field1022 = 0;
} else {
label550: {
if (var0.sequence != -1 && var0.sequenceDelay == 0) {
var11 = NetSocket.SequenceDefinition_get(var0.sequence);
if (var0.field1023 > 0 && var11.field3559 == 0) {
++var0.field1022;
break label550;
}
if (var0.field1023 <= 0 && var11.field3560 == 0) {
++var0.field1022;
break label550;
}
}
var2 = var0.x;
var3 = var0.y;
var4 = var0.field967 * 64 + var0.pathX[var0.pathLength - 1] * 128;
var5 = var0.field967 * 64 + var0.pathY[var0.pathLength - 1] * 128;
if (var2 < var4) {
if (var3 < var5) {
var0.orientation = 1280;
} else if (var3 > var5) {
var0.orientation = 1792;
} else {
var0.orientation = 1536;
}
} else if (var2 > var4) {
if (var3 < var5) {
var0.orientation = 768;
} else if (var3 > var5) {
var0.orientation = 256;
} else {
var0.orientation = 512;
}
} else if (var3 < var5) {
var0.orientation = 1024;
} else if (var3 > var5) {
var0.orientation = 0;
}
byte var14 = var0.pathTraversed[var0.pathLength - 1];
if (var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) {
var7 = var0.orientation - var0.rotation & 2047;
if (var7 > 1024) {
var7 -= 2048;
}
int var8 = var0.walkBackSequence;
if (var7 >= -256 && var7 <= 256) {
var8 = var0.walkSequence;
} else if (var7 >= 256 && var7 < 768) {
var8 = var0.walkRightSequence;
} else if (var7 >= -768 && var7 <= -256) {
var8 = var0.walkLeftSequence;
}
if (var8 == -1) {
var8 = var0.walkSequence;
}
var0.movementSequence = var8;
int var9 = 4;
boolean var10 = true;
if (var0 instanceof NPC) {
var10 = ((NPC)var0).definition.isClickable;
}
if (var10) {
if (var0.orientation != var0.rotation && var0.targetIndex == -1 && var0.field1017 != 0) {
var9 = 2;
}
if (var0.pathLength > 2) {
var9 = 6;
}
if (var0.pathLength > 3) {
var9 = 8;
}
if (var0.field1022 > 0 && var0.pathLength > 1) {
var9 = 8;
--var0.field1022;
}
} else {
if (var0.pathLength > 1) {
var9 = 6;
}
if (var0.pathLength > 2) {
var9 = 8;
}
if (var0.field1022 > 0 && var0.pathLength > 1) {
var9 = 8;
--var0.field1022;
}
}
if (var14 == 2) {
var9 <<= 1;
}
if (var9 >= 8 && var0.walkSequence == var0.movementSequence && var0.runSequence != -1) {
var0.movementSequence = var0.runSequence;
}
if (var4 != var2 || var3 != var5) {
if (var2 < var4) {
var0.x += var9;
if (var0.x > var4) {
var0.x = var4;
}
} else if (var2 > var4) {
var0.x -= var9;
if (var0.x < var4) {
var0.x = var4;
}
}
if (var3 < var5) {
var0.y += var9;
if (var0.y > var5) {
var0.y = var5;
}
} else if (var3 > var5) {
var0.y -= var9;
if (var0.y < var5) {
var0.y = var5;
}
}
}
if (var4 == var0.x && var5 == var0.y) {
--var0.pathLength;
if (var0.field1023 > 0) {
--var0.field1023;
}
}
} else {
var0.x = var4;
var0.y = var5;
--var0.pathLength;
if (var0.field1023 > 0) {
--var0.field1023;
}
}
}
}
byte[] var2 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0); // L: 21
var1 = new VarbitDefinition(); // L: 22
if (var2 != null) { // L: 23
var1.decode(new Buffer(var2));
}
VarbitDefinition.VarbitDefinition_cached.put(var1, (long)var0); // L: 24
return var1; // L: 25
}
}
if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) {
var0.sequence = -1;
var0.spotAnimation = -1;
var0.field966 = 0;
var0.field1011 = 0;
var0.x = var0.pathX[0] * 128 + var0.field967 * 64;
var0.y = var0.pathY[0] * 128 + var0.field967 * 64;
var0.method1810();
@ObfuscatedName("z")
@ObfuscatedSignature(
descriptor = "(IIII)I",
garbageValue = "-1918850707"
)
public static int method3568(int var0, int var1, int var2) {
var2 &= 3; // L: 9
if (var2 == 0) { // L: 10
return var0;
} else if (var2 == 1) { // L: 11
return var1;
} else {
return var2 == 2 ? 7 - var0 : 7 - var1; // L: 12 13
}
if (class60.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) {
var0.sequence = -1;
var0.spotAnimation = -1;
var0.field966 = 0;
var0.field1011 = 0;
var0.x = var0.pathX[0] * 128 + var0.field967 * 64;
var0.y = var0.field967 * 64 + var0.pathY[0] * 128;
var0.method1810();
}
if (var0.field1017 != 0) {
if (var0.targetIndex != -1) {
Object var15 = null;
if (var0.targetIndex < 32768) {
var15 = Client.npcs[var0.targetIndex];
} else if (var0.targetIndex >= 32768) {
var15 = Client.players[var0.targetIndex - 32768];
}
if (var15 != null) {
var3 = var0.x - ((Actor)var15).x;
var4 = var0.y - ((Actor)var15).y;
if (var3 != 0 || var4 != 0) {
var0.orientation = (int)(Math.atan2((double)var3, (double)var4) * 325.949D) & 2047;
}
} else if (var0.false0) {
var0.targetIndex = -1;
var0.false0 = false;
}
}
if (var0.field992 != -1 && (var0.pathLength == 0 || var0.field1022 > 0)) {
var0.orientation = var0.field992;
var0.field992 = -1;
}
var2 = var0.orientation - var0.rotation & 2047;
if (var2 == 0 && var0.false0) {
var0.targetIndex = -1;
var0.false0 = false;
}
if (var2 != 0) {
++var0.field1016;
boolean var13;
if (var2 > 1024) {
var0.rotation -= var0.field1017;
var13 = true;
if (var2 < var0.field1017 || var2 > 2048 - var0.field1017) {
var0.rotation = var0.orientation;
var13 = false;
}
if (var0.movementSequence == var0.idleSequence && (var0.field1016 > 25 || var13)) {
if (var0.turnLeftSequence != -1) {
var0.movementSequence = var0.turnLeftSequence;
} else {
var0.movementSequence = var0.walkSequence;
}
}
} else {
var0.rotation += var0.field1017;
var13 = true;
if (var2 < var0.field1017 || var2 > 2048 - var0.field1017) {
var0.rotation = var0.orientation;
var13 = false;
}
if (var0.movementSequence == var0.idleSequence && (var0.field1016 > 25 || var13)) {
if (var0.turnRightSequence != -1) {
var0.movementSequence = var0.turnRightSequence;
} else {
var0.movementSequence = var0.walkSequence;
}
}
}
var0.rotation &= 2047;
} else {
var0.field1016 = 0;
}
}
var0.isWalking = false;
if (var0.movementSequence != -1) {
var11 = NetSocket.SequenceDefinition_get(var0.movementSequence);
if (var11 != null && var11.frameIds != null) {
++var0.movementFrameCycle;
if (var0.movementFrame < var11.frameIds.length && var0.movementFrameCycle > var11.frameLengths[var0.movementFrame]) {
var0.movementFrameCycle = 1;
++var0.movementFrame;
GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.movementFrame, var0.x, var0.y);
}
if (var0.movementFrame >= var11.frameIds.length) {
var0.movementFrameCycle = 0;
var0.movementFrame = 0;
GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.movementFrame, var0.x, var0.y);
}
} else {
var0.movementSequence = -1;
}
}
if (var0.spotAnimation != -1 && Client.cycle >= var0.field987) {
if (var0.spotAnimationFrame < 0) {
var0.spotAnimationFrame = 0;
}
var2 = class4.SpotAnimationDefinition_get(var0.spotAnimation).sequence;
if (var2 != -1) {
SequenceDefinition var12 = NetSocket.SequenceDefinition_get(var2);
if (var12 != null && var12.frameIds != null) {
++var0.spotAnimationFrameCycle;
if (var0.spotAnimationFrame < var12.frameIds.length && var0.spotAnimationFrameCycle > var12.frameLengths[var0.spotAnimationFrame]) {
var0.spotAnimationFrameCycle = 1;
++var0.spotAnimationFrame;
GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var12, var0.spotAnimationFrame, var0.x, var0.y);
}
if (var0.spotAnimationFrame >= var12.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var12.frameIds.length)) {
var0.spotAnimation = -1;
}
} else {
var0.spotAnimation = -1;
}
} else {
var0.spotAnimation = -1;
}
}
if (var0.sequence != -1 && var0.sequenceDelay <= 1) {
var11 = NetSocket.SequenceDefinition_get(var0.sequence);
if (var11.field3559 == 1 && var0.field1023 > 0 && var0.field966 <= Client.cycle && var0.field1011 < Client.cycle) {
var0.sequenceDelay = 1;
return;
}
}
if (var0.sequence != -1 && var0.sequenceDelay == 0) {
var11 = NetSocket.SequenceDefinition_get(var0.sequence);
if (var11 != null && var11.frameIds != null) {
++var0.sequenceFrameCycle;
if (var0.sequenceFrame < var11.frameIds.length && var0.sequenceFrameCycle > var11.frameLengths[var0.sequenceFrame]) {
var0.sequenceFrameCycle = 1;
++var0.sequenceFrame;
GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.sequenceFrame, var0.x, var0.y);
}
if (var0.sequenceFrame >= var11.frameIds.length) {
var0.sequenceFrame -= var11.frameCount;
++var0.field1000;
if (var0.field1000 >= var11.field3562) {
var0.sequence = -1;
} else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var11.frameIds.length) {
GrandExchangeOfferOwnWorldComparator.addSequenceSoundEffect(var11, var0.sequenceFrame, var0.x, var0.y);
} else {
var0.sequence = -1;
}
}
var0.isWalking = var11.field3558;
} else {
var0.sequence = -1;
}
}
if (var0.sequenceDelay > 0) {
--var0.sequenceDelay;
}
}
}