Update cache to 142

cache/pom.xml

@@ -37,7 +37,7 @@
 	<name>Cache</name>
 
 	<properties>
-		<cache.version>140</cache.version>
+		<cache.version>142</cache.version>
 		
 		<antlr4.version>4.6</antlr4.version>
 	</properties>

cache/src/main/java/net/runelite/cache/IndexType.java

@@ -42,7 +42,8 @@ public enum IndexType
 	CLIENTSCRIPT(12),
 	FONTS(13),
 	VORBIS(14),
-	INSTRUMENTS(15);
+	INSTRUMENTS(15),
+	WORLDMAP(16);
 
 	private int id;
 	

cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java

@@ -193,10 +193,6 @@ public class ObjectLoader
 			def.setRetextureToFind(retextureToFind);
 			def.setTextureToReplace(textureToReplace);
 		}
-		else if (opcode == 60)
-		{
-			def.setMapIconID(is.readUnsignedShort());
-		}
 		else if (62 == opcode)
 		{
 			def.setIsRotated(true);
@@ -303,7 +299,11 @@ public class ObjectLoader
 		}
 		else if (opcode == 81)
 		{
-			def.setAnInt2105(is.readUnsignedByte());
+			def.setAnInt2105(is.readUnsignedByte() * 256);
+		}
+		else if (opcode == 82)
+		{
+			def.setMapIconID(is.readUnsignedShort());
 		}
 		else if (opcode == 92)
 		{

cache/src/test/java/net/runelite/cache/StoreLocation.java

@@ -37,7 +37,7 @@ public class StoreLocation
 {
 	private static final Logger logger = LoggerFactory.getLogger(StoreLocation.class);
 
-	private static final int NUM_INDEXES = 15;
+	private static final int NUM_INDEXES = 16;
 	private static final String TMP_DIR = "d:/temp";
 
 	public static File LOCATION;