From 3c8daa518994aedea7a0a5dda7e7435183014a43 Mon Sep 17 00:00:00 2001
From: Yuri Moens <yuri.moens@gmail.com>
Date: Tue, 19 Oct 2021 14:38:11 +0200
Subject: [PATCH] Add version info and clean up UI class

---
 .../reisub/dreambot/util/CAbstractScript.java |  4 ++-
 .../io/reisub/dreambot/util/CTaskScript.java  |  4 ++-
 Util/src/io/reisub/dreambot/util/Util.java    |  6 ++++
 Util/src/io/reisub/dreambot/util/ui/UI.java   | 28 +++++++++++--------
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/Util/src/io/reisub/dreambot/util/CAbstractScript.java b/Util/src/io/reisub/dreambot/util/CAbstractScript.java
index 41d1af4..b610958 100644
--- a/Util/src/io/reisub/dreambot/util/CAbstractScript.java
+++ b/Util/src/io/reisub/dreambot/util/CAbstractScript.java
@@ -1,6 +1,7 @@
 package io.reisub.dreambot.util;
 
 import io.reisub.dreambot.util.ui.UI;
+import org.dreambot.api.methods.MethodContext;
 import org.dreambot.api.script.AbstractScript;
 
 import java.awt.*;
@@ -11,7 +12,8 @@ public abstract class CAbstractScript extends AbstractScript implements MouseLis
     private final UI ui;
 
     public CAbstractScript() {
-        ui = UI.getInstance(getSDNName());
+        ui = UI.getInstance(getSDNName() + " v" + getVersion());
+        MethodContext.log("Util version " + Util.getVersion());
     }
 
     public UI getUI() {
diff --git a/Util/src/io/reisub/dreambot/util/CTaskScript.java b/Util/src/io/reisub/dreambot/util/CTaskScript.java
index 9190bed..d291ab0 100644
--- a/Util/src/io/reisub/dreambot/util/CTaskScript.java
+++ b/Util/src/io/reisub/dreambot/util/CTaskScript.java
@@ -1,6 +1,7 @@
 package io.reisub.dreambot.util;
 
 import io.reisub.dreambot.util.ui.UI;
+import org.dreambot.api.methods.MethodContext;
 import org.dreambot.api.script.impl.TaskScript;
 
 import java.awt.*;
@@ -11,7 +12,8 @@ public abstract class CTaskScript extends TaskScript implements MouseListener {
     private final UI ui;
 
     public CTaskScript() {
-        ui = UI.getInstance(getSDNName());
+        ui = UI.getInstance(getSDNName() + " v" + getVersion());
+        MethodContext.log("Util version " + Util.getVersion());
     }
 
     public UI getUI() {
diff --git a/Util/src/io/reisub/dreambot/util/Util.java b/Util/src/io/reisub/dreambot/util/Util.java
index f5f3636..79ac970 100644
--- a/Util/src/io/reisub/dreambot/util/Util.java
+++ b/Util/src/io/reisub/dreambot/util/Util.java
@@ -9,6 +9,12 @@ import org.dreambot.api.wrappers.interactive.Player;
 
 @SuppressWarnings("unused")
 public class Util {
+    private static final String VERSION = "1.0.0";
+
+    public static String getVersion() {
+        return VERSION;
+    }
+
     public static boolean playerIsIdle() {
         return playerIsIdle(0);
     }
diff --git a/Util/src/io/reisub/dreambot/util/ui/UI.java b/Util/src/io/reisub/dreambot/util/ui/UI.java
index 6bb1cb6..3671777 100644
--- a/Util/src/io/reisub/dreambot/util/ui/UI.java
+++ b/Util/src/io/reisub/dreambot/util/ui/UI.java
@@ -9,7 +9,6 @@ import org.dreambot.api.utilities.Timer;
 import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -20,11 +19,6 @@ public class UI implements MouseListener {
     private final String scriptName;
     private static UI ui;
     private Graphics g;
-    private int X = 0;
-    private int Y = 0;
-    private final int X_PADDING = 5;
-    private final int Y_PADDING = 35;
-    private final int LINE_SPACING = 20;
     private int lines = 0;
     private boolean hide;
     private boolean drawTime = true;
@@ -61,10 +55,14 @@ public class UI implements MouseListener {
         skillsToTrack.addAll(Arrays.asList(skills));
     }
 
-    public void setTime(boolean b) {
+    public void setDrawTime(boolean b) {
         this.drawTime = b;
     }
 
+    public void setDrawExperience(boolean b) {
+        this.drawExperience = b;
+    }
+
     public void setCustomLines(int customLines) {
         this.customLines = customLines;
     }
@@ -93,20 +91,22 @@ public class UI implements MouseListener {
     }
 
     private void drawUIToggle() {
+        int x = 0;
+        int y = 0;
         int w = 40;
         int h = 15;
 
         g.setColor(blue);
-        g.drawRect(X, Y, w, h);
+        g.drawRect(x, y, w, h);
 
         g.setColor(gray);
-        g.fillRect(X+1, Y+1, w-1, h-1);
+        g.fillRect(x+1, y+1, w-1, h-1);
 
         g.setColor(Color.white);
         if (hide) {
-            g.drawString("show", X+5, Y+12);
+            g.drawString("show", x+5, y+12);
         } else {
-            g.drawString("hide", X+5, Y+12);
+            g.drawString("hide", x+5, y+12);
         }
     }
 
@@ -152,8 +152,12 @@ public class UI implements MouseListener {
     }
 
     public void drawString(String s, Color color, int xPadding) {
+        xPadding += 5;
+        int yPadding = 35;
+        int lineSpacing = 20;
+
         g.setColor(color);
-        g.drawString(s, X_PADDING + xPadding, Y_PADDING + (LINE_SPACING * lines));
+        g.drawString(s, xPadding, yPadding + (lineSpacing * lines));
         lines++;
     }