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

Update existing plugins to use item queries

Browse Source
This commit is contained in:
Devin
2017-10-12 23:13:28 -07:00
committed by Adam
parent cf2487529b
commit 1a4be15c75
8 changed files with 163 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryCount.java
View File

@@ -24,10 +24,8 @@
*/
package net.runelite.client.plugins.jewelrycount;
import java.awt.Font;
import net.runelite.client.RuneLite;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.Overlay;
public class JewelryCount extends Plugin
@@ -35,8 +33,6 @@ public class JewelryCount extends Plugin
private final JewelryCountConfig config = RuneLite.getRunelite().getConfigManager().getConfig(JewelryCountConfig.class);
private final Overlay overlay = new JewelryCountOverlay(this);
private Font font;
@Override
public Overlay getOverlay()
{
@@ -46,8 +42,6 @@ public class JewelryCount extends Plugin
@Override
protected void startUp() throws Exception
{
font = FontManager.getRunescapeSmallFont()
.deriveFont(Font.PLAIN, 16);
}
@Override
@@ -60,9 +54,4 @@ public class JewelryCount extends Plugin
{
return config;
}
public Font getFont()
{
return font;
}
}

82
runelite-client/src/main/java/net/runelite/client/plugins/jewelrycount/JewelryCountOverlay.java
View File

