rev 196

runescape-client/src/main/java/WorldMapArea.java

@@ -5,81 +5,74 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
-import net.runelite.rs.ScriptOpcodes;
 
-@ObfuscatedName("eq")
+@ObfuscatedName("fe")
 @Implements("WorldMapArea")
 public class WorldMapArea {
-	@ObfuscatedName("gz")
+	@ObfuscatedName("fl")
 	@ObfuscatedSignature(
-		descriptor = "Lfu;"
+		descriptor = "Lkc;"
 	)
-	@Export("scene")
-	static Scene scene;
-	@ObfuscatedName("hx")
+	@Export("fontBold12")
+	static Font fontBold12;
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1615990339
-	)
-	@Export("cameraPitch")
-	static int cameraPitch;
-	@ObfuscatedName("f")
-	@ObfuscatedGetter(
-		intValue = -1514003013
+		intValue = 519247697
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("o")
+	@ObfuscatedName("c")
 	@Export("internalName")
 	String internalName;
-	@ObfuscatedName("u")
+	@ObfuscatedName("o")
 	@Export("externalName")
 	String externalName;
-	@ObfuscatedName("p")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -720115575
+		intValue = -1230995281
 	)
 	@Export("backGroundColor")
 	int backGroundColor;
-	@ObfuscatedName("b")
+	@ObfuscatedName("l")
 	@ObfuscatedGetter(
-		intValue = -297812541
+		intValue = 526581911
 	)
 	@Export("zoom")
 	int zoom;
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "Lhk;"
+		descriptor = "Lia;"
 	)
 	@Export("origin")
 	Coord origin;
-	@ObfuscatedName("k")
+	@ObfuscatedName("t")
 	@ObfuscatedGetter(
-		intValue = 904812453
+		intValue = 399363655
 	)
 	@Export("regionLowX")
 	int regionLowX;
-	@ObfuscatedName("g")
+	@ObfuscatedName("v")
 	@ObfuscatedGetter(
-		intValue = 766167871
+		intValue = 383400035
 	)
 	@Export("regionHighX")
 	int regionHighX;
-	@ObfuscatedName("h")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = 832142727
+		intValue = -1375320443
 	)
 	@Export("regionLowY")
 	int regionLowY;
-	@ObfuscatedName("n")
+	@ObfuscatedName("q")
 	@ObfuscatedGetter(
-		intValue = -1806584787
+		intValue = 2005754791
 	)
 	@Export("regionHighY")
 	int regionHighY;
-	@ObfuscatedName("l")
+	@ObfuscatedName("i")
 	@Export("isMain")
 	boolean isMain;
-	@ObfuscatedName("m")
+	@ObfuscatedName("x")
 	@Export("sections")
 	LinkedList sections;
 
@@ -95,10 +88,10 @@ public class WorldMapArea {
 		this.isMain = false; // L: 19
 	}
 
-	@ObfuscatedName("f")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Lnu;II)V",
-		garbageValue = "747590204"
+		descriptor = "(Lnk;II)V",
+		garbageValue = "1004377036"
 	)
 	@Export("read")
 	public void read(Buffer var1, int var2) {
@@ -114,88 +107,87 @@ public class WorldMapArea {
 		this.sections = new LinkedList(); // L: 32
 
 		for (int var4 = 0; var4 < var3; ++var4) { // L: 33
-			this.sections.add(this.readWorldMapSection(var1));
+			this.sections.add(this.readWorldMapSection(var1)); // L: 34
 		}
 
 		this.setBounds(); // L: 36
 	} // L: 37
 
-	@ObfuscatedName("o")
+	@ObfuscatedName("c")
 	@ObfuscatedSignature(
-		descriptor = "(Lnu;I)Lfv;",
-		garbageValue = "715187393"
+		descriptor = "(Lnk;I)Lgl;",
+		garbageValue = "860405758"
 	)
 	@Export("readWorldMapSection")
 	WorldMapSection readWorldMapSection(Buffer var1) {
 		int var2 = var1.readUnsignedByte(); // L: 40
-		WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE2, WorldMapSectionType.WORLDMAPSECTIONTYPE1}; // L: 43
-		WorldMapSectionType var4 = (WorldMapSectionType)UserComparator8.findEnumerated(var3, var2); // L: 45
-		Object var5 = null; // L: 46
-		switch(var4.type) { // L: 47
+		WorldMapSectionType var3 = (WorldMapSectionType)UserComparator4.findEnumerated(WorldMapSectionType.method3537(), var2); // L: 41
+		Object var4 = null; // L: 42
+		switch(var3.type) { // L: 43
 		case 0:
-			var5 = new class147(); // L: 54
-			break; // L: 55
-		case 1:
-			var5 = new WorldMapSection1(); // L: 49
+			var4 = new class169(); // L: 56
 			break;
+		case 1:
+			var4 = new WorldMapSection0(); // L: 48
+			break; // L: 49
 		case 2:
-			var5 = new WorldMapSection2(); // L: 57
-			break; // L: 58
+			var4 = new WorldMapSection2(); // L: 45
+			break;
 		case 3:
-			var5 = new WorldMapSection0(); // L: 60
+			var4 = new WorldMapSection1(); // L: 53
 			break;
 		default:
-			throw new IllegalStateException(""); // L: 52
+			throw new IllegalStateException(""); // L: 51
 		}
 
-		((WorldMapSection)var5).read(var1); // L: 63
-		return (WorldMapSection)var5; // L: 64
+		((WorldMapSection)var4).read(var1); // L: 59
+		return (WorldMapSection)var4; // L: 60
 	}
 
-	@ObfuscatedName("u")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(IIII)Z",
-		garbageValue = "1809400826"
+		descriptor = "(IIIB)Z",
+		garbageValue = "99"
 	)
 	@Export("containsCoord")
 	public boolean containsCoord(int var1, int var2, int var3) {
-		Iterator var4 = this.sections.iterator(); // L: 68
+		Iterator var4 = this.sections.iterator(); // L: 64
 
 		WorldMapSection var5;
 		do {
 			if (!var4.hasNext()) {
-				return false; // L: 76
+				return false; // L: 72
 			}
 
-			var5 = (WorldMapSection)var4.next(); // L: 69
-		} while(!var5.containsCoord(var1, var2, var3)); // L: 71
+			var5 = (WorldMapSection)var4.next(); // L: 65
+		} while(!var5.containsCoord(var1, var2, var3)); // L: 67
 
