ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

client: rev 198 (#3014)

Browse Source 
* client: rev 198

* client: checkstyle

Co-authored-by: therealnull <therealnull@gmail.com>
This commit is contained in:
Tyler Bochard
2021-07-28 07:24:38 -04:00
committed by GitHub
parent c2af17f765
commit 56ae122b89
466 changed files with 65937 additions and 65851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

251
runescape-client/src/main/java/WorldMapSection0.java
View File

@@ -4,217 +4,268 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("fr")
@ObfuscatedName("fu")
@Implements("WorldMapSection0")
public class WorldMapSection0 implements WorldMapSection {
@ObfuscatedName("ee")
@ObfuscatedName("s")
@ObfuscatedGetter(
intValue = -1160309187
)
static int field2038;
@ObfuscatedName("gi")
@ObfuscatedGetter(
intValue = 389090953
)
static int field2047;
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = -55376569
intValue = 1947644497
)
@Export("oldZ")
int oldZ;
@ObfuscatedName("e")
@ObfuscatedName("t")
@ObfuscatedGetter(
intValue = 1457760887
intValue = -724242769
)
@Export("newZ")
int newZ;
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = -288902471
intValue = -1400111239
)
@Export("oldX")
int oldX;
@ObfuscatedName("y")
@ObfuscatedName("j")
@ObfuscatedGetter(
intValue = 20509859
intValue = 1382865909
)
@Export("oldY")
int oldY;
@ObfuscatedName("j")
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = 96413413
intValue = -119640959
)
@Export("newX")
int newX;
@ObfuscatedName("o")
@ObfuscatedName("n")
@ObfuscatedGetter(
intValue = -515923129
intValue = -1117734401
)
@Export("newY")
int newY;
@ObfuscatedName("m")
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -1499525307
intValue = 1105910093
)
@Export("oldChunkXLow")
int oldChunkXLow;
@ObfuscatedName("r")
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = 697420279
intValue = 36977951
)
@Export("oldChunkYLow")
int oldChunkYLow;
@ObfuscatedName("h")
@ObfuscatedName("o")
@ObfuscatedGetter(
intValue = -1525307811
intValue = 2062636297
)
@Export("oldChunkXHigh")
int oldChunkXHigh;
@ObfuscatedName("d")
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = 93550631
intValue = -274522163
)
@Export("oldChunkYHigh")
int oldChunkYHigh;
@ObfuscatedName("z")
@ObfuscatedName("r")
@ObfuscatedGetter(
intValue = -301719127
intValue = 1864837189
)
@Export("newChunkXLow")
int newChunkXLow;
@ObfuscatedName("b")
@ObfuscatedName("p")
@ObfuscatedGetter(
intValue = -1292488093
intValue = 1783869469
)
@Export("newChunkYLow")
int newChunkYLow;
@ObfuscatedName("i")
@ObfuscatedName("h")
@ObfuscatedGetter(
intValue = 1252351887
intValue = 1537573725
)
@Export("newChunkXHigh")
int newChunkXHigh;
@ObfuscatedName("k")
@ObfuscatedGetter(
intValue = 1541153839
intValue = -1637940697
)
@Export("newChunkYHigh")
int newChunkYHigh;
WorldMapSection0() {
} // L: 22
}
@ObfuscatedName("f")
@ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "(Lfa;B)V",
garbageValue = "120"
descriptor = "(Lfa;I)V",
garbageValue = "206142404"
)
@Export("expandBounds")
public void expandBounds(WorldMapArea var1) {
if (var1.regionLowX > this.newX) { // L: 25
if (var1.regionLowX > this.newX) {
var1.regionLowX = this.newX;
}
if (var1.regionHighX < this.newX) {
var1.regionHighX = this.newX; // L: 26
var1.regionHighX = this.newX;
}
if (var1.regionLowY > this.newY) { // L: 27
if (var1.regionLowY > this.newY) {
var1.regionLowY = this.newY;
}
if (var1.regionHighY < this.newY) { // L: 28
if (var1.regionHighY < this.newY) {
var1.regionHighY = this.newY;
}
} // L: 29
}
@ObfuscatedName("e")
@ObfuscatedName("t")
@ObfuscatedSignature(
descriptor = "(IIII)Z",
garbageValue = "-2105423832"
descriptor = "(IIIB)Z",
garbageValue = "1"
)
@Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) {
if (var1 >= this.oldZ && var1 < this.newZ + this.oldZ) { // L: 32
return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; // L: 35
if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) {
return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7;
} else {
return false; // L: 33
return false;
}
}
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(III)Z",
garbageValue = "-173753307"
garbageValue = "2136306285"
)
@Export("containsPosition")
public boolean containsPosition(int var1, int var2) {
return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7; // L: 39
}
@ObfuscatedName("y")
@ObfuscatedSignature(
descriptor = "(IIII)[I",
garbageValue = "2086451205"
)
@Export("getBorderTileLengths")
public int[] getBorderTileLengths(int var1, int var2, int var3) {
if (!this.containsCoord(var1, var2, var3)) { // L: 43
return null; // L: 44
} else {
int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; // L: 46 47 48
return var4; // L: 49
}
return var1 >= (this.newX << 6) + (this.newChunkXLow << 3) && var1 <= (this.newX << 6) + (this.newChunkXHigh << 3) + 7 && var2 >= (this.newY << 6) + (this.newChunkYLow << 3) && var2 <= (this.newY << 6) + (this.newChunkYHigh << 3) + 7;
}
@ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "(IIB)Liw;",
garbageValue = "-36"
descriptor = "(IIII)[I",
garbageValue = "634207470"
)
@Export("coord")
public Coord coord(int var1, int var2) {
if (!this.containsPosition(var1, var2)) { // L: 53
return null; // L: 54
@Export("getBorderTileLengths")
public int[] getBorderTileLengths(int var1, int var2, int var3) {
if (!this.containsCoord(var1, var2, var3)) {
return null;
} else {
int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; // L: 56
int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); // L: 57
return new Coord(this.oldZ, var3, var4); // L: 58
int[] var4 = new int[]{var2 + (this.newX * 64 - this.oldX * 64) + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)};
return var4;
}
}
@ObfuscatedName("o")
@ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "(Lnt;I)V",
garbageValue = "1313413902"
descriptor = "(IIB)Lij;",
garbageValue = "43"
)
@Export("coord")
public Coord coord(int var1, int var2) {
if (!this.containsPosition(var1, var2)) {
return null;
} else {
int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1;
int var4 = var2 + (this.oldY * 64 - this.newY * 64) + (this.oldChunkYLow * 8 - this.newChunkYLow * 8);
return new Coord(this.oldZ, var3, var4);
}
}
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "(Lnv;I)V",
garbageValue = "342058266"
)
@Export("read")
public void read(Buffer var1) {
this.oldZ = var1.readUnsignedByte(); // L: 62
this.newZ = var1.readUnsignedByte(); // L: 63
this.oldX = var1.readUnsignedShort(); // L: 64
this.oldChunkXLow = var1.readUnsignedByte(); // L: 65
this.oldChunkXHigh = var1.readUnsignedByte(); // L: 66
this.oldY = var1.readUnsignedShort(); // L: 67
this.oldChunkYLow = var1.readUnsignedByte(); // L: 68
this.oldChunkYHigh = var1.readUnsignedByte(); // L: 69
this.newX = var1.readUnsignedShort(); // L: 70
this.newChunkXLow = var1.readUnsignedByte(); // L: 71
this.newChunkXHigh = var1.readUnsignedByte(); // L: 72
this.newY = var1.readUnsignedShort(); // L: 73
this.newChunkYLow = var1.readUnsignedByte(); // L: 74
this.newChunkYHigh = var1.readUnsignedByte(); // L: 75
this.postRead(); // L: 76
} // L: 77
this.oldZ = var1.readUnsignedByte();
this.newZ = var1.readUnsignedByte();
this.oldX = var1.readUnsignedShort();
this.oldChunkXLow = var1.readUnsignedByte();
this.oldChunkXHigh = var1.readUnsignedByte();
this.oldY = var1.readUnsignedShort();
this.oldChunkYLow = var1.readUnsignedByte();
this.oldChunkYHigh = var1.readUnsignedByte();
this.newX = var1.readUnsignedShort();
this.newChunkXLow = var1.readUnsignedByte();
this.newChunkXHigh = var1.readUnsignedByte();
this.newY = var1.readUnsignedShort();
this.newChunkYLow = var1.readUnsignedByte();
this.newChunkYHigh = var1.readUnsignedByte();
this.postRead();
}
@ObfuscatedName("m")
@ObfuscatedName("w")
@ObfuscatedSignature(
descriptor = "(I)V",
garbageValue = "518606194"
garbageValue = "-455189067"
)
@Export("postRead")
void postRead() {
} // L: 79
}
@ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "(II)I",
garbageValue = "1412481082"
)
@Export("getVarbit")
public static int getVarbit(int var0) {
VarbitComposition var2 = (VarbitComposition)VarbitComposition.VarbitDefinition_cached.get((long)var0);
VarbitComposition var1;
if (var2 != null) {
var1 = var2;
} else {
byte[] var3 = VarbitComposition.VarbitDefinition_archive.takeFile(14, var0);
var2 = new VarbitComposition();
if (var3 != null) {
var2.decode(new Buffer(var3));
}
VarbitComposition.VarbitDefinition_cached.put(var2, (long)var0);
var1 = var2;
}
int var7 = var1.baseVar;
int var4 = var1.startBit;
int var5 = var1.endBit;
int var6 = Varps.Varps_masks[var5 - var4];
return Varps.Varps_main[var7] >> var4 & var6;
}
@ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "(II)Lni;",
garbageValue = "2108121521"
)
public static class376 method3597(int var0) {
int var1 = class374.field4154[var0];
if (var1 == 1) {
return class376.field4163;
} else if (var1 == 2) {
return class376.field4164;
} else {
return var1 == 3 ? class376.field4159 : null;
}
}
@ObfuscatedName("fx")
@ObfuscatedSignature(
descriptor = "(I)V",
garbageValue = "-1217280037"
)
static final void method3580() {
if (Client.logoutTimer > 0) {
class144.logOut();
} else {
Client.timer.method5658();
class16.updateGameState(40);
Client.field644 = Client.packetWriter.getSocket();
Client.packetWriter.removeSocket();
}
}
}