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

Merge pull request #520 from Kamielvf/boosts-indicator-fix

Browse Source 
Fix several issues with indicators
This commit is contained in:
Adam
2018-02-04 10:43:42 -05:00
committed by GitHub
parent 80aebd1836 00e3503cfe
commit feaad0eef4
3 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ package net.runelite.client.plugins.boosts;
import java.awt.Color; import java.awt.Color;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import lombok.Getter;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.client.ui.overlay.infobox.InfoBox; import net.runelite.client.ui.overlay.infobox.InfoBox;
@@ -34,6 +35,8 @@ public class BoostIndicator extends InfoBox
{ {
private final BoostsConfig config; private final BoostsConfig config;
private final Client client; private final Client client;
@Getter
private final Skill skill; private final Skill skill;
public BoostIndicator(Skill skill, BufferedImage image, Client client, BoostsConfig config) public BoostIndicator(Skill skill, BufferedImage image, Client client, BoostsConfig config)

20
runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java
View File

@@ -84,12 +84,13 @@ class BoostsOverlay extends Overlay
int boosted = client.getBoostedSkillLevel(skill), int boosted = client.getBoostedSkillLevel(skill),
base = client.getRealSkillLevel(skill); base = client.getRealSkillLevel(skill);
BoostIndicator indicator = indicators[skill.ordinal()];
if (boosted == base) if (boosted == base)
{ {
if (indicators[skill.ordinal()] != null) if (indicator != null && infoBoxManager.getInfoBoxes().contains(indicator))
{ {
infoBoxManager.removeInfoBox(indicators[skill.ordinal()]); infoBoxManager.removeInfoBox(indicator);
indicators[skill.ordinal()] = null;
} }
continue; continue;
@@ -97,15 +98,24 @@ class BoostsOverlay extends Overlay
if (config.displayIndicators()) if (config.displayIndicators())
{ {
if (indicators[skill.ordinal()] == null) if (indicator == null)
{ {
BoostIndicator indicator = new BoostIndicator(skill, iconManager.getSkillImage(skill), client, config); indicator = new BoostIndicator(skill, iconManager.getSkillImage(skill), client, config);
indicators[skill.ordinal()] = indicator; indicators[skill.ordinal()] = indicator;
}
if (!infoBoxManager.getInfoBoxes().contains(indicator))
{
infoBoxManager.addInfoBox(indicator); infoBoxManager.addInfoBox(indicator);
} }
} }
else else
{ {
if (indicator != null && infoBoxManager.getInfoBoxes().contains(indicator))
{
infoBoxManager.removeInfoBox(indicator);
}
String str; String str;
Color strColor = Color.WHITE; Color strColor = Color.WHITE;
if (!config.useRelativeBoost()) if (!config.useRelativeBoost())

29
runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
View File

@@ -28,6 +28,7 @@ import com.google.common.collect.ObjectArrays;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.google.inject.Binder; import com.google.inject.Binder;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.util.Arrays;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.Getter; import lombok.Getter;
import net.runelite.api.Skill; import net.runelite.api.Skill;
@@ -93,35 +94,25 @@ public class BoostsPlugin extends Plugin
} }
} }
@Override
protected void shutDown() throws Exception
{
infoBoxManager.removeIf(t -> t instanceof BoostIndicator);
}
@Subscribe @Subscribe
public void onConfigChanged(ConfigChanged event) public void onConfigChanged(ConfigChanged event)
{ {
if (!config.enabled()) if (!config.enabled())
{ {
infoBoxManager.removeIf(t -> t instanceof BoostIndicator);
return; return;
} }
updateShownSkills(config.enableSkill()); updateShownSkills(config.enableSkill());
if (event.getKey().equals("displayIndicators")) infoBoxManager.removeIf(t -> t instanceof BoostIndicator
{ && !Arrays.asList(shownSkills).contains(((BoostIndicator) t).getSkill()));
for (BoostIndicator indicator : boostsOverlay.getIndicators())
{
if (indicator == null)
{
continue;
}
if (config.displayIndicators())
{
infoBoxManager.addInfoBox(indicator);
}
else
{
infoBoxManager.removeInfoBox(indicator);
}
}
}
} }
private void updateShownSkills(boolean showSkillingSkills) private void updateShownSkills(boolean showSkillingSkills)