-		return true;
+		return true; // L: 68
 	}
 
-	@ObfuscatedName("p")
+	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(III)Z",
-		garbageValue = "-1003463071"
+		garbageValue = "-1146651555"
 	)
 	@Export("containsPosition")
 	public boolean containsPosition(int var1, int var2) {
-		int var3 = var1 / 64; // L: 80
-		int var4 = var2 / 64; // L: 81
-		if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 82
-			if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 83
-				Iterator var5 = this.sections.iterator(); // L: 84
+		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
 
 				WorldMapSection var6;
 				do {
-					if (!var5.hasNext()) { // L: 91
-						return false; // L: 92
+					if (!var5.hasNext()) {
+						return false; // L: 88
 					}
 
-					var6 = (WorldMapSection)var5.next(); // L: 85
-				} while(!var6.containsPosition(var1, var2)); // L: 87
+					var6 = (WorldMapSection)var5.next(); // L: 81
+				} while(!var6.containsPosition(var1, var2)); // L: 83
 
-				return true; // L: 88
+				return true; // L: 84
 			} else {
 				return false;
 			}
@@ -204,261 +196,201 @@ public class WorldMapArea {
 		}
 	}
 
-	@ObfuscatedName("b")
+	@ObfuscatedName("l")
 	@ObfuscatedSignature(
 		descriptor = "(IIII)[I",
-		garbageValue = "416531869"
+		garbageValue = "-311505931"
 	)
 	@Export("position")
 	public int[] position(int var1, int var2, int var3) {
-		Iterator var4 = this.sections.iterator(); // L: 96
+		Iterator var4 = this.sections.iterator(); // L: 92
 
 		WorldMapSection var5;
 		do {
-			if (!var4.hasNext()) { // L: 103
-				return null; // L: 104
+			if (!var4.hasNext()) {
+				return null; // L: 100
 			}
 
-			var5 = (WorldMapSection)var4.next(); // L: 97
-		} while(!var5.containsCoord(var1, var2, var3)); // L: 99
+			var5 = (WorldMapSection)var4.next(); // L: 93
+		} while(!var5.containsCoord(var1, var2, var3)); // L: 95
 
-		return var5.getBorderTileLengths(var1, var2, var3); // L: 100
+		return var5.getBorderTileLengths(var1, var2, var3); // L: 96
 	}
 
-	@ObfuscatedName("e")
+	@ObfuscatedName("z")
 	@ObfuscatedSignature(
-		descriptor = "(III)Lhk;",
-		garbageValue = "2101787802"
+		descriptor = "(III)Lia;",
+		garbageValue = "-474140202"
 	)
 	@Export("coord")
 	public Coord coord(int var1, int var2) {
-		Iterator var3 = this.sections.iterator(); // L: 108
+		Iterator var3 = this.sections.iterator(); // L: 104
 
 		WorldMapSection var4;
 		do {
 			if (!var3.hasNext()) {
-				return null; // L: 116
+				return null; // L: 112
 			}
 
-			var4 = (WorldMapSection)var3.next(); // L: 109
-		} while(!var4.containsPosition(var1, var2)); // L: 111
+			var4 = (WorldMapSection)var3.next(); // L: 105
+		} while(!var4.containsPosition(var1, var2)); // L: 107
 
