From 6536aba6ba9d5e9f6aa33a6437ce1a993b7f3382 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Fri, 8 Oct 2021 12:56:28 +0100 Subject: [PATCH 1/7] api: add group ironman account types --- .../net/runelite/api/vars/AccountType.java | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) 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(); + } } From b75add6a2d96380509303bef2f551a3ac967220c Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Mon, 11 Oct 2021 13:14:04 +0100 Subject: [PATCH 2/7] skill calculator: fix incorrect icon for Hespori --- .../client/plugins/skillcalculator/skills/FarmingAction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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), From 59a6c86b5f0d15f8f1c7d880673742d359325e4f Mon Sep 17 00:00:00 2001 From: Illya Myshakov Date: Sun, 10 Oct 2021 18:59:07 -0400 Subject: [PATCH 3/7] chat commands: fix incorrect pet chin ID --- .../main/java/net/runelite/client/plugins/chatcommands/Pet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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), From a4fec4f1fc51e38e0385f0af2b82445a6fa63ebe Mon Sep 17 00:00:00 2001 From: melkypie <5113962+melkypie@users.noreply.github.com> Date: Sat, 9 Oct 2021 22:42:20 +0300 Subject: [PATCH 4/7] banktags: fix bank equipment button and item count spacing --- .../client/plugins/banktags/tabs/TabInterface.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 523e215b1f..5e13bef90b 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,7 +268,7 @@ public class TabInterface return; } - widget.setOriginalX(widget.getOriginalX() + equipmentButton.getWidth()); + widget.setOriginalX(widget.getOriginalX() + equipmentButtonTotalWidth); widget.revalidate(); } From 771de7f4319d3f850cbe91217e0a6a88cfb0598d Mon Sep 17 00:00:00 2001 From: melkypie <5113962+melkypie@users.noreply.github.com> Date: Sat, 9 Oct 2021 22:45:54 +0300 Subject: [PATCH 5/7] banktags: fix group storage button location --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 1 + .../main/java/net/runelite/api/widgets/WidgetInfo.java | 1 + .../client/plugins/banktags/tabs/TabInterface.java | 9 +++++++++ 3 files changed, 11 insertions(+) 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 73e326dbf7..40bb2be0ad 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 @@ -278,6 +278,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 513d9e345a..3dcfb9d5d4 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 5e13bef90b..7d8736a41e 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 @@ -275,6 +275,15 @@ public class TabInterface 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) From 05b05b55e77824c4a3ebbe7610a8ca9b53b50018 Mon Sep 17 00:00:00 2001 From: Kerzyte <1848038+kerzyte@users.noreply.github.com> Date: Tue, 12 Oct 2021 02:56:49 -0700 Subject: [PATCH 6/7] skill calculator: minor xp corrections --- .../client/plugins/skillcalculator/skills/HunterAction.java | 2 +- .../client/plugins/skillcalculator/skills/SmithingAction.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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), From ce4cbcef8250a5a7e812c3ee049754d1c6c07a74 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Tue, 12 Oct 2021 18:56:07 +0100 Subject: [PATCH 7/7] interface styles: fix incorrectly sized 140px healthbar --- .../2010/healthbar/default_front_140px.png | Bin 842 -> 802 bytes 1 file changed, 0 insertions(+), 0 deletions(-) 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 1d34ec83181efcdb4a5cfb92a03a9f62bb7e44b0..62fe26d9a06164febe3c2b398dedc43346389c32 100644 GIT binary patch delta 793 zcmV+!1Lpk72BHRkiBL{Q4GJ0x0000DNk~Le0001t000072nGNE0NS^uB>(^cZ)rnA zP-$ah001bFb&=021YsD*Kf8$5Y7+;^VGm0Vt3=6>b#U3FwaVf$GiG+x?3iYDlU$XH z!y?B@gwx9< zSMi2$yHU^)3MYzo+4w$> zx=GY@rl+KTcFOF+C&M@?;^>rF#HK`_R7W!V+t>f)n_x*ihWuSt@Whd)Al{^?W$9{4 zwL~}NvsqEO|IX951_!F$qbX>(4}#}zXxxO4N)Wv72f@by)ZM|UQ}ZuLPQ$OFS87^f z7h-F0d{)!+EjU?+j$2prv@fYnX4tae=?GeK&~^zQk-2JC-|HOSKz3E0=mNHPphxz{ z=05>NBxov0+Evt(oB7}ujsnvX8p-ae}FdjSl~syPFXlcF2tz&URcQVom~ zl0_JK_S#-h42SC(Am9<=@i?IMtL8&i;b1%efD@+ile5^^d>a#cuU3{Q-HA#ZGsZ6ASaueQ^nI8+9;mZTA0*1(Zi zt&ru*A000072nGNE0FTy2djJ3dZ)rnA zP-$ah001bFb&)$u13?spKNBV5gA`h*Cqo%KM=MEwnZ85<-p-(P5!!Aap=r6CRb`#i2Z(RT6Wzf60Sw6g z;K~p1#ApM;Jf-E6oBOv8{3|dWwrP&Zh)`D z_1{I-pW4^By>}~i!`FOl`r2?ARx)m&Zxdr=+$Jvum+_H^8{|2E5~Hy9+v-^g@am!Z zayke0_B~Jy#)`4VdW!RV7Lu#u`s_u(N!Mc2xjJqLUUZyZqpti7xt11xg+0Dj&+lts zR;q9XoE!jd39OcU5Fy0s1<(yhi{B?jV=!MzFIqU3pJD6%Byz^kJYD*Cy0J-7Y!!TN|C@BGy|x3`_Kjk9^bH^^V}8!sR{iskd@5j$Pr~F#CUK#WL)z zYPQs;M^Iw@e=~0+H!1ap;J6fBF20|;T7dN}xR&|ObUB+DY`k0WFUb4AHs)q)x&QzG M07*qoM6N<$f{(a{ivR!s