2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-03 00:37:55 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Merge pull request #238 from Parabot/feature/timer-days

Browse Source 
[Feature] Added days into Timer
This commit is contained in:
Jeroen Ketelaar
2018-01-03 00:40:02 +01:00
committed by GitHub
parent 4162d4b032 2e1817d254
commit 9d1c4533ca
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/parabot/environment/api/utils/Timer.java
+11 -5
View File
@@ -15,7 +15,6 @@ public class Timer {
* @param end * @param end
*/ */
public Timer(long end) { public Timer(long end) {
start = System.currentTimeMillis(); start = System.currentTimeMillis();
this.end = System.currentTimeMillis() + end; this.end = System.currentTimeMillis() + end;
} }
@@ -99,7 +98,7 @@ public class Timer {
} }
/** /**
* Generates string based on HH:MM:SS * Generates string based on DD:HH:MM:SS
* *
* @return String * @return String
*/ */
@@ -107,9 +106,16 @@ public class Timer {
public String toString() { public String toString() {
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
long elapsed = getElapsedTime(); long elapsed = getElapsedTime();
int second = (int) (elapsed / 1000 % 60); int day = (int) (elapsed / 86400000);
int minute = (int) (elapsed / 60000 % 60); elapsed -= day * 86400000;
int hour = (int) (elapsed / 3600000 % 60); int hour = (int) (elapsed / 3600000);
elapsed -= hour * 3600000;
int minute = (int) (elapsed / 60000);
elapsed -= minute * 60000;
int second = (int) (elapsed / 1000);
if (day > 0) {
b.append(day).append("d:");
}
b.append(hour < 10 ? "0" : "").append(hour).append(":"); b.append(hour < 10 ? "0" : "").append(hour).append(":");
b.append(minute < 10 ? "0" : "").append(minute).append(":"); b.append(minute < 10 ? "0" : "").append(minute).append(":");
b.append(second < 10 ? "0" : "").append(second); b.append(second < 10 ? "0" : "").append(second);