diff --git a/runelite-api/src/main/java/net/runelite/api/vars/AccountType.java b/runelite-api/src/main/java/net/runelite/api/vars/AccountType.java index 63c5e953f7..a25a52ed82 100644 --- a/runelite-api/src/main/java/net/runelite/api/vars/AccountType.java +++ b/runelite-api/src/main/java/net/runelite/api/vars/AccountType.java @@ -44,16 +44,33 @@ public enum AccountType /** * Hardcore ironman account type. */ - HARDCORE_IRONMAN; + HARDCORE_IRONMAN, + /** + * Group ironman account type + */ + GROUP_IRONMAN, + /** + * Hardcore group ironman account type + */ + HARDCORE_GROUP_IRONMAN; /** - * Checks whether this type is an ironman. + * Checks whether this type is a non-group ironman. * - * @return {@code true} if the type is any of the ironman types. + * @return {@code true} if the type is any of the non-group ironman types. */ public boolean isIronman() { return this.ordinal() >= IRONMAN.ordinal() && this.ordinal() <= HARDCORE_IRONMAN.ordinal(); } + /** + * Checks whether this type is a group ironman. + * + * @return {@code true} if the type is either of the group ironman types. + */ + public boolean isGroupIronman() + { + return this.ordinal() >= GROUP_IRONMAN.ordinal() && this.ordinal() <= HARDCORE_GROUP_IRONMAN.ordinal(); + } } 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 62c5052bd0..d55fe7104d 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 @@ -292,6 +292,7 @@ public final class WidgetID static final int ITEM_COUNT_TOP = 5; static final int ITEM_COUNT_BAR = 6; static final int ITEM_COUNT_BOTTOM = 7; + static final int GROUP_STORAGE_BUTTON = 8; static final int CONTENT_CONTAINER = 10; static final int TAB_CONTAINER = 11; static final int ITEM_CONTAINER = 13; 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 e9e05c8a10..d01292d944 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 @@ -147,6 +147,7 @@ public enum WidgetInfo BANK_ITEM_COUNT_TOP(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_TOP), BANK_ITEM_COUNT_BAR(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BAR), BANK_ITEM_COUNT_BOTTOM(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BOTTOM), + BANK_GROUP_STORAGE_BUTTON(WidgetID.BANK_GROUP_ID, WidgetID.Bank.GROUP_STORAGE_BUTTON), BANK_SCROLLBAR(WidgetID.BANK_GROUP_ID, WidgetID.Bank.SCROLLBAR), BANK_PIN_CONTAINER(WidgetID.BANK_PIN_GROUP_ID, WidgetID.BankPin.CONTAINER), BANK_SETTINGS_BUTTON(WidgetID.BANK_GROUP_ID, WidgetID.Bank.SETTINGS_BUTTON), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index 9973c4ce19..0342ef45e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -252,6 +252,13 @@ public class TabInterface equipmentButton.setOriginalY(4); equipmentButton.revalidate(); + Widget bankItemCountTop = client.getWidget(WidgetInfo.BANK_ITEM_COUNT_TOP); + if (bankItemCountTop == null) + { + return; + } + + int equipmentButtonTotalWidth = equipmentButton.getWidth() + equipmentButton.getOriginalX() - bankItemCountTop.getOriginalX(); // the bank item count is 3 widgets for (int child = WidgetInfo.BANK_ITEM_COUNT_TOP.getChildId(); child <= WidgetInfo.BANK_ITEM_COUNT_BOTTOM.getChildId(); child++) { @@ -261,13 +268,22 @@ public class TabInterface return; } - widget.setOriginalX(widget.getOriginalX() + equipmentButton.getWidth()); + widget.setOriginalX(widget.getOriginalX() + equipmentButtonTotalWidth); widget.revalidate(); } titleBar.setOriginalX(equipmentButton.getWidth() / 2); titleBar.setOriginalWidth(titleBar.getWidth() - equipmentButton.getWidth()); titleBar.revalidate(); + + Widget groupStorageButton = client.getWidget(WidgetInfo.BANK_GROUP_STORAGE_BUTTON); + if (groupStorageButton == null) + { + return; + } + + groupStorageButton.setOriginalX(groupStorageButton.getOriginalX() + equipmentButtonTotalWidth); + groupStorageButton.revalidate(); } private void handleDeposit(MenuOptionClicked event, Boolean inventory) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/Pet.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/Pet.java index b48a810ec5..9c84c17fda 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/Pet.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/Pet.java @@ -67,7 +67,7 @@ enum Pet HERON("Heron", ItemID.HERON), ROCK_GOLEM("Rock golem", ItemID.ROCK_GOLEM), BEAVER("Beaver", ItemID.BEAVER), - BABY_CHINCHOMPA("Baby chinchompa", ItemID.BABY_CHINCHOMPA), + BABY_CHINCHOMPA("Baby chinchompa", ItemID.BABY_CHINCHOMPA_13324), GIANT_SQUIRREL("Giant squirrel", ItemID.GIANT_SQUIRREL), TANGLEROOT("Tangleroot", ItemID.TANGLEROOT), ROCKY("Rocky", ItemID.ROCKY), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FarmingAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FarmingAction.java index 6f17dcceb3..4ff301338e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FarmingAction.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FarmingAction.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.skillcalculator.skills; import lombok.AllArgsConstructor; import lombok.Getter; import net.runelite.api.ItemID; +import net.runelite.api.NullItemID; @AllArgsConstructor @Getter @@ -82,7 +83,7 @@ public enum FarmingAction implements NamedSkillAction YEW_TREE("Yew Tree", 60, 7150.9f, ItemID.YEW_LOGS), SNAPE_GRASS("Snape grass", 61, 82, ItemID.SNAPE_GRASS), SNAPDRAGON("Snapdragon", 62, 87.5f, ItemID.SNAPDRAGON), - HESPORI("Hespori", 65, 12662, ItemID.CLAN_WARS_CAPE_12662), + HESPORI("Hespori", 65, 12662, NullItemID.NULL_23044), CADANTINE("Cadantine", 67, 106.5f, ItemID.CADANTINE), PALM_TREE("Palm Tree", 68, 10260.6f, ItemID.COCONUT), CALQUAT_TREE("Calquat Tree", 72, 12225.5f, ItemID.CALQUAT_FRUIT), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HunterAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HunterAction.java index 644bcd2598..0c4b0dde15 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HunterAction.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HunterAction.java @@ -69,7 +69,7 @@ public enum HunterAction implements NamedSkillAction MAHOGANY_BIRD_HOUSE("Mahogany Bird House", 49, 960, ItemID.MAHOGANY_BIRD_HOUSE), ECLECTIC_IMPLING("Eclectic Impling", 50, 32, ItemID.ECLECTIC_IMPLING_JAR), SABRE_TOOTHED_KEBBIT("Sabre-toothed Kebbit", 51, 200, ItemID.KEBBIT_9959), - CHINCHOMPA("Chinchompa", 53, 198.3f, ItemID.CHINCHOMPA), + CHINCHOMPA("Chinchompa", 53, 198.4f, ItemID.CHINCHOMPA), SABRE_TOOTHED_KYATT("Sabre-toothed Kyatt", 55, 300, ItemID.KYATT_HAT), DARK_KEBBIT("Dark Kebbit", 57, 132, ItemID.KEBBIT_9963), NATURE_IMPLING("Nature Impling", 58, 34, ItemID.NATURE_IMPLING_JAR), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SmithingAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SmithingAction.java index f4211febb9..a581839c4c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SmithingAction.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SmithingAction.java @@ -32,7 +32,7 @@ import net.runelite.api.ItemID; @Getter public enum SmithingAction implements ItemSkillAction { - BRONZE_BAR(ItemID.BRONZE_BAR, 1, 6.3f), + BRONZE_BAR(ItemID.BRONZE_BAR, 1, 6.2f), BRONZE_AXE(ItemID.BRONZE_AXE, 1, 12.5f), BRONZE_DAGGER(ItemID.BRONZE_DAGGER, 1, 12.5f), BRONZE_MACE(ItemID.BRONZE_MACE, 2, 12.5f), diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_140px.png b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_140px.png index 1d34ec8318..62fe26d9a0 100644 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_140px.png and b/runelite-client/src/main/resources/net/runelite/client/plugins/interfacestyles/2010/healthbar/default_front_140px.png differ