From 6ae9c22cb3ded1e8ecbbb3ad807346470d182ce5 Mon Sep 17 00:00:00 2001
From: Yuri Moens <yuri.moens@gmail.com>
Date: Tue, 19 Oct 2021 14:10:05 +0200
Subject: [PATCH] Add UI to CAgility

---
 .../io/reisub/dreambot/cagility/CAgility.java | 19 +++++++++++++++++--
 .../dreambot/cagility/tasks/PickupMark.java   |  8 ++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/CAgility/src/io/reisub/dreambot/cagility/CAgility.java b/CAgility/src/io/reisub/dreambot/cagility/CAgility.java
index cf99780..6cf4bd6 100644
--- a/CAgility/src/io/reisub/dreambot/cagility/CAgility.java
+++ b/CAgility/src/io/reisub/dreambot/cagility/CAgility.java
@@ -2,21 +2,28 @@ package io.reisub.dreambot.cagility;
 
 import io.reisub.dreambot.cagility.tasks.HandleObstacle;
 import io.reisub.dreambot.cagility.tasks.PickupMark;
+import io.reisub.dreambot.util.CTaskScript;
 import io.reisub.dreambot.util.Constants;
 import io.reisub.dreambot.util.randomevents.GenieSolver;
 import io.reisub.dreambot.util.tasks.Eat;
 import io.reisub.dreambot.util.tasks.kitten.KittenTask;
+import org.dreambot.api.methods.skills.Skill;
 import org.dreambot.api.script.Category;
 import org.dreambot.api.script.ScriptManifest;
-import org.dreambot.api.script.impl.TaskScript;
+import org.dreambot.api.utilities.Timer;
+
+import java.awt.*;
 
 @SuppressWarnings("unused")
 @ScriptManifest(category = Category.AGILITY, name = "CAgility", description = "Runs laps for days", author = Constants.AUTHOR, version = 1.0)
-public class CAgility extends TaskScript {
+public class CAgility extends CTaskScript {
     @Override
     public void onStart() {
         getRandomManager().registerSolver(new GenieSolver(GenieSolver.Skill.HERBLORE));
 
+        getUI().addSkills(Skill.AGILITY);
+        getUI().setCustomLines(1);
+
         addNodes(
                 new Eat(),
                 KittenTask.createKittenTask(),
@@ -24,4 +31,12 @@ public class CAgility extends TaskScript {
                 new PickupMark()
         );
     }
+
+    @Override
+    public void onPaint(Graphics g) {
+        super.onPaint(g);
+
+        int marks = PickupMark.marksPickedUp;
+        getUI().drawString("Marks picked up: " + marks + " (" + getUI().getHourlyRate(marks) + " per hour)");
+    }
 }
diff --git a/CAgility/src/io/reisub/dreambot/cagility/tasks/PickupMark.java b/CAgility/src/io/reisub/dreambot/cagility/tasks/PickupMark.java
index 2f1790d..cd2945d 100644
--- a/CAgility/src/io/reisub/dreambot/cagility/tasks/PickupMark.java
+++ b/CAgility/src/io/reisub/dreambot/cagility/tasks/PickupMark.java
@@ -11,6 +11,8 @@ import org.dreambot.api.wrappers.items.GroundItem;
 import org.dreambot.api.wrappers.items.Item;
 
 public class PickupMark extends TaskNode {
+    public static int marksPickedUp = 0;
+
     @Override
     public boolean accept() {
         GroundItem mark = GroundItems.closest(Constants.MARK_OF_GRACE);
@@ -29,10 +31,12 @@ public class PickupMark extends TaskNode {
 
         mark.interact();
 
-        MethodContext.sleepUntil(() -> {
+        if (MethodContext.sleepUntil(() -> {
             Item currentMarks = Inventory.get(Constants.MARK_OF_GRACE);
             return currentMarks != null && currentMarks.getAmount() > count;
-        }, Calculations.random(5000, 5500));
+        }, Calculations.random(5000, 5500))) {
+            marksPickedUp++;
+        }
 
         return Calculations.random(250, 400);
     }