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

Updated DevTools for viewing widget components

Browse Source
This commit is contained in:
Kronos
2017-05-13 06:57:06 +10:00
committed by Adam
parent 5596462b01
commit c04e896ff4
7 changed files with 226 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
runelite-api/src/main/java/net/runelite/api/widgets/Widget.java
View File

@@ -152,6 +152,9 @@ public class Widget
{
x += cur.getRelativeX();
y += cur.getRelativeY();
x -= cur.widget.getScrollX();
y -= cur.widget.getScrollY();
}
// cur is now the root
@@ -196,6 +199,30 @@ public class Widget
}
public Collection<WidgetItem> getWidgetItems()
{
int[] itemIds = widget.getItemIds();
if (itemIds == null)
{
return null;
}
List<WidgetItem> items = new ArrayList<>(itemIds.length);
for (int i = 0; i < itemIds.length; ++i)
{
WidgetItem item = getWidgetItem(i);
if (item != null)
{
items.add(item);
}
}
return items;
}
public WidgetItem getWidgetItem(int index)
{
int[] itemIds = widget.getItemIds();
int[] itemQuantities = widget.getItemQuantities();
@@ -205,43 +232,26 @@ public class Widget
return null;
}
List<WidgetItem> items = new ArrayList<>(itemIds.length);
assert itemIds.length == itemQuantities.length;
int columns = getWidth(); // the number of item slot columns is stored here
int paddingX = getPaddingX();
int paddingY = getPaddingY();
int itemId = itemIds[index];
int itemQuantity = itemQuantities[index];
Point widgetCanvasLocation = getCanvasLocation();
for (int i = 0; i < itemIds.length; ++i)
if (itemId <= 0 || itemQuantity <= 0 || columns <= 0)
{
int itemId = itemIds[i];
int itemQuantity = itemQuantities[i];
if (itemId <= 0 || itemQuantity <= 0)
{
continue;
}
Rectangle bounds = null;
if (columns > 0)
{
int row = i / columns;
int col = i % columns;
int itemX = widgetCanvasLocation.getX() + ((ITEM_SLOT_SIZE + paddingX) * col);
int itemY = widgetCanvasLocation.getY() + ((ITEM_SLOT_SIZE + paddingY) * row);
bounds = new Rectangle(itemX - 1, itemY - 1, ITEM_SLOT_SIZE, ITEM_SLOT_SIZE);
}
WidgetItem item = new WidgetItem(itemId - 1, itemQuantity, i, bounds);
items.add(item);
return null;
}
return items;
int row = index / columns;
int col = index % columns;
int itemX = widgetCanvasLocation.getX() + ((ITEM_SLOT_SIZE + paddingX) * col);
int itemY = widgetCanvasLocation.getY() + ((ITEM_SLOT_SIZE + paddingY) * row);
Rectangle bounds = new Rectangle(itemX - 1, itemY - 1, ITEM_SLOT_SIZE, ITEM_SLOT_SIZE);
return new WidgetItem(itemId - 1, itemQuantity, index, bounds);
}
private int getPaddingX()
@@ -253,4 +263,45 @@ public class Widget
{
return widget.getPaddingY();
}
public Widget[] getChildren()
{
net.runelite.rs.api.Widget[] widgets = widget.getChildren();
if (widgets == null)
{
return null;
}
Widget[] children = new Widget[widgets.length];
for (int i = 0; i < widgets.length; ++i)
{
children[i] = getChild(i);
}
return children;
}
public Widget getChild(int index)
{
net.runelite.rs.api.Widget[] widgets = widget.getChildren();
if (widgets == null || widgets[index] == null)
{
return null;
}
return new Widget(client, widgets[index]);
}
public int getItemId()
{
return widget.getItemId();
}
public int getItemQuantity()
{
return widget.getItemQuantity();
}
}

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

@@ -26,10 +26,9 @@ package net.runelite.api.widgets;
class WidgetID
{
static final int BANK_GROUP_ID = 12;
static final int INVENTORY_GROUP_ID = 149;
static final int PESTRCONTROL_GROUP_ID = 408;
static final int CLAN_CHAT_GROUP_ID = 7;
static class PestControl
@@ -56,4 +55,9 @@ class WidgetID
static final int NAME = 3;
static final int OWNER = 5;
}
public static class Bank
{
static final int ITEM_CONTAINER = 12;
}
}

4
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
View File

@@ -43,7 +43,9 @@ public enum WidgetInfo
CLAN_CHAT_TITLE(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.TITLE),
CLAN_CHAT_NAME(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.NAME),
CLAN_CHAT_OWNER(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.OWNER);
CLAN_CHAT_OWNER(WidgetID.CLAN_CHAT_GROUP_ID, WidgetID.ClanChat.OWNER),
BANK_ITEM_CONTAINER(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_CONTAINER);
private final int groupId;
private final int childId;