Added clock
This commit is contained in:
parent
207789595f
commit
5ac413bd26
|
@ -40,18 +40,24 @@ public class Clicker implements Runnable{
|
||||||
|
|
||||||
OSType os;
|
OSType os;
|
||||||
|
|
||||||
|
long started = -1;
|
||||||
|
|
||||||
private void sleep( int ms) {
|
private void sleep( int ms) {
|
||||||
|
//update ui
|
||||||
|
Main.get().ui.printTime((int) ( (System.currentTimeMillis()-started) / 1000 ));
|
||||||
|
|
||||||
if(skipbattle)
|
if(skipbattle)
|
||||||
return;
|
return;
|
||||||
try {
|
try {
|
||||||
Thread.sleep(ms);
|
if(ms > 1000) {
|
||||||
while(paused) {
|
Thread.sleep(1000);
|
||||||
|
sleep(ms-1000);
|
||||||
|
} else
|
||||||
|
Thread.sleep(ms);
|
||||||
|
while(paused & should_run) {
|
||||||
Thread.sleep(75);
|
Thread.sleep(75);
|
||||||
}
|
}
|
||||||
} catch (InterruptedException e) {//when skip is applyed
|
} catch (InterruptedException e) { } //when skip is applyed, or the bot gets stopped
|
||||||
;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void start() {
|
public void start() {
|
||||||
|
@ -60,11 +66,13 @@ public class Clicker implements Runnable{
|
||||||
running = true;
|
running = true;
|
||||||
thread = new Thread(this, "BOT");
|
thread = new Thread(this, "BOT");
|
||||||
thread.start();
|
thread.start();
|
||||||
|
started = System.currentTimeMillis();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void stop() {
|
public void stop() {
|
||||||
should_run = false;
|
should_run = false;
|
||||||
|
skipbattle = true;
|
||||||
while(running) {
|
while(running) {
|
||||||
thread.interrupt();//stop that shit (its maybe sleeping)
|
thread.interrupt();//stop that shit (its maybe sleeping)
|
||||||
}
|
}
|
||||||
|
@ -142,7 +150,7 @@ public class Clicker implements Runnable{
|
||||||
// eingestellter wert (0.1 sec) ggf. durch 2 teilen vergangene zeit abziehen (zeit fürs setztem der letzten truppen)
|
// eingestellter wert (0.1 sec) ggf. durch 2 teilen vergangene zeit abziehen (zeit fürs setztem der letzten truppen)
|
||||||
int waittime = ( (int) (((truppenwait * 100) / modifier) - (System.currentTimeMillis()- lastwait)) );//how long to wait?
|
int waittime = ( (int) (((truppenwait * 100) / modifier) - (System.currentTimeMillis()- lastwait)) );//how long to wait?
|
||||||
Main.get().ui.info("Waiting for: " + waittime);
|
Main.get().ui.info("Waiting for: " + waittime);
|
||||||
while (waittime > 1500 & !skipbattle) {//check for the ok-button every 3 seconds
|
while (waittime > 1500 & !skipbattle & should_run) {//check for the ok-button every 3 seconds
|
||||||
long startwait = System.currentTimeMillis();//record needed time
|
long startwait = System.currentTimeMillis();//record needed time
|
||||||
if(checkOK(end, rob, ok_button)) {//check
|
if(checkOK(end, rob, ok_button)) {//check
|
||||||
Main.get().ui.info("OK-button detected!");
|
Main.get().ui.info("OK-button detected!");
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
package mrbesen.cr.auto.clicker;
|
package mrbesen.cr.auto.clicker;
|
||||||
|
|
||||||
|
import java.awt.BorderLayout;
|
||||||
import java.awt.Color;
|
import java.awt.Color;
|
||||||
|
import java.awt.Dimension;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
import java.awt.event.ActionListener;
|
import java.awt.event.ActionListener;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
@ -9,6 +11,8 @@ import java.io.IOException;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
|
|
||||||
|
import javax.swing.Box;
|
||||||
|
import javax.swing.BoxLayout;
|
||||||
import javax.swing.JButton;
|
import javax.swing.JButton;
|
||||||
import javax.swing.JCheckBox;
|
import javax.swing.JCheckBox;
|
||||||
import javax.swing.JFrame;
|
import javax.swing.JFrame;
|
||||||
|
@ -31,8 +35,9 @@ public class UI implements ActionListener {
|
||||||
|
|
||||||
private JPanel root = new JPanel();
|
private JPanel root = new JPanel();
|
||||||
private JPanel top = new JPanel();
|
private JPanel top = new JPanel();
|
||||||
|
private JPanel middle = new JPanel();
|
||||||
|
private JPanel sliderpanel = new JPanel();
|
||||||
private JPanel bottom = new JPanel();
|
private JPanel bottom = new JPanel();
|
||||||
//JPanel slider = new JPanel();
|
|
||||||
|
|
||||||
private JMenuBar menubar = new JMenuBar();
|
private JMenuBar menubar = new JMenuBar();
|
||||||
private JMenu file_ = new JMenu("File");
|
private JMenu file_ = new JMenu("File");
|
||||||
|
@ -60,6 +65,7 @@ public class UI implements ActionListener {
|
||||||
private JButton exit = new JButton("EXIT");
|
private JButton exit = new JButton("EXIT");
|
||||||
|
|
||||||
private JLabel info = new JLabel("Define positions, to start.");
|
private JLabel info = new JLabel("Define positions, to start.");
|
||||||
|
private JLabel time = new JLabel("0 s");
|
||||||
|
|
||||||
private Slider[] slider = {
|
private Slider[] slider = {
|
||||||
new Slider("Waittime: ","s", 1,300,180,-1, null, new Updater() {
|
new Slider("Waittime: ","s", 1,300,180,-1, null, new Updater() {
|
||||||
|
@ -75,9 +81,11 @@ public class UI implements ActionListener {
|
||||||
}
|
}
|
||||||
},false)
|
},false)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
Clicker bot = new Clicker();
|
Clicker bot = new Clicker();
|
||||||
|
|
||||||
|
|
||||||
private File file = new File(".profile");
|
private File file = new File(".profile");
|
||||||
|
|
||||||
public UI() {
|
public UI() {
|
||||||
|
@ -109,29 +117,32 @@ public class UI implements ActionListener {
|
||||||
doubleplace.addActionListener(this);
|
doubleplace.addActionListener(this);
|
||||||
backfocus.addActionListener(this);
|
backfocus.addActionListener(this);
|
||||||
|
|
||||||
for(PosSelector poss : posselctors) {
|
for(PosSelector poss : posselctors) {//construct PosSelector Panel
|
||||||
top.add(poss.button);
|
top.add(poss.button);
|
||||||
}
|
}
|
||||||
|
|
||||||
bottom.add(start);
|
middle.add(start);//construct button paneö
|
||||||
bottom.add(skip);
|
middle.add(skip);
|
||||||
bottom.add(pause);
|
middle.add(pause);
|
||||||
bottom.add(exit);
|
middle.add(exit);
|
||||||
bottom.add(autoplay);
|
middle.add(autoplay);
|
||||||
bottom.add(doubleplace);
|
middle.add(doubleplace);
|
||||||
bottom.add(backfocus);
|
middle.add(backfocus);
|
||||||
|
|
||||||
root.add(top);
|
for(Slider s : slider) {//construct slider panel
|
||||||
|
sliderpanel.add(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
bottom.add(info);//construct bottom panel
|
||||||
|
bottom.add(Box.createRigidArea(new Dimension(150, 5)));
|
||||||
|
bottom.add(time);
|
||||||
|
|
||||||
|
root.add(top);//add every pannel
|
||||||
|
root.add(middle);
|
||||||
|
root.add(sliderpanel);
|
||||||
root.add(bottom);
|
root.add(bottom);
|
||||||
|
|
||||||
root.add(info);
|
frame.add(root);//create frame
|
||||||
|
|
||||||
for(Slider s : slider) {
|
|
||||||
root.add(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
frame.add(root);
|
|
||||||
|
|
||||||
frame.setVisible(true);
|
frame.setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -286,11 +297,67 @@ public class UI implements ActionListener {
|
||||||
info.setText(a);
|
info.setText(a);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the time label to this time.
|
||||||
|
* @param seconds in seconds.
|
||||||
|
* Negative time is set to zero.
|
||||||
|
*/
|
||||||
|
public void printTime(int seconds) {
|
||||||
|
if(seconds < 0)//not allowed
|
||||||
|
seconds = 0;
|
||||||
|
|
||||||
|
StringBuilder out = new StringBuilder();
|
||||||
|
|
||||||
|
int d = 0;
|
||||||
|
while(seconds >= 86400) {
|
||||||
|
seconds -= 86400;
|
||||||
|
d ++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(d > 0) {
|
||||||
|
out.append(d);
|
||||||
|
out.append("d ");
|
||||||
|
}
|
||||||
|
|
||||||
|
int h = 0;//hours
|
||||||
|
while(seconds >= 3600) {
|
||||||
|
seconds -= 3600;
|
||||||
|
h ++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(h > 0) {
|
||||||
|
out.append(h);
|
||||||
|
out.append("h ");
|
||||||
|
}
|
||||||
|
|
||||||
|
int m = 0;//min
|
||||||
|
while(seconds >= 60) {
|
||||||
|
seconds -= 60;
|
||||||
|
m ++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(m > 0) {
|
||||||
|
out.append(m);
|
||||||
|
out.append("m ");
|
||||||
|
}
|
||||||
|
|
||||||
|
if(seconds > 0) {
|
||||||
|
out.append(seconds);
|
||||||
|
out.append("s");
|
||||||
|
}
|
||||||
|
|
||||||
|
if(out.length() == 0)
|
||||||
|
out.append('-');//nothing
|
||||||
|
|
||||||
|
time.setText(out.toString());
|
||||||
|
}
|
||||||
|
|
||||||
public void setPositionDone() {
|
public void setPositionDone() {
|
||||||
isSelectionRunning = false;
|
isSelectionRunning = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public interface Updater {
|
public interface Updater {
|
||||||
public void update(int nummber);
|
public void update(int nummber);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue