client: rev 201
This commit is contained in:
@@ -4,175 +4,194 @@ import net.runelite.mapping.ObfuscatedGetter;
|
||||
import net.runelite.mapping.ObfuscatedName;
|
||||
import net.runelite.mapping.ObfuscatedSignature;
|
||||
|
||||
@ObfuscatedName("fl")
|
||||
@ObfuscatedName("fx")
|
||||
@Implements("WorldMapSection2")
|
||||
public class WorldMapSection2 implements WorldMapSection {
|
||||
@ObfuscatedName("l")
|
||||
@ObfuscatedName("kb")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "Ljf;"
|
||||
)
|
||||
static Widget field2037;
|
||||
@ObfuscatedName("i")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 739106677
|
||||
intValue = 268471801
|
||||
)
|
||||
@Export("minPlane")
|
||||
int minPlane;
|
||||
@ObfuscatedName("q")
|
||||
@ObfuscatedName("w")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1981198519
|
||||
intValue = -2064297275
|
||||
)
|
||||
@Export("planes")
|
||||
int planes;
|
||||
@ObfuscatedName("f")
|
||||
@ObfuscatedName("s")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 126525707
|
||||
intValue = 120844139
|
||||
)
|
||||
@Export("regionStartX")
|
||||
int regionStartX;
|
||||
@ObfuscatedName("j")
|
||||
@ObfuscatedName("a")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 2091786471
|
||||
intValue = 307764911
|
||||
)
|
||||
@Export("regionStartY")
|
||||
int regionStartY;
|
||||
@ObfuscatedName("m")
|
||||
@ObfuscatedName("o")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1494547721
|
||||
intValue = 1741263817
|
||||
)
|
||||
@Export("regionEndX")
|
||||
int regionEndX;
|
||||
@ObfuscatedName("k")
|
||||
@ObfuscatedName("g")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1240041779
|
||||
intValue = -1879263737
|
||||
)
|
||||
@Export("regionEndY")
|
||||
int regionEndY;
|
||||
@ObfuscatedName("t")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -677400595
|
||||
)
|
||||
int field2031;
|
||||
@ObfuscatedName("a")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 156542557
|
||||
)
|
||||
int field2038;
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 1002795527
|
||||
intValue = -829160943
|
||||
)
|
||||
int field2039;
|
||||
@ObfuscatedName("i")
|
||||
int field2033;
|
||||
@ObfuscatedName("p")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 1479791309
|
||||
intValue = 2138355431
|
||||
)
|
||||
int field2037;
|
||||
int field2028;
|
||||
@ObfuscatedName("j")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1057428701
|
||||
)
|
||||
int field2026;
|
||||
@ObfuscatedName("b")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1043419133
|
||||
)
|
||||
int field2035;
|
||||
|
||||
WorldMapSection2() {
|
||||
}
|
||||
} // L: 18
|
||||
|
||||
@ObfuscatedName("l")
|
||||
@ObfuscatedName("i")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(Lfr;I)V",
|
||||
garbageValue = "2018229058"
|
||||
descriptor = "(Lfb;I)V",
|
||||
garbageValue = "-1844012640"
|
||||
)
|
||||
@Export("expandBounds")
|
||||
public void expandBounds(WorldMapArea var1) {
|
||||
if (var1.regionLowX > this.field2031) {
|
||||
var1.regionLowX = this.field2031;
|
||||
if (var1.regionLowX > this.field2033) { // L: 21
|
||||
var1.regionLowX = this.field2033;
|
||||
}
|
||||
|
||||
if (var1.regionHighX < this.field2039) {
|
||||
var1.regionHighX = this.field2039;
|
||||
if (var1.regionHighX < this.field2026) {
|
||||
var1.regionHighX = this.field2026; // L: 22
|
||||
}
|
||||
|
||||
if (var1.regionLowY > this.field2038) {
|
||||
var1.regionLowY = this.field2038;
|
||||
if (var1.regionLowY > this.field2028) { // L: 23
|
||||
var1.regionLowY = this.field2028;
|
||||
}
|
||||
|
||||
if (var1.regionHighY < this.field2037) {
|
||||
var1.regionHighY = this.field2037;
|
||||
if (var1.regionHighY < this.field2035) { // L: 24
|
||||
var1.regionHighY = this.field2035;
|
||||
}
|
||||
|
||||
}
|
||||
} // L: 25
|
||||
|
||||
@ObfuscatedName("q")
|
||||
@ObfuscatedName("w")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(IIII)Z",
|
||||
garbageValue = "-964071790"
|
||||
garbageValue = "-1501827396"
|
||||
)
|
||||
@Export("containsCoord")
|
||||
public boolean containsCoord(int var1, int var2, int var3) {
|
||||
if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) {
|
||||
return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY;
|
||||
if (var1 >= this.minPlane && var1 < this.minPlane + this.planes) { // L: 28
|
||||
return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; // L: 31
|
||||
} else {
|
||||
return false;
|
||||
return false; // L: 29
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("f")
|
||||
@ObfuscatedName("s")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(III)Z",
|
||||
garbageValue = "381612084"
|
||||
garbageValue = "-356013678"
|
||||
)
|
||||
@Export("containsPosition")
|
||||
public boolean containsPosition(int var1, int var2) {
|
||||
return var1 >> 6 >= this.field2031 && var1 >> 6 <= this.field2039 && var2 >> 6 >= this.field2038 && var2 >> 6 <= this.field2037;
|
||||
return var1 >> 6 >= this.field2033 && var1 >> 6 <= this.field2026 && var2 >> 6 >= this.field2028 && var2 >> 6 <= this.field2035; // L: 35
|
||||
}
|
||||
|
||||
@ObfuscatedName("j")
|
||||
@ObfuscatedName("a")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(IIIB)[I",
|
||||
garbageValue = "88"
|
||||
garbageValue = "-79"
|
||||
)
|
||||
@Export("getBorderTileLengths")
|
||||
public int[] getBorderTileLengths(int var1, int var2, int var3) {
|
||||
if (!this.containsCoord(var1, var2, var3)) {
|
||||
return null;
|
||||
if (!this.containsCoord(var1, var2, var3)) { // L: 39
|
||||
return null; // L: 40
|
||||
} else {
|
||||
int[] var4 = new int[]{var2 + (this.field2031 * 64 - this.regionStartX * 64), var3 + (this.field2038 * 64 - this.regionStartY * 64)};
|
||||
return var4;
|
||||
int[] var4 = new int[]{var2 + (this.field2033 * 64 - this.regionStartX * 64), var3 + (this.field2028 * 64 - this.regionStartY * 64)}; // L: 42 43 44
|
||||
return var4; // L: 45
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("m")
|
||||
@ObfuscatedName("o")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(III)Lic;",
|
||||
garbageValue = "2033247854"
|
||||
descriptor = "(III)Lie;",
|
||||
garbageValue = "494177498"
|
||||
)
|
||||
@Export("coord")
|
||||
public Coord coord(int var1, int var2) {
|
||||
if (!this.containsPosition(var1, var2)) {
|
||||
return null;
|
||||
if (!this.containsPosition(var1, var2)) { // L: 49
|
||||
return null; // L: 50
|
||||
} else {
|
||||
int var3 = this.regionStartX * 64 - this.field2031 * 64 + var1;
|
||||
int var4 = var2 + (this.regionStartY * 64 - this.field2038 * 64);
|
||||
return new Coord(this.minPlane, var3, var4);
|
||||
int var3 = this.regionStartX * 64 - this.field2033 * 64 + var1; // L: 52
|
||||
int var4 = var2 + (this.regionStartY * 64 - this.field2028 * 64); // L: 53
|
||||
return new Coord(this.minPlane, var3, var4); // L: 54
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("k")
|
||||
@ObfuscatedName("g")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(Lot;B)V",
|
||||
garbageValue = "4"
|
||||
descriptor = "(Lop;I)V",
|
||||
garbageValue = "-682362313"
|
||||
)
|
||||
@Export("read")
|
||||
public void read(Buffer var1) {
|
||||
this.minPlane = var1.readUnsignedByte();
|
||||
this.planes = var1.readUnsignedByte();
|
||||
this.regionStartX = var1.readUnsignedShort();
|
||||
this.regionStartY = var1.readUnsignedShort();
|
||||
this.regionEndX = var1.readUnsignedShort();
|
||||
this.regionEndY = var1.readUnsignedShort();
|
||||
this.field2031 = var1.readUnsignedShort();
|
||||
this.field2038 = var1.readUnsignedShort();
|
||||
this.field2039 = var1.readUnsignedShort();
|
||||
this.field2037 = var1.readUnsignedShort();
|
||||
this.postRead();
|
||||
}
|
||||
this.minPlane = var1.readUnsignedByte(); // L: 58
|
||||
this.planes = var1.readUnsignedByte(); // L: 59
|
||||
this.regionStartX = var1.readUnsignedShort(); // L: 60
|
||||
this.regionStartY = var1.readUnsignedShort(); // L: 61
|
||||
this.regionEndX = var1.readUnsignedShort(); // L: 62
|
||||
this.regionEndY = var1.readUnsignedShort(); // L: 63
|
||||
this.field2033 = var1.readUnsignedShort(); // L: 64
|
||||
this.field2028 = var1.readUnsignedShort(); // L: 65
|
||||
this.field2026 = var1.readUnsignedShort(); // L: 66
|
||||
this.field2035 = var1.readUnsignedShort(); // L: 67
|
||||
this.postRead(); // L: 68
|
||||
} // L: 69
|
||||
|
||||
@ObfuscatedName("t")
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)V",
|
||||
garbageValue = "1532243849"
|
||||
garbageValue = "-1513297237"
|
||||
)
|
||||
@Export("postRead")
|
||||
void postRead() {
|
||||
}
|
||||
} // L: 71
|
||||
|
||||
@ObfuscatedName("fq")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(ZB)V",
|
||||
garbageValue = "14"
|
||||
)
|
||||
static final void method3584(boolean var0) {
|
||||
if (var0) { // L: 3286
|
||||
Client.field693 = Login.field875 ? class112.field1345 : class112.field1347; // L: 3287
|
||||
} else {
|
||||
Client.field693 = class408.clientPreferences.parameters.containsKey(ClanChannel.method2824(Login.Login_username)) ? class112.field1350 : class112.field1346; // L: 3290
|
||||
}
|
||||
|
||||
} // L: 3292
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user