mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-24 10:27:38 +00:00
Code Issues Releases Wiki Activity

Switch a few more places to use Java 17 features

Browse Source 
New ErrorProne hint, and one which is actually pretty useful!
This commit is contained in:
Jonathan Coates
2025-03-22 09:39:47 +00:00
parent c458360b18
commit 9c0ce27ce6
19 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/core/src/main/java/dan200/computercraft/core/apis/LuaDateTime.java
View File

@@ -112,7 +112,7 @@ final class LuaDateTime {
private static int getField(Map<?, ?> table, String field, int def) throws LuaException {
var value = table.get(field);
if (value instanceof Number) return ((Number) value).intValue();
if (value instanceof Number n) return n.intValue();
if (def < 0) throw new LuaException("field \"" + field + "\" missing in date table");
return def;
}

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

@@ -110,14 +110,14 @@ public class OSAPI implements ILuaAPI {
return time;
}
private static int getDayForCalendar(Calendar c) {
var g = c instanceof GregorianCalendar ? (GregorianCalendar) c : new GregorianCalendar();
var year = c.get(Calendar.YEAR);
private static int getDayForCalendar(Calendar calendar) {
var g = calendar instanceof GregorianCalendar c ? c : new GregorianCalendar();
var year = calendar.get(Calendar.YEAR);
var day = 0;
for (var y = 1970; y < year; y++) {
day += g.isLeapYear(y) ? 366 : 365;
}
day += c.get(Calendar.DAY_OF_YEAR);
day += calendar.get(Calendar.DAY_OF_YEAR);
return day;
}
@@ -133,7 +133,7 @@ public class OSAPI implements ILuaAPI {
* @param args The parameters of the event.
* @cc.tparam string name The name of the event to queue.
* @cc.param ... The parameters of the event. These can be any primitive type (boolean, number, string) as well as
* tables. Other types (like functions), as well as metatables, will not be preserved.
* tables. Other types (like functions), as well as metatables, will not be preserved.
* @cc.see os.pullEvent To pull the event queued
*/
@LuaFunction

4
projects/core/src/main/java/dan200/computercraft/core/apis/handles/AbstractHandle.java
View File

@@ -265,8 +265,8 @@ public abstract class AbstractHandle {
checkOpen();
try {
var arg = arguments.get(0);
if (binary && arg instanceof Number) {
var number = ((Number) arg).intValue();
if (binary && arg instanceof Number n) {
var number = n.intValue();
writeSingle((byte) number);
} else {
channel.write(arguments.getBytesCoerced(0));

4
projects/core/src/main/java/dan200/computercraft/core/lua/TableImpl.java
View File

@@ -58,8 +58,8 @@ class TableImpl implements dan200.computercraft.api.lua.LuaTable<Object, Object>
private LuaValue getImpl(Object o) {
checkValid();
if (o instanceof String) return table.rawget((String) o);
if (o instanceof Integer) return table.rawget((Integer) o);
if (o instanceof String s) return table.rawget(s);
if (o instanceof Integer i) return table.rawget(i);
return Constants.NIL;
}

9
projects/core/src/main/java/dan200/computercraft/core/lua/VarargArguments.java
View File

@@ -181,8 +181,8 @@ final class VarargArguments implements IArguments {
if (isClosed()) throw new IllegalStateException("Cannot use getTableUnsafe after IArguments has been closed.");
var value = varargs.arg(index + 1);
if (!(value instanceof LuaTable)) throw LuaValues.badArgument(index, "table", value.typeName());
return new TableImpl(this, (LuaTable) value);
if (!(value instanceof LuaTable table)) throw LuaValues.badArgument(index, "table", value.typeName());
return new TableImpl(this, table);
}
@Override
@@ -191,8 +191,8 @@ final class VarargArguments implements IArguments {
var value = varargs.arg(index + 1);
if (value.isNil()) return Optional.empty();
if (!(value instanceof LuaTable)) throw LuaValues.badArgument(index, "table", value.typeName());
return Optional.of(new TableImpl(this, (LuaTable) value));
if (!(value instanceof LuaTable table)) throw LuaValues.badArgument(index, "table", value.typeName());
return Optional.of(new TableImpl(this, table));
}
@Override
@@ -237,6 +237,7 @@ final class VarargArguments implements IArguments {
return metatable != null && metatable.rawget(NAME) instanceof LuaString s ? s.toString() : null;
}
@SuppressWarnings("ArrayRecordComponent")
private record ArraySlice<T>(T[] array, int offset) {
// FIXME: We should be able to remove the @Nullables if we update NullAway.

22
projects/core/src/test/java/dan200/computercraft/core/asm/MethodTest.java
View File

@@ -48,9 +48,10 @@ public class MethodTest {
@Test
public void testDynamicPeripheral() {
ComputerBootstrap.run(
"local dynamic = peripheral.wrap('top')\n" +
"assert(dynamic.foo() == 123, 'foo: ' .. tostring(dynamic.foo()))\n" +
"assert(dynamic.bar() == 321, 'bar: ' .. tostring(dynamic.bar()))",
"""
local dynamic = peripheral.wrap('top')
assert(dynamic.foo() == 123, 'foo: ' .. tostring(dynamic.foo()))
assert(dynamic.bar() == 321, 'bar: ' .. tostring(dynamic.bar()))""",
x -> x.getEnvironment().setPeripheral(ComputerSide.TOP, new Dynamic()),
50
);
@@ -66,9 +67,10 @@ public class MethodTest {
@Test
public void testPeripheralThrow() {
ComputerBootstrap.run(
"local throw = peripheral.wrap('top')\n" +
"local _, err = pcall(function() throw.thisThread() end) assert(err == '/test.lua:2: !', (\"thisThread: %q\"):format(err))\n" +
"local _, err = pcall(function() throw.mainThread() end) assert(err == '/test.lua:3: !', (\"mainThread: %q\"):format(err))\n",
"""
local throw = peripheral.wrap('top')
local _, err = pcall(function() throw.thisThread() end) assert(err == '/test.lua:2: !', ("thisThread: %q"):format(err))
local _, err = pcall(function() throw.mainThread() end) assert(err == '/test.lua:3: !', ("mainThread: %q"):format(err))""",
x -> x.getEnvironment().setPeripheral(ComputerSide.TOP, new PeripheralThrow()),
50
);
@@ -77,8 +79,9 @@ public class MethodTest {
@Test
public void testMany() {
ComputerBootstrap.run(
"assert(many.method_0)\n" +
"assert(many.method_39)",
"""
assert(many.method_0)
assert(many.method_39)""",
x -> x.addApi(new ManyMethods()), 50);
}
@@ -94,8 +97,7 @@ public class MethodTest {
public void testModule() {
ComputerBootstrap.run(
"""
assert(require "test.module".func() == 123)
""",
assert(require "test.module".func() == 123)""",
x -> x.addApi(new IsModule()), 50);
}