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

Update fight cave plugin overlay

Browse Source
This commit is contained in:
Devin
2017-12-18 19:56:03 -08:00
parent 30e319ea98
commit ff215f2bbc
2 changed files with 31 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java
View File

@@ -24,43 +24,37 @@
*/ */
package net.runelite.client.plugins.fightcave; package net.runelite.client.plugins.fightcave;
import java.awt.Color; import lombok.extern.slf4j.Slf4j;
import java.awt.Dimension; import net.runelite.api.Client;
import java.awt.FontMetrics; import net.runelite.client.ui.overlay.Overlay;
import java.awt.Graphics2D; import net.runelite.client.ui.overlay.OverlayPosition;
import java.awt.Image; import net.runelite.client.ui.overlay.OverlayPriority;
import java.awt.Point; import net.runelite.client.ui.overlay.components.ImagePanelComponent;
import java.awt.Rectangle;
import java.io.IOException;
import java.io.InputStream;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import java.awt.Dimension;
import net.runelite.api.Client; import java.awt.Graphics2D;
import net.runelite.api.widgets.Widget; import java.awt.Point;
import net.runelite.client.ui.overlay.Overlay; import java.awt.image.BufferedImage;
import net.runelite.client.ui.overlay.OverlayPosition; import java.io.IOException;
import java.io.InputStream;
@Slf4j @Slf4j
public class FightCaveOverlay extends Overlay public class FightCaveOverlay extends Overlay
{ {
private static final int WIDTH = 70;
private static final int SPACER = 6;
private static final int BOTTOM_BORDER = 4;
private static final Color GREEN_BACKGROUND = new Color(0, 255, 0, 100);
private static final Color RED_BACKGROUND = new Color(255, 0, 0, 100);
private final Client client; private final Client client;
private final FightCavePlugin plugin; private final FightCavePlugin plugin;
private Image protectFromMagicImg; private BufferedImage protectFromMagicImg;
private Image protectFromMissilesImg; private BufferedImage protectFromMissilesImg;
@Inject @Inject
FightCaveOverlay(@Nullable Client client, FightCavePlugin plugin) FightCaveOverlay(@Nullable Client client, FightCavePlugin plugin)
{ {
setPosition(OverlayPosition.DYNAMIC); setPosition(OverlayPosition.BOTTOM_RIGHT);
setPriority(OverlayPriority.HIGH);
this.client = client; this.client = client;
this.plugin = plugin; this.plugin = plugin;
} }
@@ -69,65 +63,23 @@ public class FightCaveOverlay extends Overlay
public Dimension render(Graphics2D graphics, Point parent) public Dimension render(Graphics2D graphics, Point parent)
{ {
JadAttack attack = plugin.getAttack(); JadAttack attack = plugin.getAttack();
Rectangle viewport = getViewportBounds(); if (attack == null || client == null || client.isPrayerActive(attack.getPrayer()))
if (attack == null || viewport == null)
{ {
return null; return null;
} }
BufferedImage prayerImage = getPrayerImage(attack);
Image img = getPrayerImage(attack); ImagePanelComponent imagePanelComponent = new ImagePanelComponent();
if (img == null) imagePanelComponent.setTitle("Switch!");
{ imagePanelComponent.setImage(prayerImage);
return null; return imagePanelComponent.render(graphics, parent);
}
Color bgColor;
Color outlineColor;
Widget prayer = client.getWidget(attack.getPrayerWidgetInfo());
FontMetrics fm = graphics.getFontMetrics();
int height = fm.getHeight() + img.getHeight(null) + SPACER + BOTTOM_BORDER;
if (client.isPrayerActive(attack.getPrayer()))
{
bgColor = GREEN_BACKGROUND;
outlineColor = Color.GREEN.darker();
}
else
{
bgColor = RED_BACKGROUND;
outlineColor = Color.RED.darker();
}
int bgX = (int) (viewport.getX() + viewport.getWidth() - WIDTH);
int bgY = (int) (viewport.getY() + viewport.getHeight() - height);
graphics.setColor(bgColor);
graphics.fillRect(bgX, bgY, WIDTH, height);
if (prayer != null)
{
graphics.setColor(outlineColor);
graphics.draw(prayer.getBounds());
}
graphics.setColor(Color.WHITE);
graphics.drawString("TzTok-Jad", bgX + (WIDTH - fm.stringWidth("TzTok-Jad")) / 2, bgY + fm.getHeight());
graphics.drawImage(img, bgX + (WIDTH - img.getWidth(null)) / 2, bgY + fm.getHeight() + SPACER, null);
return null;
} }
private Rectangle getViewportBounds() private BufferedImage getPrayerImage(JadAttack attack)
{
Widget viewport = client.getViewportWidget();
return viewport != null ? viewport.getBounds() : null;
}
private Image getPrayerImage(JadAttack attack)
{ {
return attack == JadAttack.MAGIC ? getProtectFromMagicImage() : getProtectFromMissilesImage(); return attack == JadAttack.MAGIC ? getProtectFromMagicImage() : getProtectFromMissilesImage();
} }
private Image getProtectFromMagicImage() private BufferedImage getProtectFromMagicImage()
{ {
if (protectFromMagicImg == null) if (protectFromMagicImg == null)
{ {
@@ -137,7 +89,7 @@ public class FightCaveOverlay extends Overlay
return protectFromMagicImg; return protectFromMagicImg;
} }
private Image getProtectFromMissilesImage() private BufferedImage getProtectFromMissilesImage()
{ {
if (protectFromMissilesImg == null) if (protectFromMissilesImg == null)
{ {
@@ -147,9 +99,9 @@ public class FightCaveOverlay extends Overlay
return protectFromMissilesImg; return protectFromMissilesImg;
} }
private Image getImage(String path) private BufferedImage getImage(String path)
{ {
Image image = null; BufferedImage image = null;
try try
{ {
InputStream in = FightCaveOverlay.class.getResourceAsStream(path); InputStream in = FightCaveOverlay.class.getResourceAsStream(path);

14
runelite-client/src/main/java/net/runelite/client/plugins/fightcave/JadAttack.java
View File

@@ -26,22 +26,19 @@ package net.runelite.client.plugins.fightcave;
import net.runelite.api.AnimationID; import net.runelite.api.AnimationID;
import net.runelite.api.Prayer; import net.runelite.api.Prayer;
import net.runelite.api.widgets.WidgetInfo;
public enum JadAttack public enum JadAttack
{ {
MAGIC(AnimationID.TZTOK_JAD_MAGIC_ATTACK, Prayer.PROTECT_FROM_MAGIC, WidgetInfo.PRAYER_PROTECT_FROM_MAGIC), MAGIC(AnimationID.TZTOK_JAD_MAGIC_ATTACK, Prayer.PROTECT_FROM_MAGIC),
RANGE(AnimationID.TZTOK_JAD_RANGE_ATTACK, Prayer.PROTECT_FROM_MISSILES, WidgetInfo.PRAYER_PROTECT_FROM_MISSILES); RANGE(AnimationID.TZTOK_JAD_RANGE_ATTACK, Prayer.PROTECT_FROM_MISSILES);
private final int animation; private final int animation;
private final Prayer prayer; private final Prayer prayer;
private final WidgetInfo prayerWidgetInfo;
JadAttack(int animation, Prayer prayer, WidgetInfo prayerWidgetInfo) JadAttack(int animation, Prayer prayer)
{ {
this.animation = animation; this.animation = animation;
this.prayer = prayer; this.prayer = prayer;
this.prayerWidgetInfo = prayerWidgetInfo;
} }
public int getAnimation() public int getAnimation()
@@ -53,9 +50,4 @@ public enum JadAttack
{ {
return prayer; return prayer;
} }
public WidgetInfo getPrayerWidgetInfo()
{
return prayerWidgetInfo;
}
} }