@@ -25,26 +25,32 @@
package net.runelite.client.plugins.jewelrycount;
import java.awt.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.widgets.Widget;
import net.runelite.api.Query;
import net.runelite.api.queries.EquipmentItemQuery;
import net.runelite.api.queries.InventoryItemQuery;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.RuneLite;
import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
class JewelryCountOverlay extends Overlay
{
private final RuneLite runelite = RuneLite.getRunelite();
private final JewelryCountConfig config;
private final JewelryCount plugin;
private final Font font = FontManager.getRunescapeSmallFont().deriveFont(Font.PLAIN, 16);
JewelryCountOverlay(JewelryCount plugin)
{
super(OverlayPosition.DYNAMIC);
this.config = plugin.getConfig();
this.plugin = plugin;
}
@Override
@@ -59,66 +65,44 @@ class JewelryCountOverlay extends Overlay
return null;
}
Widget inventory = client.getWidget(WidgetInfo.INVENTORY);
graphics.setFont(font);
if (inventory == null)
for (WidgetItem item : getJewelryWidgetItems())
{
return null;
}
JewelryCharges charges = JewelryCharges.getCharges(item.getId());
if (!inventory.isHidden())
{
for (WidgetItem item : inventory.getWidgetItems())
if (charges == null)
{
JewelryCharges charges = JewelryCharges.getCharges(item.getId());
if (charges == null)
{
continue;
}
renderWidgetText(graphics, item.getCanvasBounds(), charges.getCharges(), Color.white);
continue;
}
}
Widget equipment = client.getWidget(WidgetInfo.EQUIPMENT);
renderWidgetText(graphics, item.getCanvasBounds(), charges.getCharges(), Color.white);
if (equipment != null)
{
Widget[] equipmentSlots =
{
client.getWidget(WidgetInfo.EQUIPMENT_AMULET).getChild(1), client.getWidget(WidgetInfo.EQUIPMENT_RING).getChild(1),
client.getWidget(WidgetInfo.EQUIPMENT_GLOVES).getChild(1)
};
for (Widget widget : equipmentSlots)
{
JewelryCharges charges = JewelryCharges.getCharges(widget.getItemId());
if (charges == null || widget.isHidden())
{
continue;
}
Rectangle widgetBounds = widget.getBounds();
renderWidgetText(graphics, widgetBounds, charges.getCharges(), Color.white);
}
}
return null;
}
private Collection<WidgetItem> getJewelryWidgetItems()
{
Query inventoryQuery = new InventoryItemQuery();
WidgetItem[] inventoryWidgetItems = runelite.runQuery(inventoryQuery);
Query equipmentQuery = new EquipmentItemQuery().slotEquals(
WidgetInfo.EQUIPMENT_AMULET,
WidgetInfo.EQUIPMENT_RING,
WidgetInfo.EQUIPMENT_GLOVES
);
WidgetItem[] equipmentWidgetItems = runelite.runQuery(equipmentQuery);
Collection<WidgetItem> jewelry = new ArrayList<>();
jewelry.addAll(Arrays.asList(inventoryWidgetItems));
jewelry.addAll(Arrays.asList(equipmentWidgetItems));
return jewelry;
}
private void renderWidgetText(Graphics2D graphics, Rectangle bounds, int charges, Color color)
{
Font font = plugin.getFont();
if (font != null)
{
graphics.setFont(font);
}
FontMetrics fm = graphics.getFontMetrics();
int textX = (int) bounds.getX();

90
runelite-client/src/main/java/net/runelite/client/plugins/runecraft/BindNeckOverlay.java
View File

@@ -27,27 +27,37 @@ package net.runelite.client.plugins.runecraft;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import static net.runelite.api.ItemID.BINDING_NECKLACE;
import net.runelite.api.widgets.Widget;
import net.runelite.api.Query;
import net.runelite.api.queries.EquipmentItemQuery;
import net.runelite.api.queries.InventoryItemQuery;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.RuneLite;
import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
public class BindNeckOverlay extends Overlay
{
private final Client client = RuneLite.getClient();
private final RuneLite runelite = RuneLite.getRunelite();
private final RunecraftConfig config;
private final Font font = FontManager.getRunescapeSmallFont().deriveFont(Font.PLAIN, 16);
int bindingCharges;
public BindNeckOverlay(Runecraft plugin)
BindNeckOverlay(Runecraft plugin)
{
super(OverlayPosition.DYNAMIC);
this.config = plugin.getConfig();
@@ -63,69 +73,41 @@ public class BindNeckOverlay extends Overlay
return null;
}
Widget inventory = client.getWidget(WidgetInfo.INVENTORY);
graphics.setFont(font);
if (inventory == null)
for (WidgetItem necklace : getNecklaceWidgetItems())
{
return null;
}
if (!inventory.isHidden())
{
for (WidgetItem item : inventory.getWidgetItems())
{
if (item.getId() != BINDING_NECKLACE)
{
continue;
}
if (bindingCharges == 1)
{
renderBindNeck(graphics, item.getCanvasBounds(), bindingCharges, Color.red);
}
else
{
renderBindNeck(graphics, item.getCanvasBounds(), bindingCharges, Color.white);
}
}
}
Widget equipment = client.getWidget(WidgetInfo.EQUIPMENT);
if (equipment != null)
{
Widget amuletSlot = client.getWidget(WidgetInfo.EQUIPMENT_AMULET).getChild(1);
if (!amuletSlot.isHidden() && amuletSlot.getItemId() == BINDING_NECKLACE)
{
Rectangle widgetBounds = amuletSlot.getBounds();
//to match inventory text
widgetBounds.x -= 5;
widgetBounds.y -= 1;
if (bindingCharges == 1)
{
renderBindNeck(graphics, widgetBounds, bindingCharges, Color.red);
}
else
{
renderBindNeck(graphics, widgetBounds, bindingCharges, Color.white);
}
}
Color color = bindingCharges == 1 ? Color.RED : Color.WHITE;
renderBindNeck(graphics, necklace.getCanvasBounds(), bindingCharges, color);
}
return null;
}
private Collection<WidgetItem> getNecklaceWidgetItems()
{
Query inventoryQuery = new InventoryItemQuery()
.idEquals(BINDING_NECKLACE);
WidgetItem[] inventoryWidgetItems = runelite.runQuery(inventoryQuery);
Query equipmentQuery = new EquipmentItemQuery()
.slotEquals(WidgetInfo.EQUIPMENT_AMULET)
.idEquals(BINDING_NECKLACE);
WidgetItem[] equipmentWidgetItems = runelite.runQuery(equipmentQuery);
Collection<WidgetItem> necklaces = new ArrayList<>();
necklaces.addAll(Arrays.asList(inventoryWidgetItems));
necklaces.addAll(Arrays.asList(equipmentWidgetItems));
return necklaces;
}
private void renderBindNeck(Graphics2D graphics, Rectangle bounds, int charges, Color color)
{
String text = charges <= 0 ? "?" : charges + "";
FontMetrics fm = graphics.getFontMetrics();
Rectangle2D textBounds = fm.getStringBounds(text, graphics);
int textX = (int) (bounds.getX() + bounds.getWidth() - textBounds.getWidth());
int textY = (int) (bounds.getY() + (textBounds.getHeight()));
int textX = (int) bounds.getX();
int textY = (int) bounds.getY() + fm.getHeight();
//text shadow
graphics.setColor(Color.BLACK);

4
runelite-client/src/main/java/net/runelite/client/plugins/runecraft/Runecraft.java
View File

@@ -25,6 +25,7 @@
package net.runelite.client.plugins.runecraft;
import com.google.common.eventbus.Subscribe;
import java.util.Arrays;
import java.util.Collection;
import java.util.regex.Matcher;
@@ -37,7 +38,7 @@ import net.runelite.client.ui.overlay.Overlay;
public class Runecraft extends Plugin
{
public static Pattern bindNeckString = Pattern.compile("You have ([0-9]+) charges left before your Binding necklace disintegrates.");
private static Pattern bindNeckString = Pattern.compile("You have ([0-9]+) charges left before your Binding necklace disintegrates.");
private final RunecraftConfig config = RuneLite.getRunelite().getConfigManager().getConfig(RunecraftConfig.class);
private final RunecraftOverlay overlay = new RunecraftOverlay(this);
@@ -97,7 +98,6 @@ public class Runecraft extends Plugin
{
//set it to 17 because this message is triggered first before the above chat event
bindNeckOverlay.bindingCharges = 17;
return;
}
}
}

58
runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java
View File

@@ -26,29 +26,37 @@ package net.runelite.client.plugins.runecraft;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.ItemID;
import net.runelite.api.Point;
import net.runelite.api.Query;
import net.runelite.api.Varbits;
import net.runelite.api.widgets.Widget;
import net.runelite.api.queries.InventoryItemQuery;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.RuneLite;
import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
public class RunecraftOverlay extends Overlay
{
private static final int MEDIUM_POUCH_DAMAGED = ItemID.MEDIUM_POUCH_5511;
private static final int LARGE_POUCH_DAMAGED = ItemID.LARGE_POUCH_5513;
private static final int GIANT_POUCH_DAMAGED = ItemID.GIANT_POUCH_5515;
private final Client client = RuneLite.getClient();
private final RuneLite runelite = RuneLite.getRunelite();
private final Font font = FontManager.getRunescapeSmallFont().deriveFont(Font.PLAIN, 16);
private final RunecraftConfig config;
private final int MEDIUM_POUCH_DAMAGED = ItemID.MEDIUM_POUCH_5511;
private final int LARGE_POUCH_DAMAGED = ItemID.LARGE_POUCH_5513;
private final int GIANT_POUCH_DAMAGED = ItemID.GIANT_POUCH_5515;
public RunecraftOverlay(Runecraft plugin)
RunecraftOverlay(Runecraft plugin)
{
super(OverlayPosition.DYNAMIC);
this.config = plugin.getConfig();
@@ -64,14 +72,11 @@ public class RunecraftOverlay extends Overlay
return null;
}
Widget inventoryWidget = client.getWidget(WidgetInfo.INVENTORY);
graphics.setFont(font);
if (inventoryWidget == null || inventoryWidget.isHidden())
{
return null;
}
for (WidgetItem item : inventoryWidget.getWidgetItems())
Query query = new InventoryItemQuery();
WidgetItem[] widgetItems = runelite.runQuery(query);
for (WidgetItem item : widgetItems)
{
Varbits varbits;
@@ -96,18 +101,25 @@ public class RunecraftOverlay extends Overlay
continue;
}
Point location = item.getCanvasLocation();
if (location != null)
{
int value = client.getSetting(varbits);
graphics.setColor(Color.black);
graphics.drawString("" + value, location.getX() + 1, location.getY() + graphics.getFontMetrics().getHeight() + 1);
graphics.setColor(Color.white);
graphics.drawString("" + value, location.getX(), location.getY() + graphics.getFontMetrics().getHeight());
}
renderPouch(graphics, item.getCanvasBounds(), varbits, Color.WHITE);
}
return null;
}
private void renderPouch(Graphics2D graphics, Rectangle bounds, Varbits varbits, Color color)
{
FontMetrics fm = graphics.getFontMetrics();
int textX = (int) bounds.getX();
int textY = (int) bounds.getY() + fm.getHeight();
int contents = client.getSetting(varbits);
//text shadow
graphics.setColor(Color.BLACK);
graphics.drawString(String.valueOf(contents), textX + 1, textY + 1);
graphics.setColor(color);
graphics.drawString(String.valueOf(contents), textX, textY);
}
}

