From 8a5b00f5e5b9960b5d8e09a7e46c11f2eb8c4ae2 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 19 Jan 2021 11:58:07 -0700 Subject: [PATCH 1/2] Update Object IDs to 2021-1-20 --- .../main/java/net/runelite/api/NullObjectID.java | 10 ++++++++-- .../src/main/java/net/runelite/api/ObjectID.java | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index 1df3543f9f..950d22e579 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -19978,8 +19978,6 @@ public final class NullObjectID public static final int NULL_40730 = 40730; public static final int NULL_40740 = 40740; public static final int NULL_40743 = 40743; - public static final int NULL_40745 = 40745; - public static final int NULL_40746 = 40746; public static final int NULL_40747 = 40747; public static final int NULL_40748 = 40748; public static final int NULL_40749 = 40749; @@ -20090,5 +20088,13 @@ public final class NullObjectID public static final int NULL_41020 = 41020; public static final int NULL_41021 = 41021; public static final int NULL_41022 = 41022; + public static final int NULL_41191 = 41191; + public static final int NULL_41192 = 41192; + public static final int NULL_41193 = 41193; + public static final int NULL_41194 = 41194; + public static final int NULL_41195 = 41195; + public static final int NULL_41196 = 41196; + public static final int NULL_41197 = 41197; + public static final int NULL_41198 = 41198; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index 076045bc19..153313b119 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -20709,9 +20709,6 @@ public final class ObjectID public static final int EXPLOSIVE_POTION_TABLE_40467 = 40467; public static final int POTION_OF_POWER_TABLE_40468 = 40468; public static final int POTION_OF_POWER_TABLE_40469 = 40469; - public static final int BLUE_BARRIER_40470 = 40470; - public static final int RED_BARRIER_40471 = 40471; - public static final int BALANCE_PORTAL = 40472; public static final int BANK_CHEST_40473 = 40473; public static final int SOUL_WARS_PORTAL = 40474; public static final int SOUL_WARS_PORTAL_40475 = 40475; @@ -20753,6 +20750,8 @@ public final class ObjectID public static final int CHEST_40741 = 40741; public static final int LOCKED_CHEST_40742 = 40742; public static final int BARREL_40744 = 40744; + public static final int LADDER_40745 = 40745; + public static final int LADDER_40746 = 40746; public static final int TREE_40750 = 40750; public static final int TREE_STUMP_40751 = 40751; public static final int TREE_40752 = 40752; @@ -21079,5 +21078,15 @@ public final class ObjectID public static final int ORNATE_LEAGUE_STATUE = 41180; public static final int TRAILBLAZER_GLOBE = 41181; public static final int LEAGUE_ACCOMPLISHMENT_SCROLL = 41182; + public static final int ANCIENT_BRAZIER = 41183; + public static final int ANCIENT_BRAZIER_41184 = 41184; + public static final int ANCIENT_BRAZIER_41185 = 41185; + public static final int ANCIENT_BRAZIER_41186 = 41186; + public static final int ANCIENT_BRAZIER_41187 = 41187; + public static final int ANCIENT_BRAZIER_41188 = 41188; + public static final int ANCIENT_BRAZIER_41189 = 41189; + public static final int ANCIENT_BRAZIER_41190 = 41190; + public static final int BARRIER_41199 = 41199; + public static final int BARRIER_41200 = 41200; /* This file is automatically generated. Do not edit. */ } From 1bec513137495ad7f7ec8ca976fe51009cf263ca Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 19 Jan 2021 23:10:35 -0700 Subject: [PATCH 2/2] Update widget ids to 2021-1-20 --- .../net/runelite/api/widgets/WidgetID.java | 27 +++++++------------ .../net/runelite/api/widgets/WidgetInfo.java | 12 --------- .../client/plugins/barbarianassault/Role.java | 10 +++---- 3 files changed, 13 insertions(+), 36 deletions(-) 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 index 9440c5d979..00b0a517c4 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -605,30 +605,21 @@ public class WidgetID { static class ATK { - static final int CALL_TEXT = 8; - static final int TO_CALL_WIDGET = 9; - static final int TO_CALL = 10; - static final int ROLE_SPRITE = 11; - static final int ROLE = 12; + static final int ROLE_SPRITE = 12; + static final int ROLE = 13; } static class HLR { - static final int TEAMMATE1 = 18; - static final int TEAMMATE2 = 22; - static final int TEAMMATE3 = 26; - static final int TEAMMATE4 = 30; + static final int TEAMMATE1 = 19; + static final int TEAMMATE2 = 23; + static final int TEAMMATE3 = 27; + static final int TEAMMATE4 = 31; } - static final int CORRECT_STYLE = 3; - static final int CURRENT_WAVE_WIDGET = 4; - static final int CURRENT_WAVE = 5; - static final int CALL_WIDGET = 6; - static final int CALL_TEXT = 7; - static final int TO_CALL_WIDGET = 8; - static final int TO_CALL = 9; - static final int ROLE_SPRITE = 10; - static final int ROLE = 11; + static final int ROLE_SPRITE = 11; + static final int ROLE = 12; + static final int REWARD_TEXT = 57; } 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 index 1fb5a8b7aa..123a118843 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -371,9 +371,6 @@ public enum WidgetInfo CHATBOX_TAB_CLAN(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_CLAN), CHATBOX_TAB_TRADE(WidgetID.CHATBOX_GROUP_ID, WidgetID.Chatbox.TAB_TRADE), - BA_HEAL_WAVE_TEXT(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.CURRENT_WAVE), - BA_HEAL_CALL_TEXT(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.TO_CALL), - BA_HEAL_LISTEN_TEXT(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.CORRECT_STYLE), BA_HEAL_ROLE_TEXT(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.ROLE), BA_HEAL_ROLE_SPRITE(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.ROLE_SPRITE), @@ -382,21 +379,12 @@ public enum WidgetInfo BA_HEAL_TEAMMATE3(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.HLR.TEAMMATE3), BA_HEAL_TEAMMATE4(WidgetID.BA_HEALER_GROUP_ID, WidgetID.BarbarianAssault.HLR.TEAMMATE4), - BA_COLL_WAVE_TEXT(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.CURRENT_WAVE), - BA_COLL_CALL_TEXT(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.TO_CALL), - BA_COLL_LISTEN_TEXT(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.CORRECT_STYLE), BA_COLL_ROLE_TEXT(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.ROLE), BA_COLL_ROLE_SPRITE(WidgetID.BA_COLLECTOR_GROUP_ID, WidgetID.BarbarianAssault.ROLE_SPRITE), - BA_ATK_WAVE_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.CURRENT_WAVE), - BA_ATK_CALL_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.ATK.TO_CALL), - BA_ATK_LISTEN_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.CORRECT_STYLE), BA_ATK_ROLE_TEXT(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.ATK.ROLE), BA_ATK_ROLE_SPRITE(WidgetID.BA_ATTACKER_GROUP_ID, WidgetID.BarbarianAssault.ATK.ROLE_SPRITE), - BA_DEF_WAVE_TEXT(WidgetID.BA_DEFENDER_GROUP_ID, WidgetID.BarbarianAssault.CURRENT_WAVE), - BA_DEF_CALL_TEXT(WidgetID.BA_DEFENDER_GROUP_ID, WidgetID.BarbarianAssault.TO_CALL), - BA_DEF_LISTEN_TEXT(WidgetID.BA_DEFENDER_GROUP_ID, WidgetID.BarbarianAssault.CORRECT_STYLE), BA_DEF_ROLE_TEXT(WidgetID.BA_DEFENDER_GROUP_ID, WidgetID.BarbarianAssault.ROLE), BA_DEF_ROLE_SPRITE(WidgetID.BA_DEFENDER_GROUP_ID, WidgetID.BarbarianAssault.ROLE_SPRITE), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java index a8fd8b656c..609322eac5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Role.java @@ -32,13 +32,11 @@ import net.runelite.api.widgets.WidgetInfo; @Getter enum Role { - ATTACKER(WidgetInfo.BA_ATK_LISTEN_TEXT, WidgetInfo.BA_ATK_CALL_TEXT, WidgetInfo.BA_ATK_ROLE_TEXT, WidgetInfo.BA_ATK_ROLE_SPRITE), - DEFENDER(WidgetInfo.BA_DEF_LISTEN_TEXT, WidgetInfo.BA_DEF_CALL_TEXT, WidgetInfo.BA_DEF_ROLE_TEXT, WidgetInfo.BA_DEF_ROLE_SPRITE), - COLLECTOR(WidgetInfo.BA_COLL_LISTEN_TEXT, WidgetInfo.BA_COLL_CALL_TEXT, WidgetInfo.BA_COLL_ROLE_TEXT, WidgetInfo.BA_COLL_ROLE_SPRITE), - HEALER(WidgetInfo.BA_HEAL_LISTEN_TEXT, WidgetInfo.BA_HEAL_CALL_TEXT, WidgetInfo.BA_HEAL_ROLE_TEXT, WidgetInfo.BA_HEAL_ROLE_SPRITE); + ATTACKER(WidgetInfo.BA_ATK_ROLE_TEXT, WidgetInfo.BA_ATK_ROLE_SPRITE), + DEFENDER(WidgetInfo.BA_DEF_ROLE_TEXT, WidgetInfo.BA_DEF_ROLE_SPRITE), + COLLECTOR(WidgetInfo.BA_COLL_ROLE_TEXT, WidgetInfo.BA_COLL_ROLE_SPRITE), + HEALER(WidgetInfo.BA_HEAL_ROLE_TEXT, WidgetInfo.BA_HEAL_ROLE_SPRITE); - private final WidgetInfo listen; - private final WidgetInfo call; private final WidgetInfo roleText; private final WidgetInfo roleSprite;