project: Rev 182
This commit is contained in:
@@ -4,150 +4,168 @@ import net.runelite.mapping.ObfuscatedGetter;
|
||||
import net.runelite.mapping.ObfuscatedName;
|
||||
import net.runelite.mapping.ObfuscatedSignature;
|
||||
|
||||
@ObfuscatedName("s")
|
||||
@ObfuscatedName("m")
|
||||
@Implements("WorldMapSection2")
|
||||
public class WorldMapSection2 implements WorldMapSection {
|
||||
@ObfuscatedName("q")
|
||||
@ObfuscatedName("rj")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1951013555
|
||||
intValue = 148255872
|
||||
)
|
||||
static int field190;
|
||||
@ObfuscatedName("qy")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -808409095
|
||||
)
|
||||
static int field191;
|
||||
@ObfuscatedName("er")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 1175996651
|
||||
)
|
||||
static int field183;
|
||||
@ObfuscatedName("s")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -15494621
|
||||
)
|
||||
@Export("minPlane")
|
||||
int minPlane;
|
||||
@ObfuscatedName("w")
|
||||
@ObfuscatedName("j")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -927462805
|
||||
intValue = -608895039
|
||||
)
|
||||
@Export("planes")
|
||||
int planes;
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedName("i")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1508174563
|
||||
intValue = -1639169875
|
||||
)
|
||||
@Export("regionStartX")
|
||||
int regionStartX;
|
||||
@ObfuscatedName("p")
|
||||
@ObfuscatedName("k")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -290088343
|
||||
intValue = 360739097
|
||||
)
|
||||
@Export("regionStartY")
|
||||
int regionStartY;
|
||||
@ObfuscatedName("k")
|
||||
@ObfuscatedName("u")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -2013070877
|
||||
intValue = 212769379
|
||||
)
|
||||
@Export("regionEndX")
|
||||
int regionEndX;
|
||||
@ObfuscatedName("l")
|
||||
@ObfuscatedName("n")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 204062243
|
||||
intValue = 221192809
|
||||
)
|
||||
@Export("regionEndY")
|
||||
int regionEndY;
|
||||
@ObfuscatedName("b")
|
||||
@ObfuscatedName("t")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 1982766605
|
||||
intValue = 852884703
|
||||
)
|
||||
int field202;
|
||||
@ObfuscatedName("i")
|
||||
int field185;
|
||||
@ObfuscatedName("q")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1874865145
|
||||
intValue = -1572504287
|
||||
)
|
||||
int field203;
|
||||
@ObfuscatedName("c")
|
||||
int field186;
|
||||
@ObfuscatedName("x")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1506169835
|
||||
intValue = 1285923191
|
||||
)
|
||||
int field204;
|
||||
@ObfuscatedName("f")
|
||||
int field187;
|
||||
@ObfuscatedName("d")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1738066987
|
||||
intValue = -1597902097
|
||||
)
|
||||
int field205;
|
||||
int field179;
|
||||
|
||||
WorldMapSection2() {
|
||||
}
|
||||
|
||||
@ObfuscatedName("q")
|
||||
@ObfuscatedName("s")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(Lal;B)V",
|
||||
garbageValue = "-53"
|
||||
signature = "(Lav;I)V",
|
||||
garbageValue = "-1068467910"
|
||||
)
|
||||
@Export("expandBounds")
|
||||
public void expandBounds(WorldMapArea var1) {
|
||||
if (var1.regionLowX > this.field202) {
|
||||
var1.regionLowX = this.field202;
|
||||
if (var1.regionLowX > this.field185) {
|
||||
var1.regionLowX = this.field185;
|
||||
}
|
||||
|
||||
if (var1.regionHighX < this.field204) {
|
||||
var1.regionHighX = this.field204;
|
||||
if (var1.regionHighX < this.field187) {
|
||||
var1.regionHighX = this.field187;
|
||||
}
|
||||
|
||||
if (var1.regionLowY > this.field203) {
|
||||
var1.regionLowY = this.field203;
|
||||
if (var1.regionLowY > this.field186) {
|
||||
var1.regionLowY = this.field186;
|
||||
}
|
||||
|
||||
if (var1.regionHighY < this.field205) {
|
||||
var1.regionHighY = this.field205;
|
||||
if (var1.regionHighY < this.field179) {
|
||||
var1.regionHighY = this.field179;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ObfuscatedName("w")
|
||||
@ObfuscatedName("j")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(IIII)Z",
|
||||
garbageValue = "59484528"
|
||||
garbageValue = "1014871771"
|
||||
)
|
||||
@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;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedName("i")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(IIB)Z",
|
||||
garbageValue = "56"
|
||||
signature = "(III)Z",
|
||||
garbageValue = "694688168"
|
||||
)
|
||||
@Export("containsPosition")
|
||||
public boolean containsPosition(int var1, int var2) {
|
||||
return var1 >> 6 >= this.field202 && var1 >> 6 <= this.field204 && var2 >> 6 >= this.field203 && var2 >> 6 <= this.field205;
|
||||
return var1 >> 6 >= this.field185 && var1 >> 6 <= this.field187 && var2 >> 6 >= this.field186 && var2 >> 6 <= this.field179;
|
||||
}
|
||||
|
||||
@ObfuscatedName("p")
|
||||
@ObfuscatedName("k")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(IIIB)[I",
|
||||
garbageValue = "12"
|
||||
signature = "(IIII)[I",
|
||||
garbageValue = "-45443461"
|
||||
)
|
||||
@Export("getBorderTileLengths")
|
||||
public int[] getBorderTileLengths(int var1, int var2, int var3) {
|
||||
if (!this.containsCoord(var1, var2, var3)) {
|
||||
return null;
|
||||
} else {
|
||||
int[] var4 = new int[]{this.field185 * 64 - this.regionStartX * 64 + var2, var3 + (this.field186 * 64 - this.regionStartY * 64)};
|
||||
return var4;
|
||||
}
|
||||
int[] var4 = new int[]{this.field202 * 64 - this.regionStartX * 64 + var2, var3 + (this.field203 * 64 - this.regionStartY * 64)};
|
||||
return var4;
|
||||
}
|
||||
|
||||
@ObfuscatedName("k")
|
||||
@ObfuscatedName("u")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(IIB)Lhv;",
|
||||
garbageValue = "-13"
|
||||
signature = "(III)Lhd;",
|
||||
garbageValue = "1267204541"
|
||||
)
|
||||
@Export("coord")
|
||||
public Coord coord(int var1, int var2) {
|
||||
if (!this.containsPosition(var1, var2)) {
|
||||
return null;
|
||||
} else {
|
||||
int var3 = this.regionStartX * 64 - this.field185 * 64 + var1;
|
||||
int var4 = this.regionStartY * 64 - this.field186 * 64 + var2;
|
||||
return new Coord(this.minPlane, var3, var4);
|
||||
}
|
||||
int var3 = this.regionStartX * 64 - this.field202 * 64 + var1;
|
||||
int var4 = this.regionStartY * 64 - this.field203 * 64 + var2;
|
||||
return new Coord(this.minPlane, var3, var4);
|
||||
}
|
||||
|
||||
@ObfuscatedName("l")
|
||||
@ObfuscatedName("n")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(Lkf;I)V",
|
||||
garbageValue = "1767519038"
|
||||
signature = "(Lky;I)V",
|
||||
garbageValue = "1072299144"
|
||||
)
|
||||
@Export("read")
|
||||
public void read(Buffer var1) {
|
||||
@@ -157,19 +175,87 @@ public class WorldMapSection2 implements WorldMapSection {
|
||||
this.regionStartY = var1.readUnsignedShort();
|
||||
this.regionEndX = var1.readUnsignedShort();
|
||||
this.regionEndY = var1.readUnsignedShort();
|
||||
this.field202 = var1.readUnsignedShort();
|
||||
this.field203 = var1.readUnsignedShort();
|
||||
this.field204 = var1.readUnsignedShort();
|
||||
this.field205 = var1.readUnsignedShort();
|
||||
this.field185 = var1.readUnsignedShort();
|
||||
this.field186 = var1.readUnsignedShort();
|
||||
this.field187 = var1.readUnsignedShort();
|
||||
this.field179 = var1.readUnsignedShort();
|
||||
this.postRead();
|
||||
}
|
||||
|
||||
@ObfuscatedName("b")
|
||||
@ObfuscatedName("t")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(B)V",
|
||||
garbageValue = "-39"
|
||||
signature = "(I)V",
|
||||
garbageValue = "1597340274"
|
||||
)
|
||||
@Export("postRead")
|
||||
void postRead() {
|
||||
}
|
||||
|
||||
@ObfuscatedName("u")
|
||||
@ObfuscatedSignature(
|
||||
signature = "([BIII)Z",
|
||||
garbageValue = "1296086556"
|
||||
)
|
||||
static final boolean method325(byte[] var0, int var1, int var2) {
|
||||
boolean var3 = true;
|
||||
Buffer var4 = new Buffer(var0);
|
||||
int var5 = -1;
|
||||
|
||||
label70:
|
||||
while (true) {
|
||||
int var6 = var4.method5565();
|
||||
if (var6 == 0) {
|
||||
return var3;
|
||||
}
|
||||
|
||||
var5 += var6;
|
||||
int var7 = 0;
|
||||
boolean var8 = false;
|
||||
|
||||
while (true) {
|
||||
int var9;
|
||||
while (!var8) {
|
||||
var9 = var4.readUShortSmart();
|
||||
if (var9 == 0) {
|
||||
continue label70;
|
||||
}
|
||||
|
||||
var7 += var9 - 1;
|
||||
int var10 = var7 & 63;
|
||||
int var11 = var7 >> 6 & 63;
|
||||
int var12 = var4.readUnsignedByte() >> 2;
|
||||
int var13 = var11 + var1;
|
||||
int var14 = var10 + var2;
|
||||
if (var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) {
|
||||
ObjectDefinition var15 = class215.getObjectDefinition(var5);
|
||||
if (var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) {
|
||||
if (!var15.needsModelFiles()) {
|
||||
++Client.field678;
|
||||
var3 = false;
|
||||
}
|
||||
|
||||
var8 = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var9 = var4.readUShortSmart();
|
||||
if (var9 == 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
var4.readUnsignedByte();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("q")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I)V",
|
||||
garbageValue = "-1052050737"
|
||||
)
|
||||
@Export("WorldMapElement_clearCached")
|
||||
public static void WorldMapElement_clearCached() {
|
||||
WorldMapElement.WorldMapElement_cachedSprites.clear();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user