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

achievement diary plugin: Use ColorUtil functions

Browse Source
This commit is contained in:
Jordan Atwood
2018-07-24 14:57:40 -07:00
parent c64727e6b4
commit 339ece742c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java
View File

@@ -26,6 +26,7 @@
package net.runelite.client.plugins.achievementdiary; package net.runelite.client.plugins.achievementdiary;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import java.awt.Color;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@@ -51,6 +52,7 @@ import net.runelite.client.plugins.achievementdiary.diaries.MorytaniaDiaryRequir
import net.runelite.client.plugins.achievementdiary.diaries.VarrockDiaryRequirement; import net.runelite.client.plugins.achievementdiary.diaries.VarrockDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.diaries.WesternDiaryRequirement; import net.runelite.client.plugins.achievementdiary.diaries.WesternDiaryRequirement;
import net.runelite.client.plugins.achievementdiary.diaries.WildernessDiaryRequirement; import net.runelite.client.plugins.achievementdiary.diaries.WildernessDiaryRequirement;
import net.runelite.client.util.ColorUtil;
import net.runelite.client.util.Text; import net.runelite.client.util.Text;
@Slf4j @Slf4j
@@ -256,16 +258,16 @@ public class DiaryRequirementsPlugin extends Plugin
private String combine(List<RequirementStringBuilder> list) private String combine(List<RequirementStringBuilder> list)
{ {
StringBuilder requirementsString = new StringBuilder(); StringBuilder requirementsString = new StringBuilder();
requirementsString.append("<col=000000> ("); requirementsString.append(ColorUtil.prependColorTag(" (", Color.WHITE));
for (RequirementStringBuilder req : list) for (RequirementStringBuilder req : list)
{ {
requirementsString.append("<col=000080>") requirementsString.append(ColorUtil.colorTag(new Color(0x80)))
.append(req.getRequirementString()) .append(req.getRequirementString())
.append(", "); .append(", ");
} }
requirementsString.deleteCharAt(requirementsString.length() - 1); requirementsString.deleteCharAt(requirementsString.length() - 1);
requirementsString.deleteCharAt(requirementsString.length() - 2); requirementsString.deleteCharAt(requirementsString.length() - 2);
requirementsString.append("<col=000000>)"); requirementsString.append(ColorUtil.prependColorTag(")", Color.WHITE));
return requirementsString.toString(); return requirementsString.toString();
} }

4
runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/RequirementStringBuilder.java
View File

@@ -25,9 +25,11 @@
*/ */
package net.runelite.client.plugins.achievementdiary; package net.runelite.client.plugins.achievementdiary;
import java.awt.Color;
import java.util.List; import java.util.List;
import lombok.Getter; import lombok.Getter;
import net.runelite.api.Skill; import net.runelite.api.Skill;
import net.runelite.client.util.ColorUtil;
class RequirementStringBuilder class RequirementStringBuilder
{ {
@@ -64,7 +66,7 @@ class RequirementStringBuilder
void colorRedRequirement() void colorRedRequirement()
{ {
this.requirementString = "<col=800000>" + this.requirementString + "</col>"; this.requirementString = ColorUtil.wrapWithColorTag(this.requirementString, new Color(0x800000));
} }
boolean hasLevelRequirement(int realSkillLevel, List<Integer> altRealSkillLevels) boolean hasLevelRequirement(int realSkillLevel, List<Integer> altRealSkillLevels)