ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into master

Browse Source 
Nice insider info btw, be nice if you shared it, so-called "open source" client.
This commit is contained in:
ThatGamerBlue
2021-05-28 21:39:25 +01:00
parent a0ae15df6e 04dc76bbfd
commit 38634fcad3
481 changed files with 53410 additions and 51723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
runescape-client/src/main/java/NPC.java
View File

@@ -1,22 +1,14 @@
import java.io.File;
import java.io.RandomAccessFile;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ds")
@ObfuscatedName("db")
@Implements("NPC")
public final class NPC extends Actor {
@ObfuscatedName("x")
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "Lit;"
)
@Export("musicTrack")
static MusicTrack musicTrack;
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "Ley;"
descriptor = "Lef;"
)
@Export("definition")
NPCComposition definition;
@@ -24,16 +16,16 @@ public final class NPC extends Actor {
NPC() {
} // L: 12
@ObfuscatedName("h")
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(IBB)V",
garbageValue = "2"
descriptor = "(IBI)V",
garbageValue = "-300135840"
)
final void method2254(int var1, byte var2) {
final void method2259(int var1, byte var2) {
int var3 = super.pathX[0]; // L: 15
int var4 = super.pathY[0];
if (var1 == 0) {
--var3;
int var4 = super.pathY[0]; // L: 16
if (var1 == 0) { // L: 17
--var3; // L: 18
++var4;
}
@@ -41,22 +33,22 @@ public final class NPC extends Actor {
++var4;
}
if (var1 == 2) {
++var3;
++var4;
if (var1 == 2) { // L: 22
++var3; // L: 23
++var4; // L: 24
}
if (var1 == 3) {
if (var1 == 3) { // L: 26
--var3;
}
if (var1 == 4) {
if (var1 == 4) { // L: 27
++var3;
}
if (var1 == 5) {
--var3;
--var4;
if (var1 == 5) { // L: 28
--var3; // L: 29
--var4; // L: 30
}
if (var1 == 6) { // L: 32
@@ -65,11 +57,11 @@ public final class NPC extends Actor {
if (var1 == 7) { // L: 33
++var3; // L: 34
--var4;
--var4; // L: 35
}
if (super.sequence != -1 && Player.SequenceDefinition_get(super.sequence).field1882 == 1) {
super.sequence = -1;
if (super.sequence != -1 && LoginScreenAnimation.SequenceDefinition_get(super.sequence).field1890 == 1) {
super.sequence = -1; // L: 37
}
if (super.pathLength < 9) { // L: 38
@@ -77,9 +69,9 @@ public final class NPC extends Actor {
}
for (int var5 = super.pathLength; var5 > 0; --var5) { // L: 39
super.pathX[var5] = super.pathX[var5 - 1];
super.pathX[var5] = super.pathX[var5 - 1]; // L: 40
super.pathY[var5] = super.pathY[var5 - 1]; // L: 41
super.pathTraversed[var5] = super.pathTraversed[var5 - 1];
super.pathTraversed[var5] = super.pathTraversed[var5 - 1]; // L: 42
}
super.pathX[0] = var3; // L: 44
@@ -87,18 +79,18 @@ public final class NPC extends Actor {
super.pathTraversed[0] = var2; // L: 46
} // L: 47
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(I)Lgj;",
garbageValue = "-220627570"
descriptor = "(B)Lgr;",
garbageValue = "-76"
)
@Export("getModel")
protected final Model getModel() {
if (this.definition == null) { // L: 77
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? Player.SequenceDefinition_get(super.sequence) : null; // L: 78
SequenceDefinition var2 = super.movementSequence == -1 || super.movementSequence == super.idleSequence && var1 != null ? null : Player.SequenceDefinition_get(super.movementSequence); // L: 79
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? LoginScreenAnimation.SequenceDefinition_get(super.sequence) : null; // L: 78
SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : LoginScreenAnimation.SequenceDefinition_get(super.movementSequence); // L: 79
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80
if (var3 == null) { // L: 81
return null;
@@ -106,9 +98,9 @@ public final class NPC extends Actor {
var3.calculateBoundsCylinder(); // L: 82
super.defaultHeight = var3.height; // L: 83
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84
Model var4 = Friend.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85
Model var4 = VarcInt.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85
if (var4 != null) { // L: 86
var4.offsetBy(0, -super.field1224, 0); // L: 87
var4.offsetBy(0, -super.field1277, 0); // L: 87
Model[] var5 = new Model[]{var3, var4}; // L: 88
var3 = new Model(var5, 2); // L: 89
}
@@ -123,13 +115,13 @@ public final class NPC extends Actor {
}
}
@ObfuscatedName("o")
@ObfuscatedName("f")
@ObfuscatedSignature(
descriptor = "(IIZI)V",
garbageValue = "137252857"
garbageValue = "-660093008"
)
final void method2267(int var1, int var2, boolean var3) {
if (super.sequence != -1 && Player.SequenceDefinition_get(super.sequence).field1882 == 1) { // L: 50
final void method2260(int var1, int var2, boolean var3) {
if (super.sequence != -1 && LoginScreenAnimation.SequenceDefinition_get(super.sequence).field1890 == 1) { // L: 50
super.sequence = -1;
}
@@ -155,85 +147,46 @@ public final class NPC extends Actor {
}
super.pathLength = 0; // L: 67
super.field1215 = 0; // L: 68
super.field1250 = 0; // L: 69
super.field1274 = 0; // L: 68
super.field1294 = 0; // L: 69
super.pathX[0] = var1; // L: 70
super.pathY[0] = var2; // L: 71
super.x = super.pathX[0] * 128 + super.field1211 * 64; // L: 72
super.y = super.field1211 * 64 + super.pathY[0] * 128; // L: 73
super.x = super.pathX[0] * 128 + super.field1239 * 64; // L: 72
super.y = super.pathY[0] * 128 + super.field1239 * 64; // L: 73
} // L: 74
@ObfuscatedName("d")
@ObfuscatedName("m")
@ObfuscatedSignature(
descriptor = "(I)Z",
garbageValue = "-1701330496"
descriptor = "(B)Z",
garbageValue = "-6"
)
@Export("isVisible")
final boolean isVisible() {
return this.definition != null; // L: 97
}
@ObfuscatedName("h")
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(I)[Lhk;",
garbageValue = "1337289345"
descriptor = "(II)Z",
garbageValue = "-785880631"
)
static LoginPacket[] method2253() {
return new LoginPacket[]{LoginPacket.field2803, LoginPacket.field2804, LoginPacket.field2798, LoginPacket.field2800, LoginPacket.field2801, LoginPacket.field2799};
@Export("isWorldMapEvent")
public static boolean isWorldMapEvent(int var0) {
return var0 == 10 || var0 == 11 || var0 == 12 || var0 == 13 || var0 == 14 || var0 == 15 || var0 == 16 || var0 == 17; // L: 19
}
@ObfuscatedName("h")
@ObfuscatedName("jx")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;B)Ljava/io/File;",
garbageValue = "16"
descriptor = "(IB)Z",
garbageValue = "3"
)
@Export("getFile")
static File getFile(String var0) {
if (!FileSystem.FileSystem_hasPermissions) { // L: 16
throw new RuntimeException("");
} else {
File var1 = (File)FileSystem.FileSystem_cacheFiles.get(var0);
if (var1 != null) {
return var1;
} else {
File var2 = new File(FileSystem.FileSystem_cacheDir, var0); // L: 19
RandomAccessFile var3 = null; // L: 20
try {
File var4 = new File(var2.getParent()); // L: 22
if (!var4.exists()) { // L: 23
throw new RuntimeException("");
} else {
var3 = new RandomAccessFile(var2, "rw"); // L: 24
int var5 = var3.read(); // L: 25
var3.seek(0L); // L: 26
var3.write(var5); // L: 27
var3.seek(0L); // L: 28
var3.close(); // L: 29
FileSystem.FileSystem_cacheFiles.put(var0, var2); // L: 30
return var2; // L: 31
}
} catch (Exception var8) {
try {
if (var3 != null) { // L: 35
var3.close(); // L: 36
var3 = null; // L: 37
}
} catch (Exception var7) { // L: 40
}
throw new RuntimeException(); // L: 42
}
static boolean method2258(int var0) {
for (int var1 = 0; var1 < Client.field806; ++var1) { // L: 10652
if (Client.field868[var1] == var0) { // L: 10653
return true;
}
}
}
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "(Ljp;B)V",
garbageValue = "1"
)
public static void method2266(AbstractArchive var0) {
InvDefinition.InvDefinition_archive = var0; // L: 17
} // L: 18
return false; // L: 10655
}
}