This commit is contained in:
Lucwousin
2019-12-16 18:40:02 +01:00
parent 471eaeb3e0
commit f6c2b4ac11
338 changed files with 40594 additions and 41546 deletions

View File

@@ -1,26 +1,20 @@
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;
@ObfuscatedName("cd")
@ObfuscatedName("cp")
@Implements("NPC")
public final class NPC extends Actor {
@ObfuscatedName("se")
@ObfuscatedSignature(
signature = "Llj;"
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = 390634291
)
@Export("platformInfo")
static PlatformInfo platformInfo;
@ObfuscatedName("o")
public static int field1103;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Ldk;"
)
@Export("soundCache")
public static SoundCache soundCache;
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "Lih;"
signature = "Liw;"
)
@Export("definition")
NPCDefinition definition;
@@ -28,12 +22,12 @@ public final class NPC extends Actor {
NPC() {
}
@ObfuscatedName("u")
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(IBI)V",
garbageValue = "1878117955"
garbageValue = "-1410732452"
)
final void method2058(int var1, byte var2) {
final void method2044(int var1, byte var2) {
int var3 = super.pathX[0];
int var4 = super.pathY[0];
if (var1 == 0) {
@@ -72,7 +66,7 @@ public final class NPC extends Actor {
--var4;
}
if (super.sequence != -1 && GrandExchangeOfferAgeComparator.SequenceDefinition_get(super.sequence).field3515 == 1) {
if (super.sequence != -1 && WorldMapSection0.SequenceDefinition_get(super.sequence).field3493 == 1) {
super.sequence = -1;
}
@@ -91,13 +85,13 @@ public final class NPC extends Actor {
super.pathTraversed[0] = var2;
}
@ObfuscatedName("f")
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "(IIZB)V",
garbageValue = "79"
signature = "(IIZI)V",
garbageValue = "-619180263"
)
final void method2059(int var1, int var2, boolean var3) {
if (super.sequence != -1 && GrandExchangeOfferAgeComparator.SequenceDefinition_get(super.sequence).field3515 == 1) {
final void method2045(int var1, int var2, boolean var3) {
if (super.sequence != -1 && WorldMapSection0.SequenceDefinition_get(super.sequence).field3493 == 1) {
super.sequence = -1;
}
@@ -123,26 +117,26 @@ public final class NPC extends Actor {
}
super.pathLength = 0;
super.field994 = 0;
super.field976 = 0;
super.field926 = 0;
super.field980 = 0;
super.pathX[0] = var1;
super.pathY[0] = var2;
super.x = super.field938 * 64 + super.pathX[0] * 128;
super.y = super.field938 * 64 + super.pathY[0] * 128;
super.x = super.field925 * 64 + super.pathX[0] * 128;
super.y = super.field925 * 64 + super.pathY[0] * 128;
}
@ObfuscatedName("w")
@ObfuscatedName("a")
@ObfuscatedSignature(
signature = "(I)Ldf;",
garbageValue = "-174129419"
signature = "(I)Ldw;",
garbageValue = "822221372"
)
@Export("getModel")
protected final Model getModel() {
if (this.definition == null) {
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeOfferAgeComparator.SequenceDefinition_get(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? GrandExchangeOfferAgeComparator.SequenceDefinition_get(super.movementSequence) : null;
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapSection0.SequenceDefinition_get(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? WorldMapSection0.SequenceDefinition_get(super.movementSequence) : null;
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if (var3 == null) {
return null;
@@ -150,9 +144,9 @@ public final class NPC extends Actor {
var3.calculateBoundsCylinder();
super.defaultHeight = var3.height;
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
Model var4 = WorldMapRegion.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
Model var4 = ClientPacket.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.field996, 0);
var4.offsetBy(0, -super.field963, 0);
Model[] var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
}
@@ -167,13 +161,23 @@ public final class NPC extends Actor {
}
}
@ObfuscatedName("o")
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "-968027489"
signature = "(S)Z",
garbageValue = "3163"
)
@Export("isVisible")
final boolean isVisible() {
return this.definition != null;
}
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "(IB)Ljava/lang/String;",
garbageValue = "66"
)
@Export("colorStartTag")
static String colorStartTag(int var0) {
return "<col=" + Integer.toHexString(var0) + ">";
}
}