diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index ab3252792a..3624f65804 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -10821,5 +10821,21 @@ public final class ItemID public static final int HEALER_ICON_23486 = 23486; public static final int WINE_OF_ZAMORAK_23489 = 23489; public static final int LARRANS_KEY = 23490; + public static final int SRARACHA = 23495; + public static final int TEMPLE_COIN = 23497; + public static final int GRUBBY_KEY = 23499; + public static final int TEMPLE_KEY = 23502; + public static final int TOME_OF_THE_MOON = 23504; + public static final int TOME_OF_THE_SUN = 23506; + public static final int TOME_OF_THE_TEMPLE = 23508; + public static final int TATTERED_MOON_PAGE = 23510; + public static final int TATTERED_SUN_PAGE = 23512; + public static final int TATTERED_TEMPLE_PAGE = 23514; + public static final int LAMP_OF_KNOWLEDGE = 23516; + public static final int GIANT_EGG_SACFULL = 23517; + public static final int GIANT_EGG_SAC = 23520; + public static final int MASK_OF_RANUL = 23522; + public static final int JAR_OF_EYES = 23525; + public static final int SARACHNIS_CUDGEL = 23528; /* 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 index 1288a33ba7..e23906bb98 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -1992,9 +1992,9 @@ public final class NpcID public static final int CYCLOPS_2140 = 2140; public static final int CYCLOPS_2141 = 2141; public static final int CYCLOPS_2142 = 2142; - public static final int GIANT_FROG_2143 = 2143; - public static final int BIG_FROG_2144 = 2144; - public static final int FROG_2145 = 2145; + public static final int SRARACHA = 2143; + public static final int SRARACHA_2144 = 2144; + public static final int UNDEAD_DRUID = 2145; public static final int FISHING_SPOT_2146 = 2146; public static final int VEOS = 2147; public static final int GRAND_EXCHANGE_CLERK = 2148; @@ -7866,5 +7866,21 @@ public final class NpcID public static final int LEKE_QUO_KERAN = 8697; public static final int MONK_OF_ZAMORAK_8698 = 8698; public static final int LARRAN = 8699; + public static final int GIANT_FROG_8700 = 8700; + public static final int BIG_FROG_8701 = 8701; + public static final int FROG_8702 = 8702; + public static final int TEMPLE_SPIDER = 8703; + public static final int BROTHER_AIMERI = 8704; + public static final int BROTHER_AIMERI_8705 = 8705; + public static final int OLBERTUS = 8706; + public static final int OLBERTUS_8707 = 8707; + public static final int OLBERTUS_8708 = 8708; + public static final int SHAEDED_BEAST = 8709; + public static final int SHAEDED_BEAST_8710 = 8710; + public static final int EODAN = 8711; + public static final int KNIGHT_OF_VARLAMORE_8712 = 8712; + public static final int SARACHNIS = 8713; + public static final int SPAWN_OF_SARACHNIS = 8714; + public static final int SPAWN_OF_SARACHNIS_8715 = 8715; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index f31d40f26e..d2d9315362 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -12463,5 +12463,25 @@ public final class NullItemID public static final int NULL_23492 = 23492; public static final int NULL_23493 = 23493; public static final int NULL_23494 = 23494; + public static final int NULL_23496 = 23496; + public static final int NULL_23498 = 23498; + public static final int NULL_23500 = 23500; + public static final int NULL_23501 = 23501; + public static final int NULL_23503 = 23503; + public static final int NULL_23505 = 23505; + public static final int NULL_23507 = 23507; + public static final int NULL_23509 = 23509; + public static final int NULL_23511 = 23511; + public static final int NULL_23513 = 23513; + public static final int NULL_23515 = 23515; + public static final int NULL_23518 = 23518; + public static final int NULL_23519 = 23519; + public static final int NULL_23521 = 23521; + public static final int NULL_23523 = 23523; + public static final int NULL_23524 = 23524; + public static final int NULL_23526 = 23526; + public static final int NULL_23527 = 23527; + public static final int NULL_23529 = 23529; + public static final int NULL_23530 = 23530; /* 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 index 103bf0143c..1cd637ed47 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -16211,5 +16211,33 @@ public final class NullObjectID public static final int NULL_34825 = 34825; public static final int NULL_34831 = 34831; public static final int NULL_34832 = 34832; + public static final int NULL_34841 = 34841; + public static final int NULL_34869 = 34869; + public static final int NULL_34875 = 34875; + public static final int NULL_34876 = 34876; + public static final int NULL_34877 = 34877; + public static final int NULL_34878 = 34878; + public static final int NULL_34879 = 34879; + public static final int NULL_34880 = 34880; + public static final int NULL_34881 = 34881; + public static final int NULL_34882 = 34882; + public static final int NULL_34883 = 34883; + public static final int NULL_34884 = 34884; + public static final int NULL_34885 = 34885; + public static final int NULL_34886 = 34886; + public static final int NULL_34887 = 34887; + public static final int NULL_34888 = 34888; + public static final int NULL_34889 = 34889; + public static final int NULL_34890 = 34890; + public static final int NULL_34891 = 34891; + public static final int NULL_34892 = 34892; + public static final int NULL_34893 = 34893; + public static final int NULL_34894 = 34894; + public static final int NULL_34895 = 34895; + public static final int NULL_34900 = 34900; + public static final int NULL_34901 = 34901; + public static final int NULL_34902 = 34902; + public static final int NULL_34903 = 34903; + public static final int NULL_34904 = 34904; /* 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 9d5ee32bfb..248591ae09 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -15241,11 +15241,11 @@ public final class ObjectID public static final int ROCKS_28890 = 28890; public static final int CRACK_28892 = 28892; public static final int STONE_28893 = 28893; - public static final int ROPE_LADDER_28894 = 28894; - public static final int ROPE_28895 = 28895; - public static final int ROPE_28896 = 28896; - public static final int ROPE_28897 = 28897; - public static final int ROPE_28898 = 28898; + public static final int VINE_LADDER = 28894; + public static final int VINE_28895 = 28895; + public static final int VINE_28896 = 28896; + public static final int VINE_28897 = 28897; + public static final int VINE_28898 = 28898; public static final int ALTAR_28900 = 28900; public static final int BOULDER_28901 = 28901; public static final int BOULDER_28904 = 28904; @@ -16846,7 +16846,7 @@ public final class ObjectID public static final int ROCK_31787 = 31787; public static final int ROCK_31788 = 31788; public static final int ROCK_31789 = 31789; - public static final int VINE_LADDER = 31790; + public static final int VINE_LADDER_31790 = 31790; public static final int HOLE_31791 = 31791; public static final int ROOTS_31792 = 31792; public static final int ROOT_31796 = 31796; @@ -18610,5 +18610,49 @@ public final class ObjectID public static final int LARRANS_SMALL_CHEST_34828 = 34828; public static final int LARRANS_BIG_CHEST = 34829; public static final int LARRANS_BIG_CHEST_34830 = 34830; + public static final int SARACHNIS_DISPLAY = 34833; + public static final int STRANGE_FLOOR_34834 = 34834; + public static final int ANCIENT_FIRE = 34835; + public static final int CURSED_ALTAR = 34836; + public static final int ALTAR_34837 = 34837; + public static final int GRUBBY_CHEST = 34838; + public static final int GRUBBY_CHEST_34839 = 34839; + public static final int GRUBBY_DOOR = 34840; + public static final int TEMPLE_DOOR_34842 = 34842; + public static final int TEMPLE_DOOR_34843 = 34843; + public static final int DOOR_34844 = 34844; + public static final int LEVER_34845 = 34845; + public static final int LEVER_34846 = 34846; + public static final int MUSTY_BOOKSHELF = 34847; + public static final int MUSTY_BOOKSHELF_34848 = 34848; + public static final int MUSTY_BOOKSHELF_34849 = 34849; + public static final int MUSTY_BOOKSHELF_34850 = 34850; + public static final int STONE_RELIEF = 34851; + public static final int STONE_RELIEF_34852 = 34852; + public static final int PASSAGE_34853 = 34853; + public static final int WALL_34854 = 34854; + public static final int SACRED_BONE_BURNER = 34855; + public static final int TORCH_34856 = 34856; + public static final int DRAGON_EGG_34857 = 34857; + public static final int THICK_WEB = 34858; + public static final int THICK_WEB_34859 = 34859; + public static final int STRANGE_PASSAGE = 34860; + public static final int STRANGE_WALL_34861 = 34861; + public static final int LADDER_34862 = 34862; + public static final int LADDER_34863 = 34863; + public static final int STAIRCASE_34864 = 34864; + public static final int STAIRCASE_34865 = 34865; + public static final int CAULDRON_34866 = 34866; + public static final int EGG_SAC = 34867; + public static final int EMPTY_SAC = 34868; + public static final int STONE_PILE_34870 = 34870; + public static final int STONE_PILE_34871 = 34871; + public static final int BROKEN_SUN_ALTAR = 34872; + public static final int EMPTY_SARCOPHAGUS = 34873; + public static final int FLOOR_TILE = 34874; + public static final int BLOOD_34896 = 34896; + public static final int WEB_34897 = 34897; + public static final int WEB_34898 = 34898; + public static final int SLASHED_WEB_34899 = 34899; /* This file is automatically generated. Do not edit. */ } 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 c15e2c285e..f0f016b5fe 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 @@ -254,6 +254,7 @@ public class WidgetID static final int INVENTORY_ITEM_CONTAINER = 3; static final int BANK_TITLE_BAR = 4; static final int CONTENT_CONTAINER = 10; + static final int TAB_CONTAINER = 11; static final int ITEM_CONTAINER = 13; static final int SEARCH_BUTTON_BACKGROUND = 40; static final int DEPOSIT_INVENTORY = 42; 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 99fa691985..c8c0ff88a6 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 @@ -140,6 +140,7 @@ public enum WidgetInfo BANK_CONTENT_CONTAINER(WidgetID.BANK_GROUP_ID, WidgetID.Bank.CONTENT_CONTAINER), BANK_DEPOSIT_EQUIPMENT(WidgetID.BANK_GROUP_ID, WidgetID.Bank.DEPOSIT_EQUIPMENT), BANK_DEPOSIT_INVENTORY(WidgetID.BANK_GROUP_ID, WidgetID.Bank.DEPOSIT_INVENTORY), + BANK_TAB_CONTAINER(WidgetID.BANK_GROUP_ID, WidgetID.Bank.TAB_CONTAINER), GRAND_EXCHANGE_WINDOW_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.WINDOW_CONTAINER), GRAND_EXCHANGE_OFFER_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_CONTAINER), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java index a00c7391b2..d9e97c441a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java @@ -97,12 +97,14 @@ public class ChatFilterPlugin extends Plugin { updateConfig(); updateFilteredPatterns(); + client.refreshChat(); } @Override protected void shutDown() throws Exception { filteredPatterns.clear(); + client.refreshChat(); } @Subscribe @@ -255,6 +257,9 @@ public class ChatFilterPlugin extends Plugin updateConfig(); updateFilteredPatterns(); + + //Refresh chat after config change to reflect current rules + client.refreshChat(); } private void updateConfig() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java index aa363ecb10..11abc01fc9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java @@ -107,10 +107,11 @@ class PrayerBarOverlay extends Overlay final double t = plugin.getTickProgress(); final int halfBarWidth = (barWidth / 2) - HD_PRAYER_BAR_PADDING; - final int xOffset = (int) (-Math.cos(t) * halfBarWidth) + ((barWidth / 2) - halfBarWidth); + final int xOffset = (int) (-Math.cos(t) * halfBarWidth) + halfBarWidth; graphics.setColor(FLICK_HELP_COLOR); - graphics.fillRect(barX + xOffset + HD_PRAYER_BAR_PADDING, barY + HD_PRAYER_BAR_PADDING, 1, barHeight - HD_PRAYER_BAR_PADDING * 2); + // Padding is accounted for in the offset calculation + graphics.fillRect(barX + xOffset, barY + HD_PRAYER_BAR_PADDING, 1, barHeight - HD_PRAYER_BAR_PADDING * 2); } return new Dimension(barWidth, barHeight); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java index 3d8f1ab2e2..5e707064b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java @@ -43,6 +43,8 @@ import static net.runelite.api.widgets.WidgetID.GUIDE_PRICES_INVENTORY_GROUP_ID; import static net.runelite.api.widgets.WidgetID.INVENTORY_GROUP_ID; import static net.runelite.api.widgets.WidgetID.SEED_VAULT_INVENTORY_GROUP_ID; import static net.runelite.api.widgets.WidgetID.SHOP_INVENTORY_GROUP_ID; +import static net.runelite.api.widgets.WidgetInfo.BANK_CONTENT_CONTAINER; +import static net.runelite.api.widgets.WidgetInfo.BANK_TAB_CONTAINER; import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; import net.runelite.api.widgets.WidgetItem; @@ -73,8 +75,10 @@ public abstract class WidgetItemOverlay extends Overlay Widget widget = widgetItem.getWidget(); int interfaceGroup = TO_GROUP(widget.getId()); - // Don't draw if this widget isn't one of the allowed - if (!interfaceGroups.contains(interfaceGroup)) + // Don't draw if this widget isn't one of the allowed nor in tag tab/item tab + if (!interfaceGroups.contains(interfaceGroup) || + (interfaceGroup == BANK_GROUP_ID + && (widget.getParentId() == BANK_CONTENT_CONTAINER.getId() || widget.getParentId() == BANK_TAB_CONTAINER.getId()))) { continue; } diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 987169cb75..d5639ec663 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -9101,5 +9101,9 @@ 23321, 23324, 23327 + ], + "giant egg sac": [ + 23517, + 23520 ] } \ No newline at end of file