client: rev 198 (#3014)
* client: rev 198 * client: checkstyle Co-authored-by: therealnull <therealnull@gmail.com>
This commit is contained in:
Tyler Bochard
GitHub
@@ -9,179 +9,179 @@ import net.runelite.mapping.ObfuscatedSignature;
|
||||
@ObfuscatedName("fa")
|
||||
@Implements("WorldMapArea")
|
||||
public class WorldMapArea {
|
||||
@ObfuscatedName("f")
|
||||
@ObfuscatedName("s")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 1578989981
|
||||
intValue = -1570146787
|
||||
)
|
||||
@Export("id")
|
||||
int id;
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedName("t")
|
||||
@Export("internalName")
|
||||
String internalName;
|
||||
@ObfuscatedName("v")
|
||||
@Export("externalName")
|
||||
String externalName;
|
||||
@ObfuscatedName("y")
|
||||
@ObfuscatedName("j")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -1093781253
|
||||
intValue = -387474139
|
||||
)
|
||||
@Export("backGroundColor")
|
||||
int backGroundColor;
|
||||
@ObfuscatedName("j")
|
||||
@ObfuscatedName("l")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 1026096533
|
||||
intValue = -810351387
|
||||
)
|
||||
@Export("zoom")
|
||||
int zoom;
|
||||
@ObfuscatedName("o")
|
||||
@ObfuscatedName("n")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "Liw;"
|
||||
descriptor = "Lij;"
|
||||
)
|
||||
@Export("origin")
|
||||
Coord origin;
|
||||
@ObfuscatedName("m")
|
||||
@ObfuscatedName("w")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 1868545785
|
||||
intValue = 1162515791
|
||||
)
|
||||
@Export("regionLowX")
|
||||
int regionLowX;
|
||||
@ObfuscatedName("r")
|
||||
@ObfuscatedName("f")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 2043667075
|
||||
intValue = -367119943
|
||||
)
|
||||
@Export("regionHighX")
|
||||
int regionHighX;
|
||||
@ObfuscatedName("h")
|
||||
@ObfuscatedName("o")
|
||||
@ObfuscatedGetter(
|
||||
intValue = 491098273
|
||||
intValue = -1069848443
|
||||
)
|
||||
@Export("regionLowY")
|
||||
int regionLowY;
|
||||
@ObfuscatedName("d")
|
||||
@ObfuscatedName("x")
|
||||
@ObfuscatedGetter(
|
||||
intValue = -380417961
|
||||
intValue = 425431757
|
||||
)
|
||||
@Export("regionHighY")
|
||||
int regionHighY;
|
||||
@ObfuscatedName("z")
|
||||
@ObfuscatedName("r")
|
||||
@Export("isMain")
|
||||
boolean isMain;
|
||||
@ObfuscatedName("b")
|
||||
@ObfuscatedName("p")
|
||||
@Export("sections")
|
||||
LinkedList sections;
|
||||
|
||||
public WorldMapArea() {
|
||||
this.id = -1; // L: 9
|
||||
this.backGroundColor = -1; // L: 12
|
||||
this.zoom = -1; // L: 13
|
||||
this.origin = null; // L: 14
|
||||
this.regionLowX = Integer.MAX_VALUE; // L: 15
|
||||
this.regionHighX = 0; // L: 16
|
||||
this.regionLowY = Integer.MAX_VALUE; // L: 17
|
||||
this.regionHighY = 0; // L: 18
|
||||
this.isMain = false; // L: 19
|
||||
this.id = -1;
|
||||
this.backGroundColor = -1;
|
||||
this.zoom = -1;
|
||||
this.origin = null;
|
||||
this.regionLowX = Integer.MAX_VALUE;
|
||||
this.regionHighX = 0;
|
||||
this.regionLowY = Integer.MAX_VALUE;
|
||||
this.regionHighY = 0;
|
||||
this.isMain = false;
|
||||
}
|
||||
|
||||
@ObfuscatedName("f")
|
||||
@ObfuscatedName("s")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(Lnt;II)V",
|
||||
garbageValue = "-458748855"
|
||||
descriptor = "(Lnv;II)V",
|
||||
garbageValue = "1541243731"
|
||||
)
|
||||
@Export("read")
|
||||
public void read(Buffer var1, int var2) {
|
||||
this.id = var2; // L: 23
|
||||
this.internalName = var1.readStringCp1252NullTerminated(); // L: 24
|
||||
this.externalName = var1.readStringCp1252NullTerminated(); // L: 25
|
||||
this.origin = new Coord(var1.readInt()); // L: 26
|
||||
this.backGroundColor = var1.readInt(); // L: 27
|
||||
var1.readUnsignedByte(); // L: 28
|
||||
this.isMain = var1.readUnsignedByte() == 1; // L: 29
|
||||
this.zoom = var1.readUnsignedByte(); // L: 30
|
||||
int var3 = var1.readUnsignedByte(); // L: 31
|
||||
this.sections = new LinkedList(); // L: 32
|
||||
this.id = var2;
|
||||
this.internalName = var1.readStringCp1252NullTerminated();
|
||||
this.externalName = var1.readStringCp1252NullTerminated();
|
||||
this.origin = new Coord(var1.readInt());
|
||||
this.backGroundColor = var1.readInt();
|
||||
var1.readUnsignedByte();
|
||||
this.isMain = var1.readUnsignedByte() == 1;
|
||||
this.zoom = var1.readUnsignedByte();
|
||||
int var3 = var1.readUnsignedByte();
|
||||
this.sections = new LinkedList();
|
||||
|
||||
for (int var4 = 0; var4 < var3; ++var4) { // L: 33
|
||||
this.sections.add(this.readWorldMapSection(var1)); // L: 34
|
||||
for (int var4 = 0; var4 < var3; ++var4) {
|
||||
this.sections.add(this.readWorldMapSection(var1));
|
||||
}
|
||||
|
||||
this.setBounds(); // L: 36
|
||||
} // L: 37
|
||||
this.setBounds();
|
||||
}
|
||||
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedName("t")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(Lnt;S)Lge;",
|
||||
garbageValue = "2606"
|
||||
descriptor = "(Lnv;I)Lgx;",
|
||||
garbageValue = "1619583113"
|
||||
)
|
||||
@Export("readWorldMapSection")
|
||||
WorldMapSection readWorldMapSection(Buffer var1) {
|
||||
int var2 = var1.readUnsignedByte(); // L: 40
|
||||
WorldMapSectionType var3 = (WorldMapSectionType)Clock.findEnumerated(WorldMapSectionType.method3676(), var2); // L: 41
|
||||
Object var4 = null; // L: 42
|
||||
switch(var3.type) { // L: 43
|
||||
int var2 = var1.readUnsignedByte();
|
||||
WorldMapSectionType var3 = (WorldMapSectionType)Huffman.findEnumerated(WorldMapSectionType.method3600(), var2);
|
||||
Object var4 = null;
|
||||
switch(var3.type) {
|
||||
case 0:
|
||||
var4 = new WorldMapSection2(); // L: 45
|
||||
var4 = new class171();
|
||||
break;
|
||||
case 1:
|
||||
var4 = new WorldMapSection1(); // L: 48
|
||||
break; // L: 49
|
||||
var4 = new WorldMapSection2();
|
||||
break;
|
||||
case 2:
|
||||
var4 = new WorldMapSection0(); // L: 56
|
||||
var4 = new WorldMapSection0();
|
||||
break;
|
||||
case 3:
|
||||
var4 = new class170(); // L: 53
|
||||
break; // L: 54
|
||||
var4 = new WorldMapSection1();
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException(""); // L: 51
|
||||
throw new IllegalStateException("");
|
||||
}
|
||||
|
||||
((WorldMapSection)var4).read(var1); // L: 59
|
||||
return (WorldMapSection)var4; // L: 60
|
||||
((WorldMapSection)var4).read(var1);
|
||||
return (WorldMapSection)var4;
|
||||
}
|
||||
|
||||
@ObfuscatedName("v")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(IIII)Z",
|
||||
garbageValue = "-1448523684"
|
||||
garbageValue = "722138687"
|
||||
)
|
||||
@Export("containsCoord")
|
||||
public boolean containsCoord(int var1, int var2, int var3) {
|
||||
Iterator var4 = this.sections.iterator(); // L: 64
|
||||
Iterator var4 = this.sections.iterator();
|
||||
|
||||
WorldMapSection var5;
|
||||
do {
|
||||
if (!var4.hasNext()) {
|
||||
return false; // L: 72
|
||||
return false;
|
||||
}
|
||||
|
||||
var5 = (WorldMapSection)var4.next(); // L: 65
|
||||
} while(!var5.containsCoord(var1, var2, var3)); // L: 67
|
||||
var5 = (WorldMapSection)var4.next();
|
||||
} while(!var5.containsCoord(var1, var2, var3));
|
||||
|
||||
return true; // L: 68
|
||||
return true;
|
||||
}
|
||||
|
||||
@ObfuscatedName("y")
|
||||
@ObfuscatedName("j")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(III)Z",
|
||||
garbageValue = "-579774048"
|
||||
descriptor = "(IIB)Z",
|
||||
garbageValue = "73"
|
||||
)
|
||||
@Export("containsPosition")
|
||||
public boolean containsPosition(int var1, int var2) {
|
||||
int var3 = var1 / 64; // L: 76
|
||||
int var4 = var2 / 64; // L: 77
|
||||
if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 78
|
||||
if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 79
|
||||
Iterator var5 = this.sections.iterator(); // L: 80
|
||||
int var3 = var1 / 64;
|
||||
int var4 = var2 / 64;
|
||||
if (var3 >= this.regionLowX && var3 <= this.regionHighX) {
|
||||
if (var4 >= this.regionLowY && var4 <= this.regionHighY) {
|
||||
Iterator var5 = this.sections.iterator();
|
||||
|
||||
WorldMapSection var6;
|
||||
do {
|
||||
if (!var5.hasNext()) {
|
||||
return false; // L: 88
|
||||
return false;
|
||||
}
|
||||
|
||||
var6 = (WorldMapSection)var5.next(); // L: 81
|
||||
} while(!var6.containsPosition(var1, var2)); // L: 83
|
||||
var6 = (WorldMapSection)var5.next();
|
||||
} while(!var6.containsPosition(var1, var2));
|
||||
|
||||
return true; // L: 84
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
@@ -190,201 +190,237 @@ public class WorldMapArea {
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("j")
|
||||
@ObfuscatedName("l")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(IIIS)[I",
|
||||
garbageValue = "-1315"
|
||||
descriptor = "(IIII)[I",
|
||||
garbageValue = "-2086521998"
|
||||
)
|
||||
@Export("position")
|
||||
public int[] position(int var1, int var2, int var3) {
|
||||
Iterator var4 = this.sections.iterator(); // L: 92
|
||||
Iterator var4 = this.sections.iterator();
|
||||
|
||||
WorldMapSection var5;
|
||||
do {
|
||||
if (!var4.hasNext()) {
|
||||
return null; // L: 100
|
||||
return null;
|
||||
}
|
||||
|
||||
var5 = (WorldMapSection)var4.next(); // L: 93
|
||||
} while(!var5.containsCoord(var1, var2, var3)); // L: 95
|
||||
var5 = (WorldMapSection)var4.next();
|
||||
} while(!var5.containsCoord(var1, var2, var3));
|
||||
|
||||
return var5.getBorderTileLengths(var1, var2, var3); // L: 96
|
||||
return var5.getBorderTileLengths(var1, var2, var3);
|
||||
}
|
||||
|
||||
@ObfuscatedName("o")
|
||||
@ObfuscatedName("n")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(III)Liw;",
|
||||
garbageValue = "-464379344"
|
||||
descriptor = "(III)Lij;",
|
||||
garbageValue = "269042318"
|
||||
)
|
||||
@Export("coord")
|
||||
public Coord coord(int var1, int var2) {
|
||||
Iterator var3 = this.sections.iterator(); // L: 104
|
||||
Iterator var3 = this.sections.iterator();
|
||||
|
||||
WorldMapSection var4;
|
||||
do {
|
||||
if (!var3.hasNext()) {
|
||||
return null; // L: 112
|
||||
return null;
|
||||
}
|
||||
|
||||
var4 = (WorldMapSection)var3.next(); // L: 105
|
||||
} while(!var4.containsPosition(var1, var2)); // L: 107
|
||||
var4 = (WorldMapSection)var3.next();
|
||||
} while(!var4.containsPosition(var1, var2));
|
||||
|
||||
return var4.coord(var1, var2); // L: 108
|
||||
return var4.coord(var1, var2);
|
||||
}
|
||||
|
||||
@ObfuscatedName("m")
|
||||
@ObfuscatedName("w")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(B)V",
|
||||
garbageValue = "126"
|
||||
descriptor = "(I)V",
|
||||
garbageValue = "19328953"
|
||||
)
|
||||
@Export("setBounds")
|
||||
void setBounds() {
|
||||
Iterator var1 = this.sections.iterator(); // L: 116
|
||||
Iterator var1 = this.sections.iterator();
|
||||
|
||||
while (var1.hasNext()) {
|
||||
WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117
|
||||
var2.expandBounds(this); // L: 119
|
||||
WorldMapSection var2 = (WorldMapSection)var1.next();
|
||||
var2.expandBounds(this);
|
||||
}
|
||||
|
||||
} // L: 122
|
||||
}
|
||||
|
||||
@ObfuscatedName("r")
|
||||
@ObfuscatedName("f")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)I",
|
||||
garbageValue = "-362615212"
|
||||
descriptor = "(B)I",
|
||||
garbageValue = "103"
|
||||
)
|
||||
@Export("getId")
|
||||
public int getId() {
|
||||
return this.id; // L: 125
|
||||
return this.id;
|
||||
}
|
||||
|
||||
@ObfuscatedName("o")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)Z",
|
||||
garbageValue = "-1577332140"
|
||||
)
|
||||
@Export("getIsMain")
|
||||
public boolean getIsMain() {
|
||||
return this.isMain;
|
||||
}
|
||||
|
||||
@ObfuscatedName("x")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)Ljava/lang/String;",
|
||||
garbageValue = "-1712382848"
|
||||
)
|
||||
@Export("getInternalName")
|
||||
public String getInternalName() {
|
||||
return this.internalName;
|
||||
}
|
||||
|
||||
@ObfuscatedName("r")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)Ljava/lang/String;",
|
||||
garbageValue = "-1525693350"
|
||||
)
|
||||
@Export("getExternalName")
|
||||
public String getExternalName() {
|
||||
return this.externalName;
|
||||
}
|
||||
|
||||
@ObfuscatedName("p")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(B)I",
|
||||
garbageValue = "-2"
|
||||
)
|
||||
@Export("getBackGroundColor")
|
||||
int getBackGroundColor() {
|
||||
return this.backGroundColor;
|
||||
}
|
||||
|
||||
@ObfuscatedName("h")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(B)Z",
|
||||
garbageValue = "58"
|
||||
)
|
||||
@Export("getIsMain")
|
||||
public boolean getIsMain() {
|
||||
return this.isMain; // L: 129
|
||||
}
|
||||
|
||||
@ObfuscatedName("d")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(B)Ljava/lang/String;",
|
||||
garbageValue = "-118"
|
||||
)
|
||||
@Export("getInternalName")
|
||||
public String getInternalName() {
|
||||
return this.internalName; // L: 133
|
||||
}
|
||||
|
||||
@ObfuscatedName("z")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(B)Ljava/lang/String;",
|
||||
garbageValue = "117"
|
||||
)
|
||||
@Export("getExternalName")
|
||||
public String getExternalName() {
|
||||
return this.externalName; // L: 137
|
||||
}
|
||||
|
||||
@ObfuscatedName("b")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(S)I",
|
||||
garbageValue = "18217"
|
||||
)
|
||||
@Export("getBackGroundColor")
|
||||
int getBackGroundColor() {
|
||||
return this.backGroundColor; // L: 141
|
||||
}
|
||||
|
||||
@ObfuscatedName("i")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(B)I",
|
||||
garbageValue = "4"
|
||||
garbageValue = "117"
|
||||
)
|
||||
@Export("getZoom")
|
||||
public int getZoom() {
|
||||
return this.zoom; // L: 145
|
||||
return this.zoom;
|
||||
}
|
||||
|
||||
@ObfuscatedName("k")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)I",
|
||||
garbageValue = "-53355558"
|
||||
garbageValue = "-132060536"
|
||||
)
|
||||
@Export("getRegionLowX")
|
||||
public int getRegionLowX() {
|
||||
return this.regionLowX; // L: 149
|
||||
return this.regionLowX;
|
||||
}
|
||||
|
||||
@ObfuscatedName("g")
|
||||
@ObfuscatedName("a")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)I",
|
||||
garbageValue = "-1437577168"
|
||||
garbageValue = "172672356"
|
||||
)
|
||||
@Export("getRegionHighX")
|
||||
public int getRegionHighX() {
|
||||
return this.regionHighX; // L: 153
|
||||
}
|
||||
|
||||
@ObfuscatedName("t")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(B)I",
|
||||
garbageValue = "-51"
|
||||
)
|
||||
@Export("getRegionLowY")
|
||||
public int getRegionLowY() {
|
||||
return this.regionLowY; // L: 157
|
||||
}
|
||||
|
||||
@ObfuscatedName("x")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)I",
|
||||
garbageValue = "-2076656857"
|
||||
)
|
||||
@Export("getRegionHighY")
|
||||
public int getRegionHighY() {
|
||||
return this.regionHighY; // L: 161
|
||||
}
|
||||
|
||||
@ObfuscatedName("u")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)I",
|
||||
garbageValue = "-195979201"
|
||||
)
|
||||
@Export("getOriginX")
|
||||
public int getOriginX() {
|
||||
return this.origin.x; // L: 165
|
||||
return this.regionHighX;
|
||||
}
|
||||
|
||||
@ObfuscatedName("q")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)I",
|
||||
garbageValue = "263093788"
|
||||
garbageValue = "1292485982"
|
||||
)
|
||||
@Export("getRegionLowY")
|
||||
public int getRegionLowY() {
|
||||
return this.regionLowY;
|
||||
}
|
||||
|
||||
@ObfuscatedName("u")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)I",
|
||||
garbageValue = "1465522234"
|
||||
)
|
||||
@Export("getRegionHighY")
|
||||
public int getRegionHighY() {
|
||||
return this.regionHighY;
|
||||
}
|
||||
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)I",
|
||||
garbageValue = "-2147163667"
|
||||
)
|
||||
@Export("getOriginX")
|
||||
public int getOriginX() {
|
||||
return this.origin.x;
|
||||
}
|
||||
|
||||
@ObfuscatedName("c")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)I",
|
||||
garbageValue = "335914375"
|
||||
)
|
||||
@Export("getOriginPlane")
|
||||
public int getOriginPlane() {
|
||||
return this.origin.plane; // L: 169
|
||||
return this.origin.plane;
|
||||
}
|
||||
|
||||
@ObfuscatedName("s")
|
||||
@ObfuscatedName("i")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)I",
|
||||
garbageValue = "-2050680691"
|
||||
garbageValue = "2093254477"
|
||||
)
|
||||
@Export("getOriginY")
|
||||
public int getOriginY() {
|
||||
return this.origin.y; // L: 173
|
||||
return this.origin.y;
|
||||
}
|
||||
|
||||
@ObfuscatedName("p")
|
||||
@ObfuscatedName("m")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(I)Liw;",
|
||||
garbageValue = "2115040321"
|
||||
descriptor = "(I)Lij;",
|
||||
garbageValue = "-1754049769"
|
||||
)
|
||||
@Export("getOrigin")
|
||||
public Coord getOrigin() {
|
||||
return new Coord(this.origin); // L: 177
|
||||
return new Coord(this.origin);
|
||||
}
|
||||
|
||||
@ObfuscatedName("v")
|
||||
@ObfuscatedSignature(
|
||||
descriptor = "(IIILem;II)V",
|
||||
garbageValue = "598437329"
|
||||
)
|
||||
static void method3358(int var0, int var1, int var2, ObjectComposition var3, int var4) {
|
||||
ObjectSound var5 = new ObjectSound();
|
||||
var5.plane = var0;
|
||||
var5.x = var1 * 128;
|
||||
var5.y = var2 * 128;
|
||||
int var6 = var3.sizeX;
|
||||
int var7 = var3.sizeY;
|
||||
if (var4 == 1 || var4 == 3) {
|
||||
var6 = var3.sizeY;
|
||||
var7 = var3.sizeX;
|
||||
}
|
||||
|
||||
var5.field722 = (var6 + var1) * 128;
|
||||
var5.field723 = (var7 + var2) * 128;
|
||||
var5.soundEffectId = var3.ambientSoundId;
|
||||
var5.field718 = var3.field1779 * 128;
|
||||
var5.field727 = var3.int5;
|
||||
var5.field728 = var3.int6;
|
||||
var5.soundEffectIds = var3.soundEffectIds;
|
||||
if (var3.transforms != null) {
|
||||
var5.obj = var3;
|
||||
var5.set();
|
||||
}
|
||||
|
||||
ObjectSound.objectSounds.addFirst(var5);
|
||||
if (var5.soundEffectIds != null) {
|
||||
var5.field725 = var5.field727 + (int)(Math.random() * (double)(var5.field728 - var5.field727));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user