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

project(queries): Remove inventory from the InventoryWidgetItemQuery, The inventory got reworked and doesn't use WidgetItems anymore -- queries are fucking stupid anyways so just don\t use them...

Browse Source
This commit is contained in:
Owain van Brakel
2022-04-20 20:16:27 +02:00
parent 3a9fdb263a
commit d7fe2f4948
1 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
runelite-api/src/main/java/net/runelite/api/queries/InventoryWidgetItemQuery.java
View File

@@ -45,8 +45,7 @@ public class InventoryWidgetItemQuery extends WidgetItemQuery
WidgetInfo.SHOP_INVENTORY_ITEMS_CONTAINER, WidgetInfo.SHOP_INVENTORY_ITEMS_CONTAINER,
WidgetInfo.GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER, WidgetInfo.GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER,
WidgetInfo.GUIDE_PRICES_INVENTORY_ITEMS_CONTAINER, WidgetInfo.GUIDE_PRICES_INVENTORY_ITEMS_CONTAINER,
WidgetInfo.EQUIPMENT_INVENTORY_ITEMS_CONTAINER, WidgetInfo.EQUIPMENT_INVENTORY_ITEMS_CONTAINER
WidgetInfo.INVENTORY
}; };
@Override @Override
@@ -69,36 +68,29 @@ public class InventoryWidgetItemQuery extends WidgetItemQuery
{ {
continue; continue;
} }
if (widgetInfo == WidgetInfo.INVENTORY)
{
widgetItems.addAll(inventory.getWidgetItems());
break;
}
else
{
Widget[] children = inventory.getDynamicChildren();
for (int i = 0; i < children.length; i++)
{
Widget child = children[i];
boolean isDragged = child.isWidgetItemDragged(child.getItemId());
int dragOffsetX = 0;
int dragOffsetY = 0;
if (isDragged) Widget[] children = inventory.getDynamicChildren();
{ for (int i = 0; i < children.length; i++)
Point p = child.getWidgetItemDragOffsets(); {
dragOffsetX = p.getX(); Widget child = children[i];
dragOffsetY = p.getY(); boolean isDragged = child.isWidgetItemDragged(child.getItemId());
} int dragOffsetX = 0;
// set bounds to same size as default inventory int dragOffsetY = 0;
Rectangle bounds = child.getBounds();
bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32); if (isDragged)
Rectangle dragBounds = child.getBounds(); {
dragBounds.setBounds(bounds.x + dragOffsetX, bounds.y + dragOffsetY, 32, 32); Point p = child.getWidgetItemDragOffsets();
widgetItems.add(new WidgetItem(child.getItemId(), child.getItemQuantity(), i, bounds, child, dragBounds)); dragOffsetX = p.getX();
dragOffsetY = p.getY();
} }
break; // set bounds to same size as default inventory
Rectangle bounds = child.getBounds();
bounds.setBounds(bounds.x - 1, bounds.y - 1, 32, 32);
Rectangle dragBounds = child.getBounds();
dragBounds.setBounds(bounds.x + dragOffsetX, bounds.y + dragOffsetY, 32, 32);
widgetItems.add(new WidgetItem(child.getItemId(), child.getItemQuantity(), i, bounds, child, dragBounds));
} }
break;
} }
return widgetItems; return widgetItems;
} }