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

examine: support item examine on if3 components

Browse Source
This commit is contained in:
Adam
2022-04-12 23:26:05 -04:00
parent 8b3f129c1e
commit fe791a9600
2 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
View File

@@ -40,7 +40,6 @@ import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetID;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import static net.runelite.api.widgets.WidgetInfo.SEED_VAULT_ITEM_CONTAINER;
import static net.runelite.api.widgets.WidgetInfo.TO_CHILD; import static net.runelite.api.widgets.WidgetInfo.TO_CHILD;
import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; import static net.runelite.api.widgets.WidgetInfo.TO_GROUP;
import net.runelite.api.widgets.WidgetItem; import net.runelite.api.widgets.WidgetItem;
@@ -126,7 +125,7 @@ public class ExaminePlugin extends Plugin
break; break;
case CC_OP_LOW_PRIORITY: case CC_OP_LOW_PRIORITY:
{ {
type = ExamineType.ITEM_BANK_EQ; type = ExamineType.IF3_ITEM;
int[] qi = findItemFromWidget(event.getParam1(), event.getParam0()); int[] qi = findItemFromWidget(event.getParam1(), event.getParam0());
if (qi == null) if (qi == null)
{ {
@@ -173,7 +172,7 @@ public class ExaminePlugin extends Plugin
type = ExamineType.NPC; type = ExamineType.NPC;
break; break;
case GAMEMESSAGE: case GAMEMESSAGE:
type = ExamineType.ITEM_BANK_EQ; type = ExamineType.IF3_ITEM;
break; break;
default: default:
return; return;
@@ -197,7 +196,7 @@ public class ExaminePlugin extends Plugin
log.debug("Got examine for {} {}: {}", pendingExamine.getType(), pendingExamine.getId(), event.getMessage()); log.debug("Got examine for {} {}: {}", pendingExamine.getType(), pendingExamine.getId(), event.getMessage());
// If it is an item, show the price of it // If it is an item, show the price of it
if (pendingExamine.getType() == ExamineType.ITEM || pendingExamine.getType() == ExamineType.ITEM_BANK_EQ) if (pendingExamine.getType() == ExamineType.ITEM || pendingExamine.getType() == ExamineType.IF3_ITEM)
{ {
final int itemId = pendingExamine.getId(); final int itemId = pendingExamine.getId();
final int itemQuantity = pendingExamine.getQuantity(); final int itemQuantity = pendingExamine.getQuantity();
@@ -212,12 +211,10 @@ public class ExaminePlugin extends Plugin
} }
} }
private int[] findItemFromWidget(int widgetId, int actionParam) private int[] findItemFromWidget(int widgetId, int childIdx)
{ {
int widgetGroup = TO_GROUP(widgetId); final int widgetGroup = TO_GROUP(widgetId);
int widgetChild = TO_CHILD(widgetId); final Widget widget = client.getWidget(widgetId);
Widget widget = client.getWidget(widgetGroup, widgetChild);
if (widget == null) if (widget == null)
{ {
return null; return null;
@@ -239,42 +236,18 @@ public class ExaminePlugin extends Plugin
return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()};
} }
} }
else if (WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER.getGroupId() == widgetGroup
|| WidgetInfo.RUNE_POUCH_ITEM_CONTAINER.getGroupId() == widgetGroup)
{
Widget widgetItem = widget.getChild(actionParam);
if (widgetItem != null)
{
return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()};
}
}
else if (WidgetInfo.BANK_ITEM_CONTAINER.getGroupId() == widgetGroup
|| WidgetInfo.CLUE_SCROLL_REWARD_ITEM_CONTAINER.getGroupId() == widgetGroup
|| WidgetInfo.LOOTING_BAG_CONTAINER.getGroupId() == widgetGroup
|| WidgetID.SEED_VAULT_INVENTORY_GROUP_ID == widgetGroup
|| WidgetID.SEED_BOX_GROUP_ID == widgetGroup
|| WidgetID.PLAYER_TRADE_SCREEN_GROUP_ID == widgetGroup
|| WidgetID.PLAYER_TRADE_INVENTORY_GROUP_ID == widgetGroup
|| WidgetID.POH_TREASURE_CHEST_INVENTORY_GROUP_ID == widgetGroup)
{
Widget widgetItem = widget.getChild(actionParam);
if (widgetItem != null)
{
return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()};
}
}
else if (WidgetID.SHOP_GROUP_ID == widgetGroup) else if (WidgetID.SHOP_GROUP_ID == widgetGroup)
{ {
Widget widgetItem = widget.getChild(actionParam); Widget widgetItem = widget.getChild(childIdx);
if (widgetItem != null) if (widgetItem != null)
{ {
return new int[]{1, widgetItem.getItemId()}; return new int[]{1, widgetItem.getItemId()};
} }
} }
else if (WidgetID.SEED_VAULT_GROUP_ID == widgetGroup) else
{ {
Widget widgetItem = client.getWidget(SEED_VAULT_ITEM_CONTAINER).getChild(actionParam); Widget widgetItem = widget.getChild(childIdx);
if (widgetItem != null) if (widgetItem != null && widgetItem.getItemId() > -1)
{ {
return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()};
} }

4
runelite-client/src/main/java/net/runelite/client/plugins/examine/ExamineType.java
View File

@@ -24,10 +24,10 @@
*/ */
package net.runelite.client.plugins.examine; package net.runelite.client.plugins.examine;
public enum ExamineType enum ExamineType
{ {
ITEM, ITEM,
ITEM_BANK_EQ, IF3_ITEM,
NPC, NPC,
OBJECT; OBJECT;
} }