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

xp globes: remove double call to getSkillImage

Browse Source
This commit is contained in:
Adam
2017-06-17 20:59:33 -04:00
parent a3d3f95ca9
commit 437e99f511
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobes.java
View File

@@ -33,10 +33,8 @@ import net.runelite.client.events.ExperienceChanged;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@@ -71,7 +69,7 @@ public class XpGlobes extends Plugin
} }
@Subscribe @Subscribe
private void onExperienceChanged(ExperienceChanged event) public void onExperienceChanged(ExperienceChanged event)
{ {
if (!config.enabled()) if (!config.enabled())
{ {

50
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
View File

@@ -46,11 +46,11 @@ import org.slf4j.LoggerFactory;
public class XpGlobesOverlay extends Overlay public class XpGlobesOverlay extends Overlay
{ {
private static final Logger logger = LoggerFactory.getLogger(XpGlobesOverlay.class);
private final XpGlobes plugin; private final XpGlobes plugin;
private final Client client = RuneLite.getClient(); private final Client client = RuneLite.getClient();
private final XpGlobesConfig config; private final XpGlobesConfig config;
private static final Logger logger = LoggerFactory.getLogger(XpGlobesOverlay.class);
private static final int DEFAULT_CIRCLE_WIDTH = 40; private static final int DEFAULT_CIRCLE_WIDTH = 40;
private static final int DEFAULT_CIRCLE_HEIGHT = 40; private static final int DEFAULT_CIRCLE_HEIGHT = 40;
@@ -117,20 +117,20 @@ public class XpGlobesOverlay extends Overlay
drawEllipse(graphics, x, y); drawEllipse(graphics, x, y);
drawProgressArc( drawProgressArc(
graphics, graphics,
x, y, x, y,
DEFAULT_CIRCLE_WIDTH, DEFAULT_CIRCLE_HEIGHT, DEFAULT_CIRCLE_WIDTH, DEFAULT_CIRCLE_HEIGHT,
PROGRESS_RADIUS_REMAINDER, radiusToGoalXp, PROGRESS_RADIUS_REMAINDER, radiusToGoalXp,
5, 5,
DEFAULT_PROGRESS_REMAINDER_ARC_COLOR DEFAULT_PROGRESS_REMAINDER_ARC_COLOR
); );
drawProgressArc( drawProgressArc(
graphics, graphics,
x, y, x, y,
DEFAULT_CIRCLE_WIDTH, DEFAULT_CIRCLE_HEIGHT, DEFAULT_CIRCLE_WIDTH, DEFAULT_CIRCLE_HEIGHT,
PROGRESS_RADIUS_START, radiusCurrentXp, PROGRESS_RADIUS_START, radiusCurrentXp,
2, 2,
DEFAULT_PROGRESS_ARC_COLOR); DEFAULT_PROGRESS_ARC_COLOR);
drawSkillImage(graphics, skillToDraw, x, y); drawSkillImage(graphics, skillToDraw, x, y);
} }
@@ -140,10 +140,10 @@ public class XpGlobesOverlay extends Overlay
graphics.setStroke(new BasicStroke(strokeWidth)); graphics.setStroke(new BasicStroke(strokeWidth));
graphics.setColor(color); graphics.setColor(color);
graphics.draw(new Arc2D.Double( graphics.draw(new Arc2D.Double(
x, y, x, y,
w, h, w, h,
radiusStart, radiusEnd, radiusStart, radiusEnd,
Arc2D.OPEN)); Arc2D.OPEN));
} }
private void drawEllipse(Graphics2D graphics, int x, int y) private void drawEllipse(Graphics2D graphics, int x, int y)
@@ -157,11 +157,17 @@ public class XpGlobesOverlay extends Overlay
private void drawSkillImage(Graphics2D graphics, XpGlobe xpGlobe, int x, int y) private void drawSkillImage(Graphics2D graphics, XpGlobe xpGlobe, int x, int y)
{ {
BufferedImage skillImage = getSkillImage(xpGlobe); BufferedImage skillImage = getSkillImage(xpGlobe);
if (skillImage == null)
{
return;
}
graphics.drawImage( graphics.drawImage(
getSkillImage(xpGlobe), skillImage,
x + (DEFAULT_CIRCLE_WIDTH / 2) - (skillImage.getWidth() / 2), x + (DEFAULT_CIRCLE_WIDTH / 2) - (skillImage.getWidth() / 2),
y + (DEFAULT_CIRCLE_HEIGHT / 2) - (skillImage.getHeight() / 2), y + (DEFAULT_CIRCLE_HEIGHT / 2) - (skillImage.getHeight() / 2),
null null
); );
} }
@@ -174,7 +180,7 @@ public class XpGlobesOverlay extends Overlay
{ {
return imgCache[skillIdx]; return imgCache[skillIdx];
} }
try try
{ {
String skillIconPath = "/skill_icons/" + xpGlobe.getSkillName().toLowerCase() + ".png"; String skillIconPath = "/skill_icons/" + xpGlobe.getSkillName().toLowerCase() + ".png";