diff --git a/src/main/java/com/toofifty/easygiantsfoundry/BonusWidget.java b/src/main/java/com/toofifty/easygiantsfoundry/BonusWidget.java new file mode 100644 index 0000000..5bf7f19 --- /dev/null +++ b/src/main/java/com/toofifty/easygiantsfoundry/BonusWidget.java @@ -0,0 +1,17 @@ +package com.toofifty.easygiantsfoundry; + +import net.runelite.api.Client; +import net.runelite.api.widgets.Widget; + +public class BonusWidget { + private static final int BONUS_WIDGET = 49414148; + private static final int BONUS_COLOR = 0xfcd703; + + static boolean isActive(Client client) { + Widget bonusWidget = client.getWidget(BONUS_WIDGET); + return bonusWidget != null + && bonusWidget.getChildren() != null + && bonusWidget.getChildren().length != 0 + && bonusWidget.getChild(0).getTextColor() == BONUS_COLOR; + } +} diff --git a/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java b/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java index ff3bc6d..6fe5d06 100644 --- a/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java +++ b/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java @@ -16,9 +16,6 @@ import java.awt.*; public class FoundryOverlay3D extends Overlay { - private static final int BONUS_COLOR = 0xfcd703; - private static final int BONUS_WIDGET = 49414148; - private static final int HAND_IN_WIDGET = 49414221; private static final int FINISH_ANIM = 9457; @@ -54,15 +51,11 @@ public class FoundryOverlay3D extends Overlay { return ColorScheme.PROGRESS_ERROR_COLOR; } - Widget bonusWidget = client.getWidget(BONUS_WIDGET); - if (bonusWidget != null - && bonusWidget.getChildren() != null - && bonusWidget.getChildren().length != 0 - && bonusWidget.getChild(0).getTextColor() == BONUS_COLOR) { + if (BonusWidget.isActive(client)) + { return Color.CYAN; } - int actionsLeft = helper.getActionsLeftInStage(); int heatLeft = helper.getActionsForHeatLevel(); if (actionsLeft <= 1 || heatLeft <= 1)