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

Merge pull request #981 from JourneyOver/statusorbs_energy_overlay_fix

Browse Source 
Status Orb Plugin: Fix run energy overlay
This commit is contained in:
Ganom
2019-07-11 07:45:39 -04:00
committed by GitHub
parent 3f9e902564 e23facf0d5
commit 536fb59df4
1 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
runelite-client/src/main/java/net/runelite/client/plugins/statusorbs/StatusOrbsOverlay.java
View File

@@ -139,49 +139,46 @@ public class StatusOrbsOverlay extends Overlay
renderRegen(g, WidgetInfo.MINIMAP_SPEC_ORB, percentSpec, SPECIAL_COLOR); renderRegen(g, WidgetInfo.MINIMAP_SPEC_ORB, percentSpec, SPECIAL_COLOR);
} }
if (plugin.isReplaceOrbText()) final Widget runOrb = client.getWidget(WidgetInfo.MINIMAP_TOGGLE_RUN_ORB);
if (runOrb == null || runOrb.isHidden())
{ {
final Widget runOrb = client.getWidget(WidgetInfo.MINIMAP_TOGGLE_RUN_ORB); return null;
}
if (runOrb == null || runOrb.isHidden()) final Rectangle bounds = runOrb.getBounds();
if (bounds.getX() <= 0)
{
return null;
}
final Point mousePosition = client.getMouseCanvasPosition();
if (bounds.contains(mousePosition.getX(), mousePosition.getY()))
{
StringBuilder sb = new StringBuilder();
sb.append("Weight: ").append(client.getWeight()).append(" kg</br>");
if (plugin.isReplaceOrbText())
{ {
return null; sb.append("Run Energy: ").append(client.getEnergy()).append("%");
}
else
{
sb.append("Run Time Remaining: ").append(plugin.getEstimatedRunTimeRemaining(false));
} }
final Rectangle bounds = runOrb.getBounds(); int secondsUntil100 = plugin.getEstimatedRecoverTimeRemaining();
if (secondsUntil100 > 0)
if (bounds.getX() <= 0)
{ {
return null; final int minutes = (int) Math.floor(secondsUntil100 / 60.0);
final int seconds = (int) Math.floor(secondsUntil100 - (minutes * 60.0));
sb.append("</br>").append("100% Energy In: ").append(minutes).append(':').append(StringUtils.leftPad(Integer.toString(seconds), 2, "0"));
} }
final Point mousePosition = client.getMouseCanvasPosition(); tooltipManager.add(new Tooltip(sb.toString()));
if (bounds.contains(mousePosition.getX(), mousePosition.getY()))
{
StringBuilder sb = new StringBuilder();
sb.append("Weight: ").append(client.getWeight()).append(" kg</br>");
if (plugin.isReplaceOrbText())
{
sb.append("Run Energy: ").append(client.getEnergy()).append("%");
}
else
{
sb.append("Run Time Remaining: ").append(plugin.getEstimatedRunTimeRemaining(false));
}
int secondsUntil100 = plugin.getEstimatedRecoverTimeRemaining();
if (secondsUntil100 > 0)
{
final int minutes = (int) Math.floor(secondsUntil100 / 60.0);
final int seconds = (int) Math.floor(secondsUntil100 - (minutes * 60.0));
sb.append("</br>").append("100% Energy In: ").append(minutes).append(':').append(StringUtils.leftPad(Integer.toString(seconds), 2, "0"));
}
tooltipManager.add(new Tooltip(sb.toString()));
}
} }
if (plugin.isShowRun()) if (plugin.isShowRun())
@@ -225,4 +222,4 @@ public class StatusOrbsOverlay extends Overlay
g.setColor(color); g.setColor(color);
g.draw(arc); g.draw(arc);
} }
} }