Merge pull request #10084 from abextm/cache-code-2019-10-17-rev182

Cache code 2019 10 17 rev182

runelite-api/src/main/java/net/runelite/api/ItemID.java

@@ -8080,16 +8080,17 @@ public final class ItemID
 	public static final int BIRD_SNARE_PACK = 12740;
 	public static final int BOX_TRAP_PACK = 12742;
 	public static final int MAGIC_IMP_BOX_PACK = 12744;
-	public static final int MYSTERIOUS_EMBLEM = 12746;
-	public static final int MYSTERIOUS_EMBLEM_TIER_2 = 12748;
-	public static final int MYSTERIOUS_EMBLEM_TIER_3 = 12749;
-	public static final int MYSTERIOUS_EMBLEM_TIER_4 = 12750;
-	public static final int MYSTERIOUS_EMBLEM_TIER_5 = 12751;
-	public static final int MYSTERIOUS_EMBLEM_TIER_6 = 12752;
-	public static final int MYSTERIOUS_EMBLEM_TIER_7 = 12753;
-	public static final int MYSTERIOUS_EMBLEM_TIER_8 = 12754;
-	public static final int MYSTERIOUS_EMBLEM_TIER_9 = 12755;
-	public static final int MYSTERIOUS_EMBLEM_TIER_10 = 12756;
+	public static final int ARCHAIC_EMBLEM_TIER_1 = 12746;
+	public static final int ARCHAIC_EMBLEM_TIER_1_12747 = 12747;
+	public static final int ARCHAIC_EMBLEM_TIER_2 = 12748;
+	public static final int ARCHAIC_EMBLEM_TIER_3 = 12749;
+	public static final int ARCHAIC_EMBLEM_TIER_4 = 12750;
+	public static final int ARCHAIC_EMBLEM_TIER_5 = 12751;
+	public static final int ARCHAIC_EMBLEM_TIER_6 = 12752;
+	public static final int ARCHAIC_EMBLEM_TIER_7 = 12753;
+	public static final int ARCHAIC_EMBLEM_TIER_8 = 12754;
+	public static final int ARCHAIC_EMBLEM_TIER_9 = 12755;
+	public static final int ARCHAIC_EMBLEM_TIER_10 = 12756;
 	public static final int BLUE_DARK_BOW_PAINT = 12757;
 	public static final int GREEN_DARK_BOW_PAINT = 12759;
 	public static final int YELLOW_DARK_BOW_PAINT = 12761;
@@ -10860,6 +10861,7 @@ public final class ItemID
 	public static final int HEALER_ICON_23484 = 23484;
 	public static final int HEALER_ICON_23485 = 23485;
 	public static final int HEALER_ICON_23486 = 23486;
+	public static final int ARCHAIC_EMBLEM_TIER_10_23487 = 23487;
 	public static final int WINE_OF_ZAMORAK_23489 = 23489;
 	public static final int LARRANS_KEY = 23490;
 	public static final int SRARACHA = 23495;
@@ -11283,5 +11285,11 @@ public final class ItemID
 	public static final int BASILISK_JAW = 24268;
 	public static final int NEITIZNOT_FACEGUARD = 24271;
 	public static final int BASILISK_KNIGHT = 24276;
+	public static final int MYSTERIOUS_EMBLEM_TIER_1 = 24277;
+	public static final int MYSTERIOUS_EMBLEM_TIER_2 = 24279;
+	public static final int MYSTERIOUS_EMBLEM_TIER_3 = 24281;
+	public static final int MYSTERIOUS_EMBLEM_TIER_4 = 24283;
+	public static final int MYSTERIOUS_EMBLEM_TIER_5 = 24285;
+	public static final int DECORATIVE_EMBLEM = 24287;
 	/* This file is automatically generated. Do not edit. */
 }

runelite-api/src/main/java/net/runelite/api/NpcID.java

@@ -286,7 +286,6 @@ public final class NpcID
 	public static final int DWARF = 290;
 	public static final int CHAOS_DWARF = 291;
 	public static final int DWARF_292 = 292;
-	public static final int DWARF_293 = 293;
 	public static final int DWARF_294 = 294;
 	public static final int DWARF_295 = 295;
 	public static final int DWARF_296 = 296;
@@ -301,14 +300,13 @@ public final class NpcID
 	public static final int JENNIFER = 305;
 	public static final int LUMBRIDGE_GUIDE = 306;
 	public static final int DR_JEKYLL = 307;
+	public static final int EMBLEM_TRADER = 308;
 	public static final int REACHER = 309;
 	public static final int AYESHA = 310;
 	public static final int ADAM = 311;
 	public static final int FROG = 312;
 	public static final int REACHER_313 = 313;
 	public static final int DR_JEKYLL_314 = 314;
-	public static final int EMBLEM_TRADER = 315;
-	public static final int EMBLEM_TRADER_316 = 316;
 	public static final int PAUL = 317;
 	public static final int DARK_CORE = 318;
 	public static final int CORPOREAL_BEAST = 319;
