Merge pull request runelite#8275 from Abextm/cache-code-2019-03-21-re…

…v178 Cache code 2019 03 21 rev178
Owain94 · Mar 21, 2019 · 0f5dc65 · 0f5dc65
2 parents 4ccefd2 + 9d29888
commit 0f5dc65
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 29 deletions.
diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java
@@ -10648,5 +10648,6 @@ public final class ItemID
 	public static final int MYSTIC_SET_BLUE = 23113;
 	public static final int MYSTIC_SET_DARK = 23116;
 	public static final int MYSTIC_SET_DUSK = 23119;
+	public static final int OILY_PEARL_FISHING_ROD = 23122;
 	/* This file is automatically generated. Do not edit. */
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java
@@ -6217,6 +6217,7 @@ public final class NpcID
 	public static final int MAZE_GUARDIAN_6779 = 6779;
 	public static final int PILIAR = 6780;
 	public static final int SHAYDA = 6781;
+	public static final int FISHING_SPOT_6784 = 6784;
 	public static final int HOSA = 6785;
 	public static final int HELLRAT_BEHEMOTH = 6793;
 	public static final int MONKEY_ARCHER_6794 = 6794;

diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java
@@ -12287,5 +12287,6 @@ public final class NullItemID
 	public static final int NULL_23118 = 23118;
 	public static final int NULL_23120 = 23120;
 	public static final int NULL_23121 = 23121;
+	public static final int NULL_23123 = 23123;
 	/* This file is automatically generated. Do not edit. */
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java
@@ -1184,6 +1184,7 @@ public final class NullObjectID
 	public static final int NULL_2566 = 2566;
 	public static final int NULL_2567 = 2567;
 	public static final int NULL_2568 = 2568;
+	public static final int NULL_2630 = 2630;
 	public static final int NULL_2637 = 2637;
 	public static final int NULL_2638 = 2638;
 	public static final int NULL_2639 = 2639;
@@ -6204,6 +6205,7 @@ public final class NullObjectID
 	public static final int NULL_14425 = 14425;
 	public static final int NULL_14426 = 14426;
 	public static final int NULL_14427 = 14427;
+	public static final int NULL_14428 = 14428;
 	public static final int NULL_14429 = 14429;
 	public static final int NULL_14430 = 14430;
 	public static final int NULL_14432 = 14432;
@@ -12311,6 +12313,8 @@ public final class NullObjectID
 	public static final int NULL_26195 = 26195;
 	public static final int NULL_26196 = 26196;
 	public static final int NULL_26197 = 26197;
+	public static final int NULL_26200 = 26200;
+	public static final int NULL_26204 = 26204;
 	public static final int NULL_26208 = 26208;
 	public static final int NULL_26209 = 26209;
 	public static final int NULL_26245 = 26245;

diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java
@@ -1452,7 +1452,6 @@ public final class ObjectID
 	public static final int DOOR_2627 = 2627;
 	public static final int DOOR_2628 = 2628;
 	public static final int WALL_2629 = 2629;
-	public static final int FISHING_SPOT_2630 = 2630;
 	public static final int DOOR_2631 = 2631;
 	public static final int CHEST_2632 = 2632;
 	public static final int CHEST_2633 = 2633;
@@ -8227,7 +8226,6 @@ public final class ObjectID
 	public static final int MYSTERIOUS_RUINS_14413 = 14413;
 	public static final int MYSTERIOUS_RUINS_14414 = 14414;
 	public static final int STUDY_DESK_14415 = 14415;
-	public static final int FISHING_SPOT_14428 = 14428;
 	public static final int RIFT_14431 = 14431;
 	public static final int GAS_BUBBLE = 14434;
 	public static final int CAVE_ENTRANCE_14436 = 14436;
@@ -13895,6 +13893,7 @@ public final class ObjectID
 	public static final int TABLE_26201 = 26201;
 	public static final int TABLE_26202 = 26202;
 	public static final int TABLE_26203 = 26203;
+	public static final int DOOR_26205 = 26205;
 	public static final int LARGE_DOOR_26207 = 26207;
 	public static final int WOODEN_BENCH_26210 = 26210;
 	public static final int OAK_BENCH_26211 = 26211;

diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
@@ -717,16 +717,11 @@ static class ArceuusSpellBook
 
 	static class Pvp
 	{
-		static final int BOUNTY_HUNTER_INFO = 6;
-		static final int KILLDEATH_RATIO = 9;
-		static final int BOUNTY_HUNTER_STATS = 28;
-		static final int PVP_WIDGET_CONTAINER = 54;
-		static final int SKULL_CONTAINER = 55;
-		static final int SKULL = 56;
-		static final int SAFE_ZONE = 57;
-		static final int ATTACK_RANGE = 59;
-		static final int WILDERNESS_LEVEL = 60; // this can also be the Deadman Mode "Protection" text
-		static final int DEADMAN_PROTECTION_TIME = 61;
+		static final int BOUNTY_HUNTER_INFO = 19;
+		static final int KILLDEATH_RATIO = 15;
+		static final int SKULL_CONTAINER = 62;
+		static final int SAFE_ZONE = 64;
+		static final int WILDERNESS_LEVEL = 67; // this can also be the Deadman Mode "Protection" text
 	}
 
 	static class KourendFavour

diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
@@ -444,20 +444,13 @@ public enum WidgetInfo
 	SPELL_LUNAR_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.LunarSpellBook.LUNAR_HOME_TELEPORT),
 	SPELL_ARCEUUS_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.ArceuusSpellBook.ARCEUUS_HOME_TELEPORT),
 
-	PVP_CONTAINER(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.PVP_WIDGET_CONTAINER),
 	PVP_SKULL_CONTAINER(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.SKULL_CONTAINER),
-	PVP_SKULL(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.SKULL),
+	PVP_WORLD_SAFE_ZONE(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.SAFE_ZONE),
+
 	PVP_WILDERNESS_LEVEL(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.WILDERNESS_LEVEL),
 	PVP_BOUNTY_HUNTER_INFO(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.BOUNTY_HUNTER_INFO),
-	PVP_BOUNTY_HUNTER_STATS(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.BOUNTY_HUNTER_STATS),
 	PVP_KILLDEATH_COUNTER(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.KILLDEATH_RATIO),
 
-	PVP_WORLD_SAFE_ZONE(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.SAFE_ZONE),
-	PVP_WORLD_ATTACK_RANGE(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.ATTACK_RANGE),
-
-	DEADMAN_PROTECTION_TEXT(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.WILDERNESS_LEVEL),
-	DEADMAN_PROTECTION_TIME(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.DEADMAN_PROTECTION_TIME),
-
 	KOUREND_FAVOUR_OVERLAY(WidgetID.KOUREND_FAVOUR_GROUP_ID, WidgetID.KourendFavour.KOUREND_FAVOUR_OVERLAY),
 	ZEAH_MESS_HALL_COOKING_DISPLAY(WidgetID.ZEAH_MESS_HALL_GROUP_ID, WidgetID.Zeah.MESS_HALL_COOKING_DISPLAY),
 

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
@@ -59,6 +59,7 @@
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.api.events.WidgetHiddenChanged;
 import net.runelite.api.widgets.Widget;
+import net.runelite.api.widgets.WidgetID;
 import net.runelite.api.widgets.WidgetInfo;
 import static net.runelite.api.widgets.WidgetInfo.PVP_WORLD_SAFE_ZONE;
 import net.runelite.client.config.ConfigManager;
@@ -217,7 +218,7 @@ public void onWidgetHiddenChanged(WidgetHiddenChanged event)
 	{
 		Widget widget = event.getWidget();
 		if (WorldType.isPvpWorld(client.getWorldType())
-			&& WidgetInfo.TO_GROUP(widget.getId()) == WidgetInfo.PVP_CONTAINER.getGroupId())
+			&& WidgetInfo.TO_GROUP(widget.getId()) == WidgetID.PVP_GROUP_ID)
 		{
 			widgetHiddenChangedOnPvpWorld = true;
 		}

diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.hash b/runelite-client/src/main/scripts/ChatSplitBuilder.hash
@@ -1 +1 @@
-008FA4B7983DF14899909AF361AD2DE955DE552E78FAF8C6604E848D1776B4F0
+5BCAA21926CF079794AAF3DA80E512297DD6F8353741929302FE6490D17DDF8C
diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
@@ -43,7 +43,7 @@ LABEL24:
    istore                 2
 LABEL36:
    get_varc_int           41
-   iconst                 -1
+   iconst                 1337
    if_icmpeq              LABEL40
    jump                   LABEL49
 LABEL40:
@@ -315,7 +315,7 @@ LABEL282:
    jump                   LABEL479
 LABEL290:
    get_varc_int           41
-   iconst                 -1
+   iconst                 1337
    if_icmpne              LABEL297
    get_varbit             4089
    iconst                 0
@@ -360,8 +360,8 @@ CHAT_FILTER:
    iconst                 1                 ; Gets changed to 0 if message is blocked
    iload                  15                ; Load the messageType
    sconst                 "chatFilterCheck"
-   runelite_callback
-   pop_int                                  ; Pop the messageType
+   runelite_callback     
+   pop_int               ; Pop the messageType
    iconst                 1                 ; 2nd half of conditional
    sstore                 0                 ; Override the message with our filtered message
    if_icmpeq              LABEL327          ; Check if we are building this message

diff --git a/runelite-client/src/main/scripts/ResetChatboxInput.hash b/runelite-client/src/main/scripts/ResetChatboxInput.hash
@@ -1 +1 @@
-9D609388EF5AADA2ECA24164199191CF2A7C0098C19F798CCCAE4F6CCF73A041
+E8B1910003198AB024BADC89831AF1735A2C77256C23551212105F25439E022D
diff --git a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm b/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm
@@ -163,7 +163,7 @@ LABEL40:
    iconst                 10616880
    if_setonclick         
    get_varc_int           41
-   iconst                 -1
+   iconst                 1337
    if_icmpeq              LABEL154
    jump                   LABEL156
 LABEL154:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		008FA4B7983DF14899909AF361AD2DE955DE552E78FAF8C6604E848D1776B4F0
		5BCAA21926CF079794AAF3DA80E512297DD6F8353741929302FE6490D17DDF8C
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		9D609388EF5AADA2ECA24164199191CF2A7C0098C19F798CCCAE4F6CCF73A041
		E8B1910003198AB024BADC89831AF1735A2C77256C23551212105F25439E022D