From 339ece742c4b1b37271cc5f024c67f7fdb030191 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 24 Jul 2018 14:57:40 -0700 Subject: [PATCH] achievement diary plugin: Use ColorUtil functions --- .../plugins/achievementdiary/DiaryRequirementsPlugin.java | 8 +++++--- .../achievementdiary/RequirementStringBuilder.java | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java index 7ba275e918..7b43edcd92 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.achievementdiary; import com.google.common.eventbus.Subscribe; +import java.awt.Color; import java.util.ArrayList; import java.util.Collection; 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.WesternDiaryRequirement; import net.runelite.client.plugins.achievementdiary.diaries.WildernessDiaryRequirement; +import net.runelite.client.util.ColorUtil; import net.runelite.client.util.Text; @Slf4j @@ -256,16 +258,16 @@ public class DiaryRequirementsPlugin extends Plugin private String combine(List list) { StringBuilder requirementsString = new StringBuilder(); - requirementsString.append(" ("); + requirementsString.append(ColorUtil.prependColorTag(" (", Color.WHITE)); for (RequirementStringBuilder req : list) { - requirementsString.append("") + requirementsString.append(ColorUtil.colorTag(new Color(0x80))) .append(req.getRequirementString()) .append(", "); } requirementsString.deleteCharAt(requirementsString.length() - 1); requirementsString.deleteCharAt(requirementsString.length() - 2); - requirementsString.append(")"); + requirementsString.append(ColorUtil.prependColorTag(")", Color.WHITE)); return requirementsString.toString(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/RequirementStringBuilder.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/RequirementStringBuilder.java index dc403badeb..c1ac22792a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/RequirementStringBuilder.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/RequirementStringBuilder.java @@ -25,9 +25,11 @@ */ package net.runelite.client.plugins.achievementdiary; +import java.awt.Color; import java.util.List; import lombok.Getter; import net.runelite.api.Skill; +import net.runelite.client.util.ColorUtil; class RequirementStringBuilder { @@ -64,7 +66,7 @@ class RequirementStringBuilder void colorRedRequirement() { - this.requirementString = "" + this.requirementString + ""; + this.requirementString = ColorUtil.wrapWithColorTag(this.requirementString, new Color(0x800000)); } boolean hasLevelRequirement(int realSkillLevel, List altRealSkillLevels)