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

runescape-client: fix the thing

Browse Source
This commit is contained in:
ThatGamerBlue
2020-12-11 06:14:29 +00:00
parent f74baf08ce
commit 463bc42f5f
325 changed files with 35526 additions and 35531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ public final class NPC extends Actor {
NPCDefinition definition;
NPC() {
}
} // L: 12
@ObfuscatedName("h")
@ObfuscatedSignature(
@@ -33,62 +33,62 @@ public final class NPC extends Actor {
garbageValue = "1912112100"
)
final void method2102(int var1, byte var2) {
int var3 = super.pathX[0];
int var4 = super.pathY[0];
if (var1 == 0) {
--var3;
int var3 = super.pathX[0]; // L: 15
int var4 = super.pathY[0]; // L: 16
if (var1 == 0) { // L: 17
--var3; // L: 18
++var4; // L: 19
}
if (var1 == 1) { // L: 21
++var4;
}
if (var1 == 1) {
++var4;
if (var1 == 2) { // L: 22
++var3; // L: 23
++var4; // L: 24
}
if (var1 == 2) {
++var3;
++var4;
}
if (var1 == 3) {
if (var1 == 3) { // L: 26
--var3;
}
if (var1 == 4) {
if (var1 == 4) { // L: 27
++var3;
}
if (var1 == 5) {
--var3;
if (var1 == 5) { // L: 28
--var3; // L: 29
--var4; // L: 30
}
if (var1 == 6) { // L: 32
--var4;
}
if (var1 == 6) {
--var4;
if (var1 == 7) { // L: 33
++var3; // L: 34
--var4; // L: 35
}
if (var1 == 7) {
++var3;
--var4;
}
if (super.sequence != -1 && ParamDefinition.SequenceDefinition_get(super.sequence).field3555 == 1) {
if (super.sequence != -1 && ParamDefinition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 37
super.sequence = -1;
}
if (super.pathLength < 9) {
if (super.pathLength < 9) { // L: 38
++super.pathLength;
}
for (int var5 = super.pathLength; var5 > 0; --var5) {
super.pathX[var5] = super.pathX[var5 - 1];
super.pathY[var5] = super.pathY[var5 - 1];
super.pathTraversed[var5] = super.pathTraversed[var5 - 1];
for (int var5 = super.pathLength; var5 > 0; --var5) { // L: 39
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]; // L: 42
}
super.pathX[0] = var3;
super.pathY[0] = var4;
super.pathTraversed[0] = var2;
}
super.pathX[0] = var3; // L: 44
super.pathY[0] = var4; // L: 45
super.pathTraversed[0] = var2; // L: 46
} // L: 47
@ObfuscatedName("v")
@ObfuscatedSignature(
@@ -96,39 +96,39 @@ public final class NPC extends Actor {
garbageValue = "-169739231"
)
final void method2106(int var1, int var2, boolean var3) {
if (super.sequence != -1 && ParamDefinition.SequenceDefinition_get(super.sequence).field3555 == 1) {
if (super.sequence != -1 && ParamDefinition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 50
super.sequence = -1;
}
if (!var3) {
int var4 = var1 - super.pathX[0];
int var5 = var2 - super.pathY[0];
if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) {
if (super.pathLength < 9) {
if (!var3) { // L: 51
int var4 = var1 - super.pathX[0]; // L: 52
int var5 = var2 - super.pathY[0]; // L: 53
if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) { // L: 54
if (super.pathLength < 9) { // L: 55
++super.pathLength;
}
for (int var6 = super.pathLength; var6 > 0; --var6) {
super.pathX[var6] = super.pathX[var6 - 1];
super.pathY[var6] = super.pathY[var6 - 1];
super.pathTraversed[var6] = super.pathTraversed[var6 - 1];
for (int var6 = super.pathLength; var6 > 0; --var6) { // L: 56
super.pathX[var6] = super.pathX[var6 - 1]; // L: 57
super.pathY[var6] = super.pathY[var6 - 1]; // L: 58
super.pathTraversed[var6] = super.pathTraversed[var6 - 1]; // L: 59
}
super.pathX[0] = var1;
super.pathY[0] = var2;
super.pathTraversed[0] = 1;
return;
super.pathX[0] = var1; // L: 61
super.pathY[0] = var2; // L: 62
super.pathTraversed[0] = 1; // L: 63
return; // L: 64
}
}
super.pathLength = 0;
super.field996 = 0;
super.field963 = 0;
super.pathX[0] = var1;
super.pathY[0] = var2;
super.x = super.field941 * 108072960 + super.pathX[0] * 128;
super.y = super.pathY[0] * 128 + super.field941 * 108072960;
}
super.pathLength = 0; // L: 67
super.field996 = 0; // L: 68
super.field963 = 0; // L: 69
super.pathX[0] = var1; // L: 70
super.pathY[0] = var2; // L: 71
super.x = super.pathX[0] * 128 + super.field941 * 64; // L: 72
super.y = super.field941 * 64 + super.pathY[0] * 128; // L: 73
} // L: 74
@ObfuscatedName("l")
@ObfuscatedSignature(
@@ -137,31 +137,31 @@ public final class NPC extends Actor {
)
@Export("getModel")
protected final Model getModel() {
if (this.definition == null) {
if (this.definition == null) { // L: 77
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ParamDefinition.SequenceDefinition_get(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? ParamDefinition.SequenceDefinition_get(super.movementSequence) : null;
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ParamDefinition.SequenceDefinition_get(super.sequence) : null; // L: 78
SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? ParamDefinition.SequenceDefinition_get(super.movementSequence) : null; // L: 79
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80
if (var3 == null) {
return null;
} else {
var3.calculateBoundsCylinder();
super.defaultHeight = var3.height;
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
Model var4 = TileItem.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.field979, 0);
Model[] var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { // L: 84
Model var4 = TileItem.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame); // L: 85
if (var4 != null) { // L: 86
var4.offsetBy(0, -super.field979, 0); // L: 87
Model[] var5 = new Model[]{var3, var4}; // L: 88
var3 = new Model(var5, 2); // L: 89
}
}
if (this.definition.size == 1) {
if (this.definition.size == 1) { // L: 92
var3.isSingleTile = true;
}
return var3;
return var3; // L: 93
}
}
}
@@ -173,7 +173,7 @@ public final class NPC extends Actor {
)
@Export("isVisible")
final boolean isVisible() {
return this.definition != null;
return this.definition != null; // L: 97
}
@ObfuscatedName("l")
@@ -183,11 +183,11 @@ public final class NPC extends Actor {
)
@Export("calculateTag")
public static long calculateTag(int var0, int var1, int var2, boolean var3, int var4) {
long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17;
if (var3) {
long var5 = (long)((var0 & 127) << 0 | (var1 & 127) << 7 | (var2 & 3) << 14) | ((long)var4 & 4294967295L) << 17; // L: 81
if (var3) { // L: 82
var5 |= 65536L;
}
return var5;
return var5; // L: 83
}
}