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,20 +1,17 @@
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("cp")
@ObfuscatedName("cg")
@Implements("NPC")
public final class NPC extends Actor {
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = 390634291
)
public static int field1103;
@ObfuscatedName("f")
@ObfuscatedName("i")
@Export("SpriteBuffer_yOffsets")
public static int[] SpriteBuffer_yOffsets;
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "Liw;"
signature = "Liz;"
)
@Export("definition")
NPCDefinition definition;
@@ -22,12 +19,12 @@ public final class NPC extends Actor {
NPC() {
}
@ObfuscatedName("f")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(IBI)V",
garbageValue = "-1410732452"
garbageValue = "-1099283793"
)
final void method2044(int var1, byte var2) {
final void method2083(int var1, byte var2) {
int var3 = super.pathX[0];
int var4 = super.pathY[0];
if (var1 == 0) {
@@ -66,7 +63,7 @@ public final class NPC extends Actor {
--var4;
}
if (super.sequence != -1 && WorldMapSection0.SequenceDefinition_get(super.sequence).field3493 == 1) {
if (super.sequence != -1 && GraphicsDefaults.SequenceDefinition_get(super.sequence).field3524 == 1) {
super.sequence = -1;
}
@@ -85,13 +82,13 @@ public final class NPC extends Actor {
super.pathTraversed[0] = var2;
}
@ObfuscatedName("i")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(IIZI)V",
garbageValue = "-619180263"
signature = "(IIZB)V",
garbageValue = "0"
)
final void method2045(int var1, int var2, boolean var3) {
if (super.sequence != -1 && WorldMapSection0.SequenceDefinition_get(super.sequence).field3493 == 1) {
final void method2077(int var1, int var2, boolean var3) {
if (super.sequence != -1 && GraphicsDefaults.SequenceDefinition_get(super.sequence).field3524 == 1) {
super.sequence = -1;
}
@@ -117,26 +114,26 @@ public final class NPC extends Actor {
}
super.pathLength = 0;
super.field926 = 0;
super.field980 = 0;
super.field998 = 0;
super.field997 = 0;
super.pathX[0] = var1;
super.pathY[0] = var2;
super.x = super.field925 * 64 + super.pathX[0] * 128;
super.y = super.field925 * 64 + super.pathY[0] * 128;
super.x = super.pathX[0] * 128 + super.field942 * 2013925376;
super.y = super.pathY[0] * 128 + super.field942 * 2013925376;
}
@ObfuscatedName("a")
@ObfuscatedName("j")
@ObfuscatedSignature(
signature = "(I)Ldw;",
garbageValue = "822221372"
signature = "(I)Ldx;",
garbageValue = "-2133076860"
)
@Export("getModel")
protected final Model getModel() {
if (this.definition == null) {
return null;
} else {
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;
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GraphicsDefaults.SequenceDefinition_get(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? GraphicsDefaults.SequenceDefinition_get(super.movementSequence) : null;
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if (var3 == null) {
return null;
@@ -144,9 +141,9 @@ public final class NPC extends Actor {
var3.calculateBoundsCylinder();
super.defaultHeight = var3.height;
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
Model var4 = ClientPacket.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
Model var4 = class65.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.field963, 0);
var4.offsetBy(0, -super.field980, 0);
Model[] var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
}
@@ -161,23 +158,146 @@ public final class NPC extends Actor {
}
}
@ObfuscatedName("l")
@ObfuscatedName("v")
@ObfuscatedSignature(
signature = "(S)Z",
garbageValue = "3163"
signature = "(I)Z",
garbageValue = "-515224238"
)
@Export("isVisible")
final boolean isVisible() {
return this.definition != null;
}
@ObfuscatedName("i")
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "(IB)Ljava/lang/String;",
garbageValue = "66"
signature = "(II)Z",
garbageValue = "-728200028"
)
@Export("colorStartTag")
static String colorStartTag(int var0) {
return "<col=" + Integer.toHexString(var0) + ">";
public static boolean method2088(int var0) {
return (var0 >> 21 & 1) != 0;
}
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "-213957915"
)
static void method2079() {
Login.loginIndex = 24;
Tiles.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", "");
}
@ObfuscatedName("ib")
@ObfuscatedSignature(
signature = "(IIIILjava/lang/String;I)V",
garbageValue = "-1867991224"
)
@Export("widgetDefaultMenuAction")
static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) {
Widget var5 = SpriteMask.getWidgetChild(var1, var2);
if (var5 != null) {
if (var5.onOp != null) {
ScriptEvent var6 = new ScriptEvent();
var6.widget = var5;
var6.opIndex = var0;
var6.targetName = var4;
var6.args = var5.onOp;
class4.runScriptEvent(var6);
}
boolean var11 = true;
if (var5.contentType > 0) {
var11 = BufferedSink.method5915(var5);
}
if (var11) {
int var8 = WorldMapIcon_0.getWidgetClickMask(var5);
int var9 = var0 - 1;
boolean var7 = (var8 >> var9 + 1 & 1) != 0;
if (var7) {
PacketBufferNode var10;
if (var0 == 1) {
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2234, Client.packetWriter.isaacCipher);
var10.packetBuffer.writeInt(var1);
var10.packetBuffer.writeShort(var2);
var10.packetBuffer.writeShort(var3);
Client.packetWriter.addNode(var10);
}
if (var0 == 2) {
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2209, Client.packetWriter.isaacCipher);
var10.packetBuffer.writeInt(var1);
var10.packetBuffer.writeShort(var2);
var10.packetBuffer.writeShort(var3);
Client.packetWriter.addNode(var10);
}
if (var0 == 3) {
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2205, Client.packetWriter.isaacCipher);
var10.packetBuffer.writeInt(var1);
var10.packetBuffer.writeShort(var2);
var10.packetBuffer.writeShort(var3);
Client.packetWriter.addNode(var10);
}
if (var0 == 4) {
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher);
var10.packetBuffer.writeInt(var1);
var10.packetBuffer.writeShort(var2);
var10.packetBuffer.writeShort(var3);
Client.packetWriter.addNode(var10);
}
if (var0 == 5) {
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher);
var10.packetBuffer.writeInt(var1);
var10.packetBuffer.writeShort(var2);
var10.packetBuffer.writeShort(var3);
Client.packetWriter.addNode(var10);
}
if (var0 == 6) {
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher);
var10.packetBuffer.writeInt(var1);
var10.packetBuffer.writeShort(var2);
var10.packetBuffer.writeShort(var3);
Client.packetWriter.addNode(var10);
}
if (var0 == 7) {
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2204, Client.packetWriter.isaacCipher);
var10.packetBuffer.writeInt(var1);
var10.packetBuffer.writeShort(var2);
var10.packetBuffer.writeShort(var3);
Client.packetWriter.addNode(var10);
}
if (var0 == 8) {
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher);
var10.packetBuffer.writeInt(var1);
var10.packetBuffer.writeShort(var2);
var10.packetBuffer.writeShort(var3);
Client.packetWriter.addNode(var10);
}
if (var0 == 9) {
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher);
var10.packetBuffer.writeInt(var1);
var10.packetBuffer.writeShort(var2);
var10.packetBuffer.writeShort(var3);
Client.packetWriter.addNode(var10);
}
if (var0 == 10) {
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher);
var10.packetBuffer.writeInt(var1);
var10.packetBuffer.writeShort(var2);
var10.packetBuffer.writeShort(var3);
Client.packetWriter.addNode(var10);
}
}
}
}
}
}