ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2021-10-13 11:57:45 +02:00
parent c79df8251e f63fd7c486
commit b4a03f190c
9 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
View File

@@ -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)

2
runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/Pet.java
View File

@@ -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),

3
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/FarmingAction.java
View File

@@ -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),

2
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/HunterAction.java
View File

@@ -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),

2
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SmithingAction.java
View File

@@ -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),