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-08-05 00:10:59 +02:00
parent d8a1f3bbe2 912a68effa
commit c910bbb0ad
55 changed files with 997 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
runelite-api/src/main/java/net/runelite/api/Client.java
View File

@@ -672,6 +672,34 @@ public interface Client extends GameEngine
*/
boolean isMenuOpen();
/**
* Get the menu x location. Only valid if the menu is open.
*
* @return the menu x location
*/
int getMenuX();
/**
* Get the menu y location. Only valid if the menu is open.
*
* @return the menu y location
*/
int getMenuY();
/**
* Get the menu height. Only valid if the menu is open.
*
* @return the menu height
*/
int getMenuHeight();
/**
* Get the menu width. Only valid if the menu is open.
*
* @return the menu width
*/
int getMenuWidth();
/**
* Gets the angle of the map, or target camera yaw.
*

32
runelite-api/src/main/java/net/runelite/api/MenuEntry.java
View File

@@ -57,11 +57,11 @@ public class MenuEntry implements Cloneable
/**
* An additional parameter for the action.
*/
private int actionParam;
private int param0;
/**
* A second additional parameter for the action.
*/
private int actionParam1;
private int param1;
/**
* If this field is true and you have single mouse button on and this entry is
* the top entry the right click menu will not be opened when you left click
@@ -70,14 +70,14 @@ public class MenuEntry implements Cloneable
*/
private boolean forceLeftClick;
public MenuEntry(String option, String target, int type, int opcode, int actionParam, int actionParam1, boolean forceLeftClick)
public MenuEntry(String option, String target, int type, int opcode, int param0, int param1, boolean forceLeftClick)
{
this.option = option;
this.target = target;
this.identifier = type;
this.opcode = opcode;
this.actionParam = actionParam;
this.actionParam1 = actionParam1;
this.param0 = param0;
this.param1 = param1;
this.forceLeftClick = forceLeftClick;
}
@@ -96,32 +96,42 @@ public class MenuEntry implements Cloneable
public void setActionParam0(int i)
{
this.actionParam = i;
this.param0 = i;
}
public int getActionParam0()
{
return this.actionParam;
return this.param0;
}
public int getParam0()
{
return this.actionParam;
return this.param0;
}
public void setParam0(int i)
{
this.actionParam = i;
this.param0 = i;
}
public void setParam1(int i)
{
this.actionParam1 = i;
this.param1 = i;
}
public int getParam1()
{
return this.actionParam1;
return this.param1;
}
public void setActionParam1(int i)
{
this.param1 = i;
}
public int getActionParam1()
{
return this.param1;
}
public void setType(int i)

42
runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java
View File

@@ -43,9 +43,13 @@ import net.runelite.api.MenuEntry;
public class MenuOptionClicked
{
/**
* The action parameter used in the click.
* Action parameter 0. Its value depends on the menuAction.
*/
private int actionParam;
private int param0;
/**
* Action parameter 1. Its value depends on the menuAction.
*/
private int param1;
/**
* The option text added to the menu.
*/
@@ -62,12 +66,6 @@ public class MenuOptionClicked
* The ID of the object, actor, or item that the interaction targets.
*/
private int id;
/**
* The ID of the widget where the menu was clicked.
*
* @see net.runelite.api.widgets.WidgetID
*/
private int widgetId;
/**
* The selected item index at the time of the option click.
*/
@@ -95,7 +93,31 @@ public class MenuOptionClicked
this.setMenuTarget(entry.getTarget());
this.setId(entry.getId());
this.setMenuAction(MenuAction.of(entry.getOpcode()));
this.setActionParam(entry.getActionParam());
this.setWidgetId(entry.getActionParam1());
this.setParam0(entry.getParam0());
this.setParam1(entry.getParam1());
}
@Deprecated
public int getActionParam()
{
return param0;
}
@Deprecated
public void setActionParam(int i)
{
param0 = i;
}
@Deprecated
public int getWidgetId()
{
return param1;
}
@Deprecated
public void setWidgetId(int i)
{
param1 = i;
}
}

106
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
View File