@@ -7161,8 +7159,7 @@ public final class NpcID
 	public static final int REVENANT_DARK_BEAST = 7938;
 	public static final int REVENANT_KNIGHT = 7939;
 	public static final int REVENANT_DRAGON = 7940;
-	public static final int EMBLEM_TRADER_7941 = 7941;
-	public static final int EMBLEM_TRADER_7942 = 7942;
+	public static final int EMBLEM_TRADER_7943 = 7943;
 	public static final int FISHING_SPOT_7946 = 7946;
 	public static final int FISHING_SPOT_7947 = 7947;
 	public static final int CORSAIR_TRAITOR_HARD = 7948;

runelite-api/src/main/java/net/runelite/api/NullItemID.java

@@ -4551,7 +4551,6 @@ public final class NullItemID
 	public static final int NULL_12741 = 12741;
 	public static final int NULL_12743 = 12743;
 	public static final int NULL_12745 = 12745;
-	public static final int NULL_12747 = 12747;
 	public static final int NULL_12758 = 12758;
 	public static final int NULL_12760 = 12760;
 	public static final int NULL_12762 = 12762;
@@ -12416,7 +12415,6 @@ public final class NullItemID
 	public static final int NULL_23456 = 23456;
 	public static final int NULL_23457 = 23457;
 	public static final int NULL_23459 = 23459;
-	public static final int NULL_23487 = 23487;
 	public static final int NULL_23488 = 23488;
 	public static final int NULL_23491 = 23491;
 	public static final int NULL_23492 = 23492;
@@ -12783,5 +12781,10 @@ public final class NullItemID
 	public static final int NULL_24273 = 24273;
 	public static final int NULL_24274 = 24274;
 	public static final int NULL_24275 = 24275;
+	public static final int NULL_24278 = 24278;
+	public static final int NULL_24280 = 24280;
+	public static final int NULL_24282 = 24282;
+	public static final int NULL_24284 = 24284;
+	public static final int NULL_24286 = 24286;
 	/* This file is automatically generated. Do not edit. */
 }

runelite-api/src/main/java/net/runelite/api/ObjectID.java

@@ -19383,5 +19383,6 @@ public final class ObjectID
 	public static final int DOOR_37422 = 37422;
 	public static final int THE_JORMUNGAND = 37424;
 	public static final int ROUGH_WALL_37431 = 37431;
+	public static final int STREAK_INFO = 37434;
 	/* This file is automatically generated. Do not edit. */
 }

runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java

@@ -735,11 +735,11 @@ public class WidgetID
 
 	static class Pvp
 	{
-		static final int BOUNTY_HUNTER_INFO = 18;
-		static final int KILLDEATH_RATIO = 15;
-		static final int SKULL_CONTAINER = 61;
-		static final int SAFE_ZONE = 63;
-		static final int WILDERNESS_LEVEL = 66; // this can also be the Deadman Mode "Protection" text
+		static final int BOUNTY_HUNTER_INFO = 6;
+		static final int KILLDEATH_RATIO = 33;
+		static final int SKULL_CONTAINER = 53;
+		static final int SAFE_ZONE = 55;
+		static final int WILDERNESS_LEVEL = 57; // this can also be the Deadman Mode "Protection" text
 	}
 
 	static class KourendFavour

runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java

@@ -50,7 +50,6 @@ public class WidgetOverlay extends Overlay
 		.put(WidgetInfo.PEST_CONTROL_INFO, OverlayPosition.TOP_LEFT)
 		.put(WidgetInfo.ZEAH_MESS_HALL_COOKING_DISPLAY, OverlayPosition.TOP_LEFT)
 		.put(WidgetInfo.PVP_BOUNTY_HUNTER_INFO, OverlayPosition.TOP_RIGHT)
-		.put(WidgetInfo.PVP_KILLDEATH_COUNTER, OverlayPosition.TOP_LEFT)
 		.put(WidgetInfo.SKOTIZO_CONTAINER, OverlayPosition.TOP_LEFT)
 		.put(WidgetInfo.KOUREND_FAVOUR_OVERLAY, OverlayPosition.TOP_CENTER)
 		.put(WidgetInfo.PYRAMID_PLUNDER_DATA, OverlayPosition.TOP_CENTER)

runelite-client/src/main/resources/item_variations.json

@@ -8007,8 +8007,9 @@
     12725,
     12726
   ],
-  "mysterious emblem": [
+  "archaic emblem": [
     12746,
+    12747,
     12748,
     12749,
     12750,
@@ -8017,7 +8018,8 @@
     12753,
     12754,
     12755,
-    12756
+    12756,
+    23487
   ],
   "rune pouch": [
     12791,
@@ -9596,5 +9598,12 @@
   "vs shield": [
     24265,
     24266
+  ],
+  "mysterious emblem": [
+    24277,
+    24279,
+    24281,
+    24283,
+    24285
   ]
 }