mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-02-03 12:49:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mc-1.19.x' into mc-1.20.x

Browse Source
This commit is contained in:
Jonathan Coates 2023-07-07 18:10:04 +01:00
commit 9a48b53a83
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/core/src/main/java/dan200/computercraft/core/asm/MethodSupplierImpl.java
View File

@ -76,7 +76,7 @@ final class MethodSupplierImpl<T> implements MethodSupplier<T> {
for (var extra : source.getExtra()) { for (var extra : source.getExtra()) {
var extraMethods = getMethods(extra.getClass()); var extraMethods = getMethods(extra.getClass());
if (!extraMethods.isEmpty()) hasMethods = true; if (!extraMethods.isEmpty()) hasMethods = true;
for (var method : extraMethods) consumer.accept(object, method.name(), method.method(), method); for (var method : extraMethods) consumer.accept(extra, method.name(), method.method(), method);
} }
} }

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

@ -58,7 +58,7 @@ public class MethodTest {
@Test @Test
public void testExtra() { public void testExtra() {
ComputerBootstrap.run("assert(extra.go, 'go')\nassert(extra.go2, 'go2')", ComputerBootstrap.run("assert(extra.go() == nil, 'go')\nassert(extra.go2() == 456, 'go2')",
x -> x.addApi(new ExtraObject()), x -> x.addApi(new ExtraObject()),
50); 50);
} }
@ -163,7 +163,8 @@ public class MethodTest {
} }
@LuaFunction @LuaFunction
public final void go2() { public final int go2() {
return 456;
} }
@Override @Override