project: rev 199

This commit is contained in:
Owain van Brakel
2021-08-25 13:49:53 +02:00
parent c1fffa1562
commit e6be88fbeb
490 changed files with 47651 additions and 46243 deletions

View File

@@ -1,32 +1,15 @@
import java.io.File;
import java.io.IOException;
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("be")
@ObfuscatedName("cr")
@Implements("NPC")
public final class NPC extends Actor {
@ObfuscatedName("tu")
@Export("foundItemIds")
static short[] foundItemIds;
@ObfuscatedName("x")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "Lcd;"
)
@Export("World_request")
static UrlRequest World_request;
@ObfuscatedName("gk")
@ObfuscatedGetter(
intValue = 618846461
)
@Export("baseY")
static int baseY;
@ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "Lej;"
descriptor = "Lfq;"
)
@Export("definition")
NPCComposition definition;
@@ -34,12 +17,12 @@ public final class NPC extends Actor {
NPC() {
}
@ObfuscatedName("s")
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(IBB)V",
garbageValue = "-46"
descriptor = "(IBI)V",
garbageValue = "-1998383743"
)
final void method1956(int var1, byte var2) {
final void method2212(int var1, byte var2) {
int var3 = super.pathX[0];
int var4 = super.pathY[0];
if (var1 == 0) {
@@ -78,7 +61,7 @@ public final class NPC extends Actor {
--var4;
}
if (super.sequence != -1 && World.SequenceDefinition_get(super.sequence).field1859 == 1) {
if (super.sequence != -1 && class17.SequenceDefinition_get(super.sequence).field1960 == 1) {
super.sequence = -1;
}
@@ -97,18 +80,18 @@ public final class NPC extends Actor {
super.pathTraversed[0] = var2;
}
@ObfuscatedName("t")
@ObfuscatedName("c")
@ObfuscatedSignature(
descriptor = "(I)Lgl;",
garbageValue = "1291603774"
descriptor = "(B)Lhg;",
garbageValue = "18"
)
@Export("getModel")
protected final Model getModel() {
if (this.definition == null) {
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? World.SequenceDefinition_get(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? World.SequenceDefinition_get(super.movementSequence) : null;
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class17.SequenceDefinition_get(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence == -1 || super.idleSequence == super.movementSequence && var1 != null ? null : class17.SequenceDefinition_get(super.movementSequence);
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if (var3 == null) {
return null;
@@ -116,9 +99,9 @@ public final class NPC extends Actor {
var3.calculateBoundsCylinder();
super.defaultHeight = var3.height;
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
Model var4 = PcmPlayer.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
Model var4 = TaskHandler.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.field1061, 0);
var4.offsetBy(0, -super.field1134, 0);
Model[] var5 = new Model[]{var3, var4};
var3 = new Model(var5, 2);
}
@@ -133,13 +116,13 @@ public final class NPC extends Actor {
}
}
@ObfuscatedName("v")
@ObfuscatedName("m")
@ObfuscatedSignature(
descriptor = "(IIZI)V",
garbageValue = "1892581067"
garbageValue = "866261786"
)
final void method1957(int var1, int var2, boolean var3) {
if (super.sequence != -1 && World.SequenceDefinition_get(super.sequence).field1859 == 1) {
final void method2224(int var1, int var2, boolean var3) {
if (super.sequence != -1 && class17.SequenceDefinition_get(super.sequence).field1960 == 1) {
super.sequence = -1;
}
@@ -165,71 +148,115 @@ public final class NPC extends Actor {
}
super.pathLength = 0;
super.field1066 = 0;
super.field1078 = 0;
super.field1152 = 0;
super.field1151 = 0;
super.pathX[0] = var1;
super.pathY[0] = var2;
super.x = super.pathX[0] * 128 + super.field1023 * 64;
super.y = super.field1023 * 64 + super.pathY[0] * 128;
super.x = super.field1137 * 64 + super.pathX[0] * 128;
super.y = super.field1137 * 64 + super.pathY[0] * 128;
}
@ObfuscatedName("u")
@ObfuscatedName("q")
@ObfuscatedSignature(
descriptor = "(B)Z",
garbageValue = "74"
descriptor = "(I)Z",
garbageValue = "-1101417957"
)
@Export("isVisible")
final boolean isVisible() {
return this.definition != null;
}
@ObfuscatedName("s")
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "(I)I",
garbageValue = "-1386902670"
descriptor = "(III)Z",
garbageValue = "-351821257"
)
public static int method1960() {
return ViewportMouse.ViewportMouse_entityCount;
static final boolean method2225(int var0, int var1) {
ObjectComposition var2 = HitSplatDefinition.getObjectDefinition(var0);
if (var1 == 11) {
var1 = 10;
}
if (var1 >= 5 && var1 <= 8) {
var1 = 4;
}
return var2.method3128(var1);
}
@ObfuscatedName("j")
@ObfuscatedName("hm")
@ObfuscatedSignature(
descriptor = "(Ljava/lang/String;Ljava/lang/String;ZB)Lnx;",
garbageValue = "-76"
descriptor = "(ZI)V",
garbageValue = "-22305198"
)
@Export("getPreferencesFile")
public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
File var3 = new File(JagexCache.cacheDir, "preferences" + var0 + ".dat");
if (var3.exists()) {
try {
AccessFile var10 = new AccessFile(var3, "rw", 10000L);
return var10;
} catch (IOException var9) {
static final void method2221(boolean var0) {
class1.playPcmPlayers();
++Client.packetWriter.pendingWrites;
if (Client.packetWriter.pendingWrites >= 50 || var0) {
Client.packetWriter.pendingWrites = 0;
if (!Client.hadNetworkError && Client.packetWriter.getSocket() != null) {
PacketBufferNode var1 = FriendSystem.getPacketBufferNode(ClientPacket.field2704, Client.packetWriter.isaacCipher);
Client.packetWriter.addNode(var1);
try {
Client.packetWriter.flush();
} catch (IOException var3) {
Client.hadNetworkError = true;
}
}
}
}
@ObfuscatedName("ha")
@ObfuscatedSignature(
descriptor = "(IIB)V",
garbageValue = "18"
)
static void method2214(int var0, int var1) {
int var2 = class11.fontBold12.stringWidth("Choose Option");
int var3;
for (var3 = 0; var3 < Client.menuOptionsCount; ++var3) {
Font var7 = class11.fontBold12;
String var8;
if (var3 < 0) {
var8 = "";
} else if (Client.menuTargets[var3].length() > 0) {
var8 = Client.menuActions[var3] + " " + Client.menuTargets[var3];
} else {
var8 = Client.menuActions[var3];
}
int var6 = var7.stringWidth(var8);
if (var6 > var2) {
var2 = var6;
}
}
String var4 = "";
if (AttackOption.cacheGamebuild == 33) {
var4 = "_rc";
} else if (AttackOption.cacheGamebuild == 34) {
var4 = "_wip";
var2 += 8;
var3 = Client.menuOptionsCount * 15 + 22;
int var4 = var0 - var2 / 2;
if (var4 + var2 > InvDefinition.canvasWidth) {
var4 = InvDefinition.canvasWidth - var2;
}
File var5 = new File(class234.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat");
AccessFile var6;
if (!var2 && var5.exists()) {
try {
var6 = new AccessFile(var5, "rw", 10000L);
return var6;
} catch (IOException var8) {
}
if (var4 < 0) {
var4 = 0;
}
try {
var6 = new AccessFile(var3, "rw", 10000L);
return var6;
} catch (IOException var7) {
throw new RuntimeException();
int var5 = var1;
if (var3 + var1 > GameEngine.canvasHeight) {
var5 = GameEngine.canvasHeight - var3;
}
if (var5 < 0) {
var5 = 0;
}
WorldMapRegion.menuX = var4;
ApproximateRouteStrategy.menuY = var5;
VarcInt.menuWidth = var2;
WorldMapLabelSize.menuHeight = Client.menuOptionsCount * 15 + 22;
}
}