Merge pull request #11415 from abextm/cache-code-2020-04-30-rev182

Cache code 2020 04 30 rev182

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

@@ -11451,12 +11451,21 @@ public final class ItemID
 	public static final int BLIGHTED_SUPER_RESTORE3 = 24601;
 	public static final int BLIGHTED_SUPER_RESTORE2 = 24603;
 	public static final int BLIGHTED_SUPER_RESTORE1 = 24605;
-	public static final int BLIGHTED_ICE_BARRAGE_SACK = 24607;
+	public static final int BLIGHTED_ANCIENT_ICE_SACK = 24607;
 	public static final int BLIGHTED_BIND_SACK = 24609;
 	public static final int BLIGHTED_SNARE_SACK = 24611;
 	public static final int BLIGHTED_ENTANGLE_SACK = 24613;
 	public static final int BLIGHTED_TELEBLOCK_SACK = 24615;
 	public static final int VESTAS_BLIGHTED_LONGSWORD = 24617;
 	public static final int VESTAS_LONGSWORD_INACTIVE = 24619;
+	public static final int BLIGHTED_VENGEANCE_SACK = 24621;
+	public static final int DIVINE_BATTLEMAGE_POTION4 = 24623;
+	public static final int DIVINE_BATTLEMAGE_POTION3 = 24626;
+	public static final int DIVINE_BATTLEMAGE_POTION2 = 24629;
+	public static final int DIVINE_BATTLEMAGE_POTION1 = 24632;
+	public static final int DIVINE_BASTION_POTION4 = 24635;
+	public static final int DIVINE_BASTION_POTION3 = 24638;
+	public static final int DIVINE_BASTION_POTION2 = 24641;
+	public static final int DIVINE_BASTION_POTION1 = 24644;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -12952,5 +12952,22 @@ public final class NullItemID
 	public static final int NULL_24616 = 24616;
 	public static final int NULL_24618 = 24618;
 	public static final int NULL_24620 = 24620;
+	public static final int NULL_24622 = 24622;
+	public static final int NULL_24624 = 24624;
+	public static final int NULL_24625 = 24625;
+	public static final int NULL_24627 = 24627;
+	public static final int NULL_24628 = 24628;
+	public static final int NULL_24630 = 24630;
+	public static final int NULL_24631 = 24631;
+	public static final int NULL_24633 = 24633;
+	public static final int NULL_24634 = 24634;
+	public static final int NULL_24636 = 24636;
+	public static final int NULL_24637 = 24637;
+	public static final int NULL_24639 = 24639;
+	public static final int NULL_24640 = 24640;
+	public static final int NULL_24642 = 24642;
+	public static final int NULL_24643 = 24643;
+	public static final int NULL_24645 = 24645;
+	public static final int NULL_24646 = 24646;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -13896,6 +13896,7 @@ public final class NullObjectID
 	public static final int NULL_29704 = 29704;
 	public static final int NULL_29709 = 29709;
 	public static final int NULL_29710 = 29710;
+	public static final int NULL_29712 = 29712;
 	public static final int NULL_29713 = 29713;
 	public static final int NULL_29714 = 29714;
 	public static final int NULL_29715 = 29715;
@@ -14123,6 +14124,7 @@ public final class NullObjectID
 	public static final int NULL_30144 = 30144;
 	public static final int NULL_30156 = 30156;
 	public static final int NULL_30159 = 30159;
+	public static final int NULL_30161 = 30161;
 	public static final int NULL_30171 = 30171;
 	public static final int NULL_30181 = 30181;
 	public static final int NULL_30182 = 30182;

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

@@ -15803,6 +15803,7 @@ public final class ObjectID
 	public static final int POOL_OF_NIGHTMARES = 29706;
 	public static final int POOL_OF_NIGHTMARES_29707 = 29707;
 	public static final int SCOREBOARD_29708 = 29708;
+	public static final int HAMMER_29711 = 29711;
 	public static final int NOTICEBOARD_29718 = 29718;
 	public static final int BALLISTA_29719 = 29719;
 	public static final int STAIRCASE_29720 = 29720;
@@ -16023,6 +16024,7 @@ public final class ObjectID
 	public static final int PAINTING_30155 = 30155;
 	public static final int FURNACE_30157 = 30157;
 	public static final int FURNACE_30158 = 30158;
+	public static final int RETURN_ORB = 30160;
 	public static final int CRACK_30169 = 30169;
 	public static final int ROOT_30170 = 30170;
 	public static final int PORTAL_30172 = 30172;

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

@@ -278,6 +278,6 @@ public final class ScriptID
 	/**
 	 * Called to update the PVP widget (wilderness level/protection)
 	 */
-	@ScriptArguments(integer = 3)
+	@ScriptArguments(integer = 1)
 	public static final int PVP_WIDGET_BUILDER = 388;
 }

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

@@ -9749,5 +9749,17 @@
     24601,
     24603,
     24605
+  ],
+  "divine battlemage potion": [
+    24623,
+    24626,
+    24629,
+    24632
+  ],
+  "divine bastion potion": [
+    24635,
+    24638,
+    24641,
+    24644
   ]
 }