mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

os.time( ... ) now returns float

This commit is contained in:
Tim Ittermann 2017-05-06 14:52:02 +02:00
parent f89bbeee54
commit f1c4634dfa
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/dan200/computercraft/core/apis/OSAPI.java
View File

@ -301,12 +301,16 @@ else if (args.length > 0 && args[0] != null && args[0] instanceof String) {
//Get Hour of day (UTC)
if (param.equals("utc")) {
Calendar c = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
return new Object[] {c.get(Calendar.HOUR_OF_DAY)};
float hourOfDay = c.get(Calendar.HOUR_OF_DAY);
hourOfDay += ((float)c.get(Calendar.MINUTE)/60)+(float)(c.get(Calendar.SECOND)/60*60);
return new Object[] {hourOfDay};
}
//Get Hour of day (local time)
else if (param.equals("local")) {
Calendar c = Calendar.getInstance();
return new Object[] {c.get(Calendar.HOUR_OF_DAY)};
float hourOfDay = c.get(Calendar.HOUR_OF_DAY);
hourOfDay += ((float)c.get(Calendar.MINUTE)/60)+(float)(c.get(Calendar.SECOND)/60*60);
return new Object[] {hourOfDay};
}
//Get ingame hour
else if (param.equals("ingame")) {