@@ -484,65 +484,65 @@ public class WidgetID
static final int RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX = 19;
static final int MULTICOMBAT_INDICATOR = 23;
static final int MINIMAP = 25;
static final int MINIMAP_DRAW_AREA = 33;
static final int MINIMAP_ORB_HOLDER = 36;
static final int FRIENDS_CHAT_TAB = 45;
static final int IGNORES_TAB = 46;
static final int FRIENDS_TAB = 47;
static final int LOGOUT_TAB = 48;
static final int OPTIONS_TAB = 49;
static final int EMOTES_TAB = 50;
static final int MUSIC_TAB = 51;
static final int FRIENDS_CHAT_ICON = 52;
static final int FRIENDS_ICON = 54;
static final int IGNORES_ICON = 53;
static final int LOGOUT_ICON = 55;
static final int OPTIONS_ICON = 56;
static final int EMOTES_ICON = 57;
static final int MUSIC_ICON = 58;
static final int COMBAT_TAB = 61;
static final int STATS_TAB = 62;
static final int QUESTS_TAB = 63;
static final int INVENTORY_TAB = 64;
static final int EQUIPMENT_TAB = 65;
static final int PRAYER_TAB = 66;
static final int MAGIC_TAB = 67;
static final int COMBAT_ICON = 68;
static final int STATS_ICON = 69;
static final int QUESTS_ICON = 70;
static final int INVENTORY_ICON = 71;
static final int EQUIPMENT_ICON = 72;
static final int PRAYER_ICON = 73;
static final int MAGIC_ICON = 74;
static final int INTERFACE_CONTAINER = 75;
static final int INVENTORY_CONTAINER = 81;
static final int MINIMAP_DRAW_AREA = 34;
static final int MINIMAP_ORB_HOLDER = 37;
static final int FRIENDS_CHAT_TAB = 46;
static final int IGNORES_TAB = 47;
static final int FRIENDS_TAB = 48;
static final int LOGOUT_TAB = 49;
static final int OPTIONS_TAB = 50;
static final int EMOTES_TAB = 51;
static final int MUSIC_TAB = 52;
static final int FRIENDS_CHAT_ICON = 53;
static final int FRIENDS_ICON = 55;
static final int IGNORES_ICON = 54;
static final int LOGOUT_ICON = 56;
static final int OPTIONS_ICON = 57;
static final int EMOTES_ICON = 58;
static final int MUSIC_ICON = 59;
static final int COMBAT_TAB = 62;
static final int STATS_TAB = 63;
static final int QUESTS_TAB = 64;
static final int INVENTORY_TAB = 65;
static final int EQUIPMENT_TAB = 66;
static final int PRAYER_TAB = 67;
static final int MAGIC_TAB = 68;
static final int COMBAT_ICON = 69;
static final int STATS_ICON = 70;
static final int QUESTS_ICON = 71;
static final int INVENTORY_ICON = 72;
static final int EQUIPMENT_ICON = 73;
static final int PRAYER_ICON = 74;
static final int MAGIC_ICON = 75;
static final int INTERFACE_CONTAINER = 76;
static final int INVENTORY_CONTAINER = 82;
}
static class ResizableViewportBottomLine
{
static final int RESIZABLE_VIEWPORT_BOTTOM_LINE = 19;
static final int MINIMAP = 25;
static final int MINIMAP_DRAW_AREA = 33;
static final int MINIMAP_ORB_HOLDER = 36;
static final int LOGOUT_BUTTON_OVERLAY = 37;
static final int MINIMAP_LOGOUT_BUTTON = 38;
static final int FC_ICON = 49;
static final int FRIEND_ICON = 51;
static final int SETTINGS_ICON = 52;
static final int EMOTE_ICON = 53;
static final int MUSIC_ICON = 54;
static final int INVENTORY_TAB = 61;
static final int PRAYER_TAB = 63;
static final int MAGIC_TAB = 64;
static final int CMB_ICON = 65;
static final int SKILLS_ICON = 66;
static final int QUESTS_ICON = 67;
static final int INVENTORY_ICON = 68;
static final int EQUIP_ICON = 69;
static final int PRAYER_ICON = 70;
static final int MAGIC_ICON = 71;
static final int INTERFACE_CONTAINER = 74;
static final int INVENTORY_CONTAINER = 80;
static final int MINIMAP_DRAW_AREA = 34;
static final int MINIMAP_ORB_HOLDER = 37;
static final int LOGOUT_BUTTON_OVERLAY = 38;
static final int MINIMAP_LOGOUT_BUTTON = 39;
static final int FC_ICON = 50;
static final int FRIEND_ICON = 52;
static final int SETTINGS_ICON = 53;
static final int EMOTE_ICON = 54;
static final int MUSIC_ICON = 55;
static final int INVENTORY_TAB = 62;
static final int PRAYER_TAB = 64;
static final int MAGIC_TAB = 65;
static final int CMB_ICON = 66;
static final int SKILLS_ICON = 67;
static final int QUESTS_ICON = 68;
static final int INVENTORY_ICON = 69;
static final int EQUIP_ICON = 70;
static final int PRAYER_ICON = 71;
static final int MAGIC_ICON = 72;
static final int INTERFACE_CONTAINER = 75;
static final int INVENTORY_CONTAINER = 81;
}
static class Chatbox