ymo/DreambotScripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add version info and clean up UI class

Browse Source
This commit is contained in:
Yuri Moens 2021-10-19 14:38:11 +02:00
parent 6ae9c22cb3
commit 3c8daa5189
Signed by: ymo
GPG Key ID: F6D51D6FE15BE924
4 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Util/src/io/reisub/dreambot/util/CAbstractScript.java
View File

@ -1,6 +1,7 @@
package io.reisub.dreambot.util; package io.reisub.dreambot.util;
import io.reisub.dreambot.util.ui.UI; import io.reisub.dreambot.util.ui.UI;
import org.dreambot.api.methods.MethodContext;
import org.dreambot.api.script.AbstractScript; import org.dreambot.api.script.AbstractScript;
import java.awt.*; import java.awt.*;
@ -11,7 +12,8 @@ public abstract class CAbstractScript extends AbstractScript implements MouseLis
private final UI ui; private final UI ui;
public CAbstractScript() { public CAbstractScript() {
ui = UI.getInstance(getSDNName()); ui = UI.getInstance(getSDNName() + " v" + getVersion());
MethodContext.log("Util version " + Util.getVersion());
} }
public UI getUI() { public UI getUI() {

4
Util/src/io/reisub/dreambot/util/CTaskScript.java
View File

@ -1,6 +1,7 @@
package io.reisub.dreambot.util; package io.reisub.dreambot.util;
import io.reisub.dreambot.util.ui.UI; import io.reisub.dreambot.util.ui.UI;
import org.dreambot.api.methods.MethodContext;
import org.dreambot.api.script.impl.TaskScript; import org.dreambot.api.script.impl.TaskScript;
import java.awt.*; import java.awt.*;
@ -11,7 +12,8 @@ public abstract class CTaskScript extends TaskScript implements MouseListener {
private final UI ui; private final UI ui;
public CTaskScript() { public CTaskScript() {
ui = UI.getInstance(getSDNName()); ui = UI.getInstance(getSDNName() + " v" + getVersion());
MethodContext.log("Util version " + Util.getVersion());
} }
public UI getUI() { public UI getUI() {

6
Util/src/io/reisub/dreambot/util/Util.java
View File

@ -9,6 +9,12 @@ import org.dreambot.api.wrappers.interactive.Player;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class Util { public class Util {
private static final String VERSION = "1.0.0";
public static String getVersion() {
return VERSION;
}
public static boolean playerIsIdle() { public static boolean playerIsIdle() {
return playerIsIdle(0); return playerIsIdle(0);
} }

28
Util/src/io/reisub/dreambot/util/ui/UI.java
View File

@ -9,7 +9,6 @@ import org.dreambot.api.utilities.Timer;
import java.awt.*; import java.awt.*;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
import java.awt.image.BufferedImage;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -20,11 +19,6 @@ public class UI implements MouseListener {
private final String scriptName; private final String scriptName;
private static UI ui; private static UI ui;
private Graphics g; 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 int lines = 0;
private boolean hide; private boolean hide;
private boolean drawTime = true; private boolean drawTime = true;
@ -61,10 +55,14 @@ public class UI implements MouseListener {
skillsToTrack.addAll(Arrays.asList(skills)); skillsToTrack.addAll(Arrays.asList(skills));
} }
public void setTime(boolean b) { public void setDrawTime(boolean b) {
this.drawTime = b; this.drawTime = b;
} }
public void setDrawExperience(boolean b) {
this.drawExperience = b;
}
public void setCustomLines(int customLines) { public void setCustomLines(int customLines) {
this.customLines = customLines; this.customLines = customLines;
} }
@ -93,20 +91,22 @@ public class UI implements MouseListener {
} }
private void drawUIToggle() { private void drawUIToggle() {
int x = 0;
int y = 0;
int w = 40; int w = 40;
int h = 15; int h = 15;
g.setColor(blue); g.setColor(blue);
g.drawRect(X, Y, w, h); g.drawRect(x, y, w, h);
g.setColor(gray); 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); g.setColor(Color.white);
if (hide) { if (hide) {
g.drawString("show", X+5, Y+12); g.drawString("show", x+5, y+12);
} else { } 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) { public void drawString(String s, Color color, int xPadding) {
xPadding += 5;
int yPadding = 35;
int lineSpacing = 20;
g.setColor(color); g.setColor(color);
g.drawString(s, X_PADDING + xPadding, Y_PADDING + (LINE_SPACING * lines)); g.drawString(s, xPadding, yPadding + (lineSpacing * lines));
lines++; lines++;
} }