mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-02-05 05:30:04 +00:00
Code Issues Releases Wiki Activity

os.time( ... ) now returns float

Browse Source
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 @@ public class OSAPI implements ILuaAPI
//Get Hour of day (UTC) //Get Hour of day (UTC)
if (param.equals("utc")) { if (param.equals("utc")) {
Calendar c = Calendar.getInstance(TimeZone.getTimeZone("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) //Get Hour of day (local time)
else if (param.equals("local")) { else if (param.equals("local")) {
Calendar c = Calendar.getInstance(); 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 //Get ingame hour
else if (param.equals("ingame")) { else if (param.equals("ingame")) {