85
runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java
View File

@@ -32,8 +32,9 @@ import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.ItemID;
import net.runelite.api.Point;
import net.runelite.api.Query;
import net.runelite.api.Varbits;
import net.runelite.api.widgets.Widget;
import net.runelite.api.queries.InventoryItemQuery;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.RuneLite;
@@ -41,13 +42,9 @@ import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RunepouchOverlay extends Overlay
{
private static final Logger logger = LoggerFactory.getLogger(RunepouchOverlay.class);
private static final Varbits[] AMOUNT_VARBITS =
{
Varbits.RUNE_POUCH_AMOUNT1, Varbits.RUNE_POUCH_AMOUNT2, Varbits.RUNE_POUCH_AMOUNT3
@@ -58,14 +55,13 @@ public class RunepouchOverlay extends Overlay
};
private final Client client = RuneLite.getClient();
private final RuneLite runelite = RuneLite.getRunelite();
private final RuneImageCache runeImageCache = new RuneImageCache();
private final Runepouch plugin;
private final RunepouchConfig config;
public RunepouchOverlay(Runepouch plugin)
RunepouchOverlay(Runepouch plugin)
{
super(OverlayPosition.DYNAMIC);
this.plugin = plugin;
this.config = plugin.getConfig();
}
@@ -79,63 +75,56 @@ public class RunepouchOverlay extends Overlay
return null;
}
Widget inventoryWidget = client.getWidget(WidgetInfo.INVENTORY);
if (inventoryWidget == null || inventoryWidget.isHidden())
Query query = new InventoryItemQuery().idEquals(ItemID.RUNE_POUCH);
WidgetItem[] items = runelite.runQuery(query);
if (items.length == 0)
{
return null;
}
WidgetItem runePouch = items[0];
Point location = runePouch.getCanvasLocation();
if (location == null)
{
return null;
}
assert AMOUNT_VARBITS.length == RUNE_VARBITS.length;
graphics.setFont(FontManager.getRunescapeSmallFont());
for (WidgetItem item : inventoryWidget.getWidgetItems())
for (int i = 0; i < AMOUNT_VARBITS.length; i++)
{
if (item.getId() != ItemID.RUNE_POUCH)
Varbits amountVarbit = AMOUNT_VARBITS[i];
Varbits runeVarbit = RUNE_VARBITS[i];
int amount = client.getSetting(amountVarbit);
if (amount <= 0)
{
continue;
}
Point location = item.getCanvasLocation();
if (location == null)
graphics.setColor(Color.black);
graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 13 : 1),
location.getY() + 14 + graphics.getFontMetrics().getHeight() * i);
graphics.setColor(config.fontColor());
graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 12 : 0),
location.getY() + 13 + graphics.getFontMetrics().getHeight() * i);
if (!config.showIcons())
{
continue;
}
assert AMOUNT_VARBITS.length == RUNE_VARBITS.length;
int runeId = client.getSetting(runeVarbit);
for (int i = 0; i < AMOUNT_VARBITS.length; i++)
BufferedImage runeImg = runeImageCache.getImage(runeId);
if (runeImg != null)
{
Varbits amountVarbit = AMOUNT_VARBITS[i];
Varbits runeVarbit = RUNE_VARBITS[i];
int amount = client.getSetting(amountVarbit);
if (amount <= 0)
{
continue;
}
graphics.setColor(Color.black);
graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 13 : 1),
location.getY() + 14 + graphics.getFontMetrics().getHeight() * i);
graphics.setColor(config.fontColor());
graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 12 : 0),
location.getY() + 13 + graphics.getFontMetrics().getHeight() * i);
if (!config.showIcons())
{
continue;
}
int runeId = client.getSetting(runeVarbit);
BufferedImage runeImg = runeImageCache.getImage(runeId);
if (runeImg != null)
{
OverlayUtil.renderImageLocation(graphics,
new Point(location.getX(), location.getY() + 2 + (graphics.getFontMetrics().getHeight()) * i),
runeImg);
}
OverlayUtil.renderImageLocation(graphics,
new Point(location.getX(), location.getY() + 2 + (graphics.getFontMetrics().getHeight()) * i),
runeImg);
}
}
return null;