Merge remote-tracking branch 'runelite/master'
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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),
|
||||
|
||||
Reference in New Issue
Block a user