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

info boxes: sort boxes by priority

Browse Source 
add high/med/low priority options and sort boxes by priority
This commit is contained in:
Seth
2018-03-23 16:07:53 -05:00
committed by Adam
parent 06abbe6956
commit 0a622a9692
5 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java
View File

@@ -31,6 +31,7 @@ import net.runelite.api.Client;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.overlay.infobox.InfoBox; import net.runelite.client.ui.overlay.infobox.InfoBox;
import net.runelite.client.ui.overlay.infobox.InfoBoxPriority;
public class BoostIndicator extends InfoBox public class BoostIndicator extends InfoBox
{ {
@@ -47,6 +48,7 @@ public class BoostIndicator extends InfoBox
this.client = client; this.client = client;
this.skill = skill; this.skill = skill;
setTooltip(skill.getName() + " boost"); setTooltip(skill.getName() + " boost");
setPriority(InfoBoxPriority.HIGH);
} }
@Override @Override

2
runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java
View File

@@ -26,6 +26,7 @@ package net.runelite.client.plugins.timers;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.ui.overlay.infobox.InfoBoxPriority;
import net.runelite.client.ui.overlay.infobox.Timer; import net.runelite.client.ui.overlay.infobox.Timer;
public class TimerTimer extends Timer public class TimerTimer extends Timer
@@ -36,6 +37,7 @@ public class TimerTimer extends Timer
{ {
super(timer.getDuration().toMillis(), ChronoUnit.MILLIS, timer.getImage(), plugin); super(timer.getDuration().toMillis(), ChronoUnit.MILLIS, timer.getImage(), plugin);
this.timer = timer; this.timer = timer;
setPriority(InfoBoxPriority.MED);
} }
public GameTimer getTimer() public GameTimer getTimer()

6
runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBox.java
View File

@@ -27,6 +27,7 @@ package net.runelite.client.ui.overlay.infobox;
import java.awt.Color; import java.awt.Color;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import lombok.Getter; import lombok.Getter;
import lombok.Setter;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
public abstract class InfoBox public abstract class InfoBox
@@ -36,12 +37,17 @@ public abstract class InfoBox
@Getter @Getter
private final Plugin plugin; private final Plugin plugin;
@Getter
@Setter
private InfoBoxPriority priority;
private String tooltip; private String tooltip;
public InfoBox(BufferedImage image, Plugin plugin) public InfoBox(BufferedImage image, Plugin plugin)
{ {
this.image = image; this.image = image;
this.plugin = plugin; this.plugin = plugin;
setPriority(InfoBoxPriority.NONE);
} }
public BufferedImage getImage() public BufferedImage getImage()

1
runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java
View File

@@ -96,6 +96,7 @@ public class InfoBoxManager
{ {
Collections.sort(infoBoxes, (b1, b2) -> ComparisonChain Collections.sort(infoBoxes, (b1, b2) -> ComparisonChain
.start() .start()
.compare(b1.getPriority(), b2.getPriority())
.compare(b1.getPlugin().getClass().getAnnotation(PluginDescriptor.class).name(), b2.getPlugin().getClass().getAnnotation(PluginDescriptor.class).name()) .compare(b1.getPlugin().getClass().getAnnotation(PluginDescriptor.class).name(), b2.getPlugin().getClass().getAnnotation(PluginDescriptor.class).name())
.result()); .result());
} }

33
runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxPriority.java Normal file
View File

@@ -0,0 +1,33 @@
/*
* Copyright (c) 2018, Seth <http://github.com/sethtroll>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.ui.overlay.infobox;
public enum InfoBoxPriority
{
HIGH,
MED,
NONE,
LOW
}