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

@@ -4,119 +4,120 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("id")
@ObfuscatedName("il")
@Implements("HitSplatDefinition")
public class HitSplatDefinition extends DualNode {
@ObfuscatedName("qv")
@ObfuscatedGetter(
intValue = -2106163673
)
static int field3312;
@ObfuscatedName("f")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "Lhz;"
signature = "Lii;"
)
@Export("HitSplatDefinition_archive")
public static AbstractArchive HitSplatDefinition_archive;
@ObfuscatedName("i")
public static AbstractArchive field3329;
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "Lhz;"
signature = "Lii;"
)
public static AbstractArchive field3290;
@ObfuscatedName("w")
@Export("HitSplatDefinition_fontsArchive")
public static AbstractArchive HitSplatDefinition_fontsArchive;
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "Leb;"
signature = "Leh;"
)
@Export("HitSplatDefinition_cached")
public static EvictingDualNodeHashTable HitSplatDefinition_cached;
@ObfuscatedName("p")
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "Leb;"
signature = "Leh;"
)
@Export("HitSplatDefinition_cachedSprites")
public static EvictingDualNodeHashTable HitSplatDefinition_cachedSprites;
@ObfuscatedName("b")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "Leb;"
signature = "Leh;"
)
@Export("HitSplatDefinition_cachedFonts")
public static EvictingDualNodeHashTable HitSplatDefinition_cachedFonts;
@ObfuscatedName("o")
@ObfuscatedName("hs")
@ObfuscatedGetter(
intValue = 62489831
intValue = -1943215083
)
@Export("cameraX")
static int cameraX;
@ObfuscatedName("h")
@ObfuscatedGetter(
intValue = -36563091
)
@Export("fontId")
int fontId;
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = -167444243
intValue = -549916475
)
@Export("textColor")
public int textColor;
@ObfuscatedName("k")
@ObfuscatedGetter(
intValue = 491261365
)
public int field3298;
@ObfuscatedName("s")
@ObfuscatedGetter(
intValue = -1424505111
)
int field3296;
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = -1928448761
)
int field3300;
@ObfuscatedName("t")
@ObfuscatedGetter(
intValue = -524634903
)
int field3291;
@ObfuscatedName("j")
@ObfuscatedGetter(
intValue = -930676135
)
int field3302;
@ObfuscatedName("n")
@ObfuscatedGetter(
intValue = -1984037709
intValue = -795329979
)
public int field3303;
@ObfuscatedName("u")
public int field3328;
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = 2001520185
intValue = 2007057893
)
public int field3304;
@ObfuscatedName("z")
int field3339;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -1759745425
intValue = 1439710291
)
public int field3305;
@ObfuscatedName("h")
String field3306;
@ObfuscatedName("m")
int field3324;
@ObfuscatedName("k")
@ObfuscatedGetter(
intValue = -1901137879
intValue = -378798801
)
public int field3299;
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = 411378659
)
public int field3308;
@ObfuscatedName("r")
@Export("transforms")
public int[] transforms;
int field3331;
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = -42681817
intValue = -403504011
)
int field3332;
@ObfuscatedName("z")
@ObfuscatedGetter(
intValue = 1748437233
)
public int field3323;
@ObfuscatedName("y")
@ObfuscatedGetter(
intValue = 1149201175
)
public int field3334;
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = -600429647
)
public int field3335;
@ObfuscatedName("b")
String field3322;
@ObfuscatedName("r")
@ObfuscatedGetter(
intValue = -960133159
)
public int field3337;
@ObfuscatedName("s")
@ObfuscatedGetter(
intValue = 465425557
)
public int field3338;
@ObfuscatedName("a")
@Export("transforms")
public int[] transforms;
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = -1372204811
)
@Export("transformVarbit")
int transformVarbit;
@ObfuscatedName("aa")
@ObfuscatedName("ae")
@ObfuscatedGetter(
intValue = 380242275
intValue = 1090071963
)
@Export("transformVarp")
int transformVarp;
@@ -127,31 +128,31 @@ public class HitSplatDefinition extends DualNode {
HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
}
HitSplatDefinition() {
public HitSplatDefinition() {
this.fontId = -1;
this.textColor = 16777215;
this.field3298 = 70;
this.field3296 = -1;
this.field3300 = -1;
this.field3291 = -1;
this.field3302 = -1;
this.field3303 = 0;
this.field3304 = 0;
this.field3305 = -1;
this.field3306 = "";
this.field3299 = -1;
this.field3308 = 0;
this.field3328 = 70;
this.field3339 = -1;
this.field3324 = -1;
this.field3331 = -1;
this.field3332 = -1;
this.field3323 = 0;
this.field3334 = 0;
this.field3335 = -1;
this.field3322 = "";
this.field3337 = -1;
this.field3338 = 0;
this.transformVarbit = -1;
this.transformVarp = -1;
}
@ObfuscatedName("i")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(Lkq;I)V",
garbageValue = "-13234196"
signature = "(Lkp;I)V",
garbageValue = "1729846192"
)
@Export("decode")
void decode(Buffer var1) {
public void decode(Buffer var1) {
while (true) {
int var2 = var1.readUnsignedByte();
if (var2 == 0) {
@@ -162,41 +163,41 @@ public class HitSplatDefinition extends DualNode {
}
}
@ObfuscatedName("y")
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "(Lkq;II)V",
garbageValue = "-1783175438"
signature = "(Lkp;II)V",
garbageValue = "-1144577894"
)
@Export("decodeNext")
void decodeNext(Buffer var1, int var2) {
if (var2 == 1) {
this.fontId = var1.method5560();
this.fontId = var1.method5593();
} else if (var2 == 2) {
this.textColor = var1.readMedium();
} else if (var2 == 3) {
this.field3296 = var1.method5560();
this.field3339 = var1.method5593();
} else if (var2 == 4) {
this.field3291 = var1.method5560();
this.field3331 = var1.method5593();
} else if (var2 == 5) {
this.field3300 = var1.method5560();
this.field3324 = var1.method5593();
} else if (var2 == 6) {
this.field3302 = var1.method5560();
this.field3332 = var1.method5593();
} else if (var2 == 7) {
this.field3303 = var1.readShort();
this.field3323 = var1.readShort();
} else if (var2 == 8) {
this.field3306 = var1.readStringCp1252NullCircumfixed();
this.field3322 = var1.readStringCp1252NullCircumfixed();
} else if (var2 == 9) {
this.field3298 = var1.readUnsignedShort();
this.field3328 = var1.readUnsignedShort();
} else if (var2 == 10) {
this.field3304 = var1.readShort();
this.field3334 = var1.readShort();
} else if (var2 == 11) {
this.field3305 = 0;
this.field3335 = 0;
} else if (var2 == 12) {
this.field3299 = var1.readUnsignedByte();
this.field3337 = var1.readUnsignedByte();
} else if (var2 == 13) {
this.field3308 = var1.readShort();
this.field3338 = var1.readShort();
} else if (var2 == 14) {
this.field3305 = var1.readUnsignedShort();
this.field3335 = var1.readUnsignedShort();
} else if (var2 == 17 || var2 == 18) {
this.transformVarbit = var1.readUnsignedShort();
if (this.transformVarbit == 65535) {
@@ -231,16 +232,16 @@ public class HitSplatDefinition extends DualNode {
}
@ObfuscatedName("w")
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(S)Lid;",
garbageValue = "1000"
signature = "(B)Lil;",
garbageValue = "105"
)
@Export("transform")
public final HitSplatDefinition transform() {
int var1 = -1;
if (this.transformVarbit != -1) {
var1 = GameShell.getVarbit(this.transformVarbit);
var1 = GrandExchangeOfferUnitPriceComparator.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp];
}
@@ -252,17 +253,36 @@ public class HitSplatDefinition extends DualNode {
var2 = this.transforms[this.transforms.length - 1];
}
return var2 != -1 ? MusicPatchNode.method3815(var2) : null;
if (var2 != -1) {
HitSplatDefinition var4 = (HitSplatDefinition)HitSplatDefinition_cached.get((long)var2);
HitSplatDefinition var3;
if (var4 != null) {
var3 = var4;
} else {
byte[] var5 = class49.HitSplatDefinition_archive.takeFile(32, var2);
var4 = new HitSplatDefinition();
if (var5 != null) {
var4.decode(new Buffer(var5));
}
HitSplatDefinition_cached.put(var4, (long)var2);
var3 = var4;
}
return var3;
} else {
return null;
}
}
@ObfuscatedName("p")
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "(II)Ljava/lang/String;",
garbageValue = "384079116"
garbageValue = "1185099535"
)
@Export("getString")
public String getString(int var1) {
String var2 = this.field3306;
String var2 = this.field3322;
while (true) {
int var3 = var2.indexOf("%1");
@@ -270,26 +290,26 @@ public class HitSplatDefinition extends DualNode {
return var2;
}
var2 = var2.substring(0, var3) + class65.intToString(var1, false) + var2.substring(var3 + 2);
var2 = var2.substring(0, var3) + ItemContainer.intToString(var1, false) + var2.substring(var3 + 2);
}
}
@ObfuscatedName("b")
@ObfuscatedName("i")
@ObfuscatedSignature(
signature = "(B)Lls;",
garbageValue = "1"
signature = "(I)Llt;",
garbageValue = "1146038763"
)
public Sprite method4600() {
if (this.field3296 < 0) {
public Sprite method4649() {
if (this.field3339 < 0) {
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3296);
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3339);
if (var1 != null) {
return var1;
} else {
var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3296, 0);
var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3339, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3296);
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3339);
}
return var1;
@@ -297,68 +317,22 @@ public class HitSplatDefinition extends DualNode {
}
}
@ObfuscatedName("e")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "(I)Lls;",
garbageValue = "1869434079"
signature = "(B)Llt;",
garbageValue = "127"
)
public Sprite method4576() {
if (this.field3300 < 0) {
public Sprite method4650() {
if (this.field3324 < 0) {
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3300);
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3324);
if (var1 != null) {
return var1;
} else {
var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3300, 0);
var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3324, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3300);
}
return var1;
}
}
}
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "(B)Lls;",
garbageValue = "-53"
)
public Sprite method4587() {
if (this.field3291 < 0) {
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3291);
if (var1 != null) {
return var1;
} else {
var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3291, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3291);
}
return var1;
}
}
}
@ObfuscatedName("a")
@ObfuscatedSignature(
signature = "(B)Lls;",
garbageValue = "-100"
)
public Sprite method4596() {
if (this.field3302 < 0) {
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3302);
if (var1 != null) {
return var1;
} else {
var1 = FloorUnderlayDefinition.SpriteBuffer_getSprite(field3290, this.field3302, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3302);
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3324);
}
return var1;
@@ -368,8 +342,54 @@ public class HitSplatDefinition extends DualNode {
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "(B)Lko;",
garbageValue = "-24"
signature = "(B)Llt;",
garbageValue = "125"
)
public Sprite method4651() {
if (this.field3331 < 0) {
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3331);
if (var1 != null) {
return var1;
} else {
var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3331, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3331);
}
return var1;
}
}
}
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "(B)Llt;",
garbageValue = "-109"
)
public Sprite method4652() {
if (this.field3332 < 0) {
return null;
} else {
Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3332);
if (var1 != null) {
return var1;
} else {
var1 = WorldMapSection1.SpriteBuffer_getSprite(field3329, this.field3332, 0);
if (var1 != null) {
HitSplatDefinition_cachedSprites.put(var1, (long)this.field3332);
}
return var1;
}
}
}
@ObfuscatedName("j")
@ObfuscatedSignature(
signature = "(I)Lko;",
garbageValue = "-643633719"
)
@Export("getFont")
public Font getFont() {
@@ -380,7 +400,7 @@ public class HitSplatDefinition extends DualNode {
if (var1 != null) {
return var1;
} else {
var1 = class14.method160(field3290, class206.HitSplatDefinition_fontsArchive, this.fontId, 0);
var1 = FaceNormal.method3335(field3329, HitSplatDefinition_fontsArchive, this.fontId, 0);
if (var1 != null) {
HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
}
@@ -389,86 +409,4 @@ public class HitSplatDefinition extends DualNode {
}
}
}
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(Lhz;III)Z",
garbageValue = "-1590564834"
)
public static boolean method4586(AbstractArchive var0, int var1, int var2) {
byte[] var3 = var0.takeFile(var1, var2);
if (var3 == null) {
return false;
} else {
AbstractWorldMapIcon.SpriteBuffer_decode(var3);
return true;
}
}
@ObfuscatedName("hq")
@ObfuscatedSignature(
signature = "(I)V",
garbageValue = "1358506990"
)
static final void method4612() {
PacketBuffer var0 = Client.packetWriter.packetBuffer;
var0.importIndex();
int var1 = var0.readBits(8);
int var2;
if (var1 < Client.npcCount) {
for (var2 = var1; var2 < Client.npcCount; ++var2) {
Client.field745[++Client.field815 - 1] = Client.npcIndices[var2];
}
}
if (var1 > Client.npcCount) {
throw new RuntimeException("");
} else {
Client.npcCount = 0;
for (var2 = 0; var2 < var1; ++var2) {
int var3 = Client.npcIndices[var2];
NPC var4 = Client.npcs[var3];
int var5 = var0.readBits(1);
if (var5 == 0) {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
} else {
int var6 = var0.readBits(2);
if (var6 == 0) {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
Client.field720[++Client.field673 - 1] = var3;
} else {
int var7;
int var8;
if (var6 == 1) {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
var7 = var0.readBits(3);
var4.method2044(var7, (byte)1);
var8 = var0.readBits(1);
if (var8 == 1) {
Client.field720[++Client.field673 - 1] = var3;
}
} else if (var6 == 2) {
Client.npcIndices[++Client.npcCount - 1] = var3;
var4.npcCycle = Client.cycle;
var7 = var0.readBits(3);
var4.method2044(var7, (byte)2);
var8 = var0.readBits(3);
var4.method2044(var8, (byte)2);
int var9 = var0.readBits(1);
if (var9 == 1) {
Client.field720[++Client.field673 - 1] = var3;
}
} else if (var6 == 3) {
Client.field745[++Client.field815 - 1] = var3;
}
}
}
}
}
}
}