chore: rev 190

This commit is contained in:
ThatGamerBlue
2020-06-18 12:15:38 +01:00
parent c97f7b196e
commit 655106b9df
351 changed files with 41484 additions and 41558 deletions

View File

@@ -4,66 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("cv")
@ObfuscatedName("cr")
@Implements("DynamicObject")
public class DynamicObject extends Entity {
@ObfuscatedName("x")
@ObfuscatedName("m")
@ObfuscatedGetter(
intValue = -778595855
intValue = 909997849
)
@Export("id")
int id;
@ObfuscatedName("m")
@ObfuscatedName("o")
@ObfuscatedGetter(
intValue = 1719688801
intValue = 2017652637
)
@Export("type")
int type;
@ObfuscatedName("k")
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = 1645761999
intValue = 1099859107
)
@Export("orientation")
int orientation;
@ObfuscatedName("d")
@ObfuscatedName("j")
@ObfuscatedGetter(
intValue = -1021480433
intValue = -1395519623
)
@Export("plane")
int plane;
@ObfuscatedName("w")
@ObfuscatedName("p")
@ObfuscatedGetter(
intValue = 1939594765
intValue = 1502042193
)
@Export("x")
int x;
@ObfuscatedName("v")
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = 456415143
intValue = 1335019499
)
@Export("y")
int y;
@ObfuscatedName("q")
@ObfuscatedName("n")
@ObfuscatedSignature(
signature = "Ljc;"
signature = "Ljm;"
)
@Export("sequenceDefinition")
SequenceDefinition sequenceDefinition;
@ObfuscatedName("z")
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = -2053050533
intValue = 521544259
)
@Export("frame")
int frame;
@ObfuscatedName("t")
@ObfuscatedName("a")
@ObfuscatedGetter(
intValue = 1933430481
intValue = -1788666009
)
@Export("cycleStart")
int cycleStart;
@ObfuscatedSignature(
signature = "(IIIIIIIZLee;)V"
signature = "(IIIIIIIZLel;)V"
)
DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
this.id = var1;
@@ -73,10 +73,10 @@ public class DynamicObject extends Entity {
this.x = var5;
this.y = var6;
if (var7 != -1) {
this.sequenceDefinition = SpotAnimationDefinition.SequenceDefinition_get(var7);
this.sequenceDefinition = NetSocket.SequenceDefinition_get(var7);
this.frame = 0;
this.cycleStart = Client.cycle - 1;
if (this.sequenceDefinition.field3525 == 0 && var9 != null && var9 instanceof DynamicObject) {
if (this.sequenceDefinition.field3561 == 0 && var9 != null && var9 instanceof DynamicObject) {
DynamicObject var10 = (DynamicObject)var9;
if (this.sequenceDefinition == var10.sequenceDefinition) {
this.frame = var10.frame;
@@ -93,10 +93,10 @@ public class DynamicObject extends Entity {
}
@ObfuscatedName("t")
@ObfuscatedName("a")
@ObfuscatedSignature(
signature = "(I)Lel;",
garbageValue = "480835067"
signature = "(I)Lef;",
garbageValue = "1832696685"
)
@Export("getModel")
protected final Model getModel() {
@@ -126,7 +126,7 @@ public class DynamicObject extends Entity {
this.cycleStart = Client.cycle - var1;
}
ObjectDefinition var12 = WorldMapSection2.getObjectDefinition(this.id);
ObjectDefinition var12 = Canvas.getObjectDefinition(this.id);
if (var12.transforms != null) {
var12 = var12.transform();
}
@@ -149,34 +149,217 @@ public class DynamicObject extends Entity {
int var6 = (var3 >> 1) + this.y;
int var7 = (var3 + 1 >> 1) + this.y;
int[][] var8 = Tiles.Tiles_heights[this.plane];
int var9 = var8[var4][var7] + var8[var5][var6] + var8[var4][var6] + var8[var5][var7] >> 2;
int var9 = var8[var5][var7] + var8[var5][var6] + var8[var4][var6] + var8[var4][var7] >> 2;
int var10 = (this.x << 7) + (var2 << 6);
int var11 = (this.y << 7) + (var3 << 6);
return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
}
}
@ObfuscatedName("k")
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(ILlq;Lih;I)V",
garbageValue = "-389102765"
signature = "(II)I",
garbageValue = "1062154046"
)
static void method2342(int var0, ArchiveDisk var1, Archive var2) {
byte[] var3 = null;
synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
for (ArchiveDiskAction var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var5 != null; var5 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) {
if (var5.key == (long)var0 && var1 == var5.archiveDisk && var5.type == 0) {
var3 = var5.data;
break;
public static int method2375(int var0) {
var0 = (var0 & 1431655765) + (var0 >>> 1 & 1431655765);
var0 = (var0 >>> 2 & 858993459) + (var0 & 858993459);
var0 = var0 + (var0 >>> 4) & 252645135;
var0 += var0 >>> 8;
var0 += var0 >>> 16;
return var0 & 255;
}
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(Lkb;I)V",
garbageValue = "1312322364"
)
static final void method2373(PacketBuffer var0) {
int var1 = 0;
var0.importIndex();
byte[] var10000;
int var2;
int var3;
int var4;
int var6;
int var7;
for (var2 = 0; var2 < Players.Players_count; ++var2) {
var3 = Players.Players_indices[var2];
if ((Players.field1282[var3] & 1) == 0) {
if (var1 > 0) {
--var1;
var10000 = Players.field1282;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
var4 = var0.readBits(1);
if (var4 == 0) {
var6 = var0.readBits(2);
if (var6 == 0) {
var7 = 0;
} else if (var6 == 1) {
var7 = var0.readBits(5);
} else if (var6 == 2) {
var7 = var0.readBits(8);
} else {
var7 = var0.readBits(11);
}
var1 = var7;
var10000 = Players.field1282;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
class92.readPlayerUpdate(var0, var3);
}
}
}
}
if (var3 != null) {
var2.load(var1, var0, var3, true);
var0.exportIndex();
if (var1 != 0) {
throw new RuntimeException();
} else {
byte[] var4 = var1.read(var0);
var2.load(var1, var0, var4, true);
var0.importIndex();
for (var2 = 0; var2 < Players.Players_count; ++var2) {
var3 = Players.Players_indices[var2];
if ((Players.field1282[var3] & 1) != 0) {
if (var1 > 0) {
--var1;
var10000 = Players.field1282;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
var4 = var0.readBits(1);
if (var4 == 0) {
var6 = var0.readBits(2);
if (var6 == 0) {
var7 = 0;
} else if (var6 == 1) {
var7 = var0.readBits(5);
} else if (var6 == 2) {
var7 = var0.readBits(8);
} else {
var7 = var0.readBits(11);
}
var1 = var7;
var10000 = Players.field1282;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
class92.readPlayerUpdate(var0, var3);
}
}
}
}
var0.exportIndex();
if (var1 != 0) {
throw new RuntimeException();
} else {
var0.importIndex();
for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
var3 = Players.Players_emptyIndices[var2];
if ((Players.field1282[var3] & 1) != 0) {
if (var1 > 0) {
--var1;
var10000 = Players.field1282;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
var4 = var0.readBits(1);
if (var4 == 0) {
var6 = var0.readBits(2);
if (var6 == 0) {
var7 = 0;
} else if (var6 == 1) {
var7 = var0.readBits(5);
} else if (var6 == 2) {
var7 = var0.readBits(8);
} else {
var7 = var0.readBits(11);
}
var1 = var7;
var10000 = Players.field1282;
var10000[var3] = (byte)(var10000[var3] | 2);
} else if (ArchiveDiskAction.updateExternalPlayer(var0, var3)) {
var10000 = Players.field1282;
var10000[var3] = (byte)(var10000[var3] | 2);
}
}
}
}
var0.exportIndex();
if (var1 != 0) {
throw new RuntimeException();
} else {
var0.importIndex();
for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) {
var3 = Players.Players_emptyIndices[var2];
if ((Players.field1282[var3] & 1) == 0) {
if (var1 > 0) {
--var1;
var10000 = Players.field1282;
var10000[var3] = (byte)(var10000[var3] | 2);
} else {
var4 = var0.readBits(1);
if (var4 == 0) {
var6 = var0.readBits(2);
if (var6 == 0) {
var7 = 0;
} else if (var6 == 1) {
var7 = var0.readBits(5);
} else if (var6 == 2) {
var7 = var0.readBits(8);
} else {
var7 = var0.readBits(11);
}
var1 = var7;
var10000 = Players.field1282;
var10000[var3] = (byte)(var10000[var3] | 2);
} else if (ArchiveDiskAction.updateExternalPlayer(var0, var3)) {
var10000 = Players.field1282;
var10000[var3] = (byte)(var10000[var3] | 2);
}
}
}
}
var0.exportIndex();
if (var1 != 0) {
throw new RuntimeException();
} else {
Players.Players_count = 0;
Players.Players_emptyIdxCount = 0;
for (var2 = 1; var2 < 2048; ++var2) {
var10000 = Players.field1282;
var10000[var2] = (byte)(var10000[var2] >> 1);
Player var8 = Client.players[var2];
if (var8 != null) {
Players.Players_indices[++Players.Players_count - 1] = var2;
} else {
Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2;
}
}
}
}
}
}
}
@ObfuscatedName("bq")
@ObfuscatedSignature(
signature = "(Ljava/lang/String;I)I",
garbageValue = "-627685416"
)
@Export("stringCp1252NullTerminatedByteSize")
public static int stringCp1252NullTerminatedByteSize(String var0) {
return var0.length() + 1;
}
}