-		return var4.coord(var1, var2); // L: 112
+		return var4.coord(var1, var2); // L: 108
+	}
+
+	@ObfuscatedName("t")
+	@ObfuscatedSignature(
+		descriptor = "(I)V",
+		garbageValue = "2003225896"
+	)
+	@Export("setBounds")
+	void setBounds() {
+		Iterator var1 = this.sections.iterator(); // L: 116
+
+		while (var1.hasNext()) {
+			WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117
+			var2.expandBounds(this); // L: 119
+		}
+
+	} // L: 122
+
+	@ObfuscatedName("v")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1745178974"
+	)
+	@Export("getId")
+	public int getId() {
+		return this.id; // L: 125
+	}
+
+	@ObfuscatedName("b")
+	@ObfuscatedSignature(
+		descriptor = "(I)Z",
+		garbageValue = "-1950754805"
+	)
+	@Export("getIsMain")
+	public boolean getIsMain() {
+		return this.isMain; // L: 129
+	}
+
+	@ObfuscatedName("q")
+	@ObfuscatedSignature(
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "725085100"
+	)
+	@Export("getInternalName")
+	public String getInternalName() {
+		return this.internalName; // L: 133
+	}
+
+	@ObfuscatedName("i")
+	@ObfuscatedSignature(
+		descriptor = "(I)Ljava/lang/String;",
+		garbageValue = "1184219144"
+	)
+	@Export("getExternalName")
+	public String getExternalName() {
+		return this.externalName; // L: 137
+	}
+
+	@ObfuscatedName("x")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "-1551948679"
+	)
+	@Export("getBackGroundColor")
+	int getBackGroundColor() {
+		return this.backGroundColor; // L: 141
 	}
 
 	@ObfuscatedName("k")
-	@ObfuscatedSignature(
-		descriptor = "(I)V",
-		garbageValue = "1832411393"
-	)
-	@Export("setBounds")
-	void setBounds() {
-		Iterator var1 = this.sections.iterator(); // L: 120
-
-		while (var1.hasNext()) {
-			WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 121
-			var2.expandBounds(this); // L: 123
-		}
-
-	} // L: 126
-
-	@ObfuscatedName("g")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "2062295342"
-	)
-	@Export("getId")
-	public int getId() {
-		return this.id; // L: 129
-	}
-
-	@ObfuscatedName("h")
-	@ObfuscatedSignature(
-		descriptor = "(I)Z",
-		garbageValue = "461643784"
-	)
-	@Export("getIsMain")
-	public boolean getIsMain() {
-		return this.isMain; // L: 133
-	}
-
-	@ObfuscatedName("n")
-	@ObfuscatedSignature(
-		descriptor = "(I)Ljava/lang/String;",
-		garbageValue = "-1819862501"
-	)
-	@Export("getInternalName")
-	public String getInternalName() {
-		return this.internalName; // L: 137
-	}
-
-	@ObfuscatedName("l")
-	@ObfuscatedSignature(
-		descriptor = "(B)Ljava/lang/String;",
-		garbageValue = "-82"
-	)
-	@Export("getExternalName")
-	public String getExternalName() {
-		return this.externalName; // L: 141
-	}
-
-	@ObfuscatedName("m")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "753799862"
-	)
-	@Export("getBackGroundColor")
-	int getBackGroundColor() {
-		return this.backGroundColor; // L: 145
-	}
-
-	@ObfuscatedName("d")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "1445982184"
+		garbageValue = "1392872851"
 	)
 	@Export("getZoom")
 	public int getZoom() {
-		return this.zoom; // L: 149
-	}
-
-	@ObfuscatedName("c")
-	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "24"
-	)
-	@Export("getRegionLowX")
-	public int getRegionLowX() {
-		return this.regionLowX; // L: 153
-	}
-
-	@ObfuscatedName("j")
-	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "116"
-	)
-	@Export("getRegionHighX")
-	public int getRegionHighX() {
-		return this.regionHighX; // L: 157
+		return this.zoom; // L: 145
 	}
 
 	@ObfuscatedName("r")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "-2085770909"
+		garbageValue = "-759231934"
+	)
+	@Export("getRegionLowX")
+	public int getRegionLowX() {
+		return this.regionLowX; // L: 149
+	}
+
+	@ObfuscatedName("p")
+	@ObfuscatedSignature(
+		descriptor = "(I)I",
+		garbageValue = "1206209836"
+	)
+	@Export("getRegionHighX")
+	public int getRegionHighX() {
+		return this.regionHighX; // L: 153
+	}
+
+	@ObfuscatedName("a")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "96"
 	)
 	@Export("getRegionLowY")
 	public int getRegionLowY() {
-		return this.regionLowY; // L: 161
+		return this.regionLowY; // L: 157
 	}
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("e")
 	@ObfuscatedSignature(
 		descriptor = "(I)I",
-		garbageValue = "1254165829"
+		garbageValue = "-16776142"
 	)
 	@Export("getRegionHighY")
 	public int getRegionHighY() {
-		return this.regionHighY; // L: 165
-	}
-
-	@ObfuscatedName("t")
-	@ObfuscatedSignature(
-		descriptor = "(I)I",
-		garbageValue = "-1410964110"
-	)
-	@Export("getOriginX")
-	public int getOriginX() {
-		return this.origin.x; // L: 169
-	}
-
-	@ObfuscatedName("v")
-	@ObfuscatedSignature(
-		descriptor = "(S)I",
-		garbageValue = "4919"
-	)
-	@Export("getOriginPlane")
-	public int getOriginPlane() {
-		return this.origin.plane; // L: 173
-	}
-
-	@ObfuscatedName("x")
-	@ObfuscatedSignature(
-		descriptor = "(B)I",
-		garbageValue = "63"
-	)
-	@Export("getOriginY")
-	public int getOriginY() {
-		return this.origin.y; // L: 177
-	}
-
-	@ObfuscatedName("z")
-	@ObfuscatedSignature(
-		descriptor = "(I)Lhk;",
-		garbageValue = "-714822914"
-	)
-	@Export("getOrigin")
-	public Coord getOrigin() {
-		return new Coord(this.origin); // L: 181
-	}
-
-	@ObfuscatedName("o")
-	@ObfuscatedSignature(
-		descriptor = "(Ljava/lang/CharSequence;I)Z",
-		garbageValue = "-947353982"
-	)
-	@Export("isNumber")
-	public static boolean isNumber(CharSequence var0) {
-		return class21.method316(var0, 10, true); // L: 34
-	}
-
-	@ObfuscatedName("u")
-	@ObfuscatedSignature(
-		descriptor = "(IB)[B",
-		garbageValue = "18"
-	)
-	@Export("ByteArrayPool_getArray")
-	public static synchronized byte[] ByteArrayPool_getArray(int var0) {
-		return ByteArrayPool.ByteArrayPool_getArrayBool(var0, false); // L: 72
+		return this.regionHighY; // L: 161
 	}
 
 	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "(ILcc;ZI)I",
-		garbageValue = "-993034647"
+		descriptor = "(I)I",
+		garbageValue = "-804224518"
 	)
-	static int method2740(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? FriendSystem.scriptDotWidget : class4.scriptActiveWidget; // L: 1073
-		if (var0 == ScriptOpcodes.CC_GETX) { // L: 1074
-			Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.x; // L: 1075
-			return 1; // L: 1076
-		} else if (var0 == ScriptOpcodes.CC_GETY) { // L: 1078
-			Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.y; // L: 1079
-			return 1; // L: 1080
-		} else if (var0 == ScriptOpcodes.CC_GETWIDTH) { // L: 1082
-			Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.width; // L: 1083
-			return 1; // L: 1084
-		} else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { // L: 1086
-			Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.height; // L: 1087
-			return 1; // L: 1088
-		} else if (var0 == ScriptOpcodes.CC_GETHIDE) { // L: 1090
-			Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; // L: 1091
-			return 1; // L: 1092
-		} else if (var0 == ScriptOpcodes.CC_GETLAYER) { // L: 1094
-			Interpreter.Interpreter_intStack[++class16.Interpreter_intStackSize - 1] = var3.parentId; // L: 1095
-			return 1; // L: 1096
-		} else {
-			return 2; // L: 1098
-		}
+	@Export("getOriginX")
+	public int getOriginX() {
+		return this.origin.x; // L: 165
 	}
 
-	@ObfuscatedName("km")
+	@ObfuscatedName("u")
 	@ObfuscatedSignature(
-		descriptor = "(Lhu;I)Z",
-		garbageValue = "440915192"
+		descriptor = "(I)I",
+		garbageValue = "-1864891878"
 	)
-	@Export("isComponentHidden")
-	static boolean isComponentHidden(Widget var0) {
-		return var0.isHidden; // L: 11595
+	@Export("getOriginPlane")
+	public int getOriginPlane() {
+		return this.origin.plane; // L: 169
+	}
+
+	@ObfuscatedName("m")
+	@ObfuscatedSignature(
+		descriptor = "(B)I",
+		garbageValue = "-26"
+	)
+	@Export("getOriginY")
+	public int getOriginY() {
+		return this.origin.y; // L: 173
+	}
+
+	@ObfuscatedName("j")
+	@ObfuscatedSignature(
+		descriptor = "(I)Lia;",
+		garbageValue = "-742727761"
+	)
+	@Export("getOrigin")
+	public Coord getOrigin() {
+		return new Coord(this.origin); // L: 177
 	}
 }