From 0ef1adeaaae9893ae6b98542538d7f362e24b4ac Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 17 Jul 2018 10:26:53 -0700 Subject: [PATCH] puzzle solver plugin: Use ColorUtil functions --- .../plugins/puzzlesolver/PuzzleSolverPlugin.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java index 878dd821ca..8d0def527b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.puzzlesolver; import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; +import java.awt.Color; import java.util.Arrays; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; @@ -55,6 +56,8 @@ import net.runelite.client.plugins.puzzlesolver.lightbox.LightboxSolution; import net.runelite.client.plugins.puzzlesolver.lightbox.LightboxSolver; import net.runelite.client.plugins.puzzlesolver.lightbox.LightboxState; import net.runelite.client.ui.overlay.OverlayManager; +import net.runelite.client.util.ColorUtil; +import net.runelite.client.util.Text; @PluginDescriptor( name = "Puzzle Solver", @@ -64,6 +67,8 @@ import net.runelite.client.ui.overlay.OverlayManager; @Slf4j public class PuzzleSolverPlugin extends Plugin { + private static final Color CORRECT_MUSEUM_PUZZLE_ANSWER_COLOR = new Color(0, 248, 128); + @Inject private OverlayManager overlayManager; @@ -118,9 +123,15 @@ public class PuzzleSolverPlugin extends Plugin WidgetInfo.VARROCK_MUSEUM_SECOND_ANSWER, WidgetInfo.VARROCK_MUSEUM_THIRD_ANSWER); - if (answerWidget != null && !answerWidget.getText().contains("" + answerWidget.getText() + ""); + return; + } + + final String answerText = answerWidget.getText(); + if (answerText.equals(Text.removeTags(answerText))) + { + answerWidget.setText(ColorUtil.wrapWithColorTag(answerText, CORRECT_MUSEUM_PUZZLE_ANSWER_COLOR)); } }