mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2026-10-04 06:41:43 +00:00
Code Issues Releases Wiki Activity

Another build tooling bump

Browse Source 
- Update to latest MDG, to avoid decompiling Minecraft in CI.
 - Fix several Gradle warnings.
 - Bump ErrorProne, and fix a few more nits.
This commit is contained in:
Jonathan Coates
2025-12-15 12:42:38 +00:00
parent 1f5339c86e
commit ff9f038275
12 changed files with 314 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/core/src/main/java/dan200/computercraft/core/apis/OSAPI.java
+11 -24
View File
@@ -326,15 +326,15 @@ public class OSAPI implements ILuaAPI {
* * If called with {@code local}, returns the number of days since 1
* January 1970 in the server's local timezone.
*
* @param args The locale to get the day for. Defaults to {@code ingame} if not set.
* @param locale The locale to get the day for. Defaults to {@code ingame} if not set.
* @return The day depending on the selected locale.
* @throws LuaException If an invalid locale is passed.
* @cc.since 1.48
* @cc.changed 1.82.0 Arguments are now case insensitive.
*/
@LuaFunction
public final int day(Optional<String> args) throws LuaException {
return switch (args.orElse("ingame").toLowerCase(Locale.ROOT)) {
public final int day(Optional<String> locale) throws LuaException {
return switch (locale.orElse("ingame").toLowerCase(Locale.ROOT)) {
case "utc" -> getDayForCalendar(Calendar.getInstance(TimeZone.getTimeZone("UTC")));
case "local" -> getDayForCalendar(Calendar.getInstance());
case "ingame" -> day;
@@ -359,7 +359,7 @@ public class OSAPI implements ILuaAPI {
* > milliseconds. If you wish to convert this value to real time, divide by 72000; to
* > convert to ticks (where a day is 24000 ticks), divide by 3600.
*
* @param args The locale to get the milliseconds for. Defaults to {@code ingame} if not set.
* @param locale The locale to get the milliseconds for. Defaults to {@code ingame} if not set.
* @return The milliseconds since the epoch depending on the selected locale.
* @throws LuaException If an invalid locale is passed.
* @cc.since 1.80pr1
@@ -372,26 +372,13 @@ public class OSAPI implements ILuaAPI {
* }</pre>
*/
@LuaFunction
public final long epoch(Optional<String> args) throws LuaException {
switch (args.orElse("ingame").toLowerCase(Locale.ROOT)) {
case "utc": {
// Get utc epoch
var c = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
return getEpochForCalendar(c);
}
case "local": {
// Get local epoch
var c = Calendar.getInstance();
return getEpochForCalendar(c);
}
case "ingame":
// Get in-game epoch
synchronized (alarms) {
return day * 86400000L + (long) (time * 3600000.0);
}
default:
throw new LuaException("Unsupported operation");
}
public final long epoch(Optional<String> locale) throws LuaException {
return switch (locale.orElse("ingame").toLowerCase(Locale.ROOT)) {
case "utc" -> getEpochForCalendar(Calendar.getInstance(TimeZone.getTimeZone("UTC"))); // Get utc epoch
case "local" -> getEpochForCalendar(Calendar.getInstance()); // Get local epoch
case "ingame" -> day * 86400000L + (long) (time * 3600000.0); // Get in-game epoch
default -> throw new LuaException("Unsupported operation");
};
}
/**
projects/core/src/test/java/dan200/computercraft/core/ComputerTestDelegate.java
+5 -11
View File
@@ -432,17 +432,11 @@ public class ComputerTestDelegate {
}
switch (status) {
case "ok":
break;
case "pending":
runResult = new TestAbortedException("Test is pending");
break;
case "fail":
runResult = new AssertionFailedError(wholeMessage.toString());
break;
case "error":
runResult = new IllegalStateException(wholeMessage.toString());
break;
case "ok" -> {
}
case "pending" -> runResult = new TestAbortedException("Test is pending");
case "fail" -> runResult = new AssertionFailedError(wholeMessage.toString());
case "error" -> runResult = new IllegalStateException(wholeMessage.toString());
}
runFinished = true;
projects/core/src/test/java/dan200/computercraft/core/terminal/TerminalTest.java
+1 -1
View File
@@ -585,7 +585,7 @@ class TerminalTest {
}
}
public Matcher<Terminal> matches() {
private Matcher<Terminal> matches() {
return allOf(
textMatches(textLines), textColourMatches(textColourLines), backgroundColourMatches(backgroundColourLines)
);