Skip to content

Commit 8aebfd0

Browse files
committed
Fix JNI
1 parent da91422 commit 8aebfd0

File tree

2 files changed

+33
-9
lines changed

2 files changed

+33
-9
lines changed

kt/plugins/godot-gradle-plugin/src/main/resources/godot/gradle/godot-kotlin-graal-jni-config.json

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,10 @@
330330
{ "name" : "engine_call_to_float64_array", "parameterTypes" : ["long"] },
331331
{ "name" : "engine_call_to_int32_array", "parameterTypes" : ["long"] },
332332
{ "name" : "engine_call_to_int64_array", "parameterTypes" : ["long"] },
333-
{ "name" : "engine_call_size", "parameterTypes" : ["long"] }
333+
{ "name" : "engine_call_size", "parameterTypes" : ["long"] },
334+
335+
{ "name" : "engine_convert_to_godot", "parameterTypes" : ["byte[]"] },
336+
{ "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] }
334337
]
335338
},
336339
{
@@ -398,7 +401,10 @@
398401
{ "name" : "engine_call_size", "parameterTypes" : ["long"] },
399402
{ "name" : "engine_call_slice", "parameterTypes" : ["long"] },
400403
{ "name" : "engine_call_sort", "parameterTypes" : ["long"] },
401-
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }
404+
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] },
405+
406+
{ "name" : "engine_convert_to_godot", "parameterTypes" : ["float[]"] },
407+
{ "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] }
402408
]
403409
},
404410
{
@@ -432,7 +438,10 @@
432438
{ "name" : "engine_call_size", "parameterTypes" : ["long"] },
433439
{ "name" : "engine_call_slice", "parameterTypes" : ["long"] },
434440
{ "name" : "engine_call_sort", "parameterTypes" : ["long"] },
435-
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }
441+
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] },
442+
443+
{ "name" : "engine_convert_to_godot", "parameterTypes" : ["double[]"] },
444+
{ "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] }
436445
]
437446
},
438447
{
@@ -466,7 +475,10 @@
466475
{ "name" : "engine_call_size", "parameterTypes" : ["long"] },
467476
{ "name" : "engine_call_slice", "parameterTypes" : ["long"] },
468477
{ "name" : "engine_call_sort", "parameterTypes" : ["long"] },
469-
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }
478+
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] },
479+
480+
{ "name" : "engine_convert_to_godot", "parameterTypes" : ["int[]"] },
481+
{ "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] }
470482
]
471483
},
472484
{
@@ -500,7 +512,10 @@
500512
{ "name" : "engine_call_size", "parameterTypes" : ["long"] },
501513
{ "name" : "engine_call_slice", "parameterTypes" : ["long"] },
502514
{ "name" : "engine_call_sort", "parameterTypes" : ["long"] },
503-
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }
515+
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] },
516+
517+
{ "name" : "engine_convert_to_godot", "parameterTypes" : ["long[]"] },
518+
{ "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] }
504519
]
505520
},
506521
{
@@ -568,7 +583,10 @@
568583
{ "name" : "engine_call_size", "parameterTypes" : ["long"] },
569584
{ "name" : "engine_call_slice", "parameterTypes" : ["long"] },
570585
{ "name" : "engine_call_sort", "parameterTypes" : ["long"] },
571-
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }
586+
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] },
587+
588+
{ "name" : "engine_convert_to_godot", "parameterTypes" : ["float[]"] },
589+
{ "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] }
572590
]
573591
},
574592
{
@@ -602,7 +620,10 @@
602620
{ "name" : "engine_call_size", "parameterTypes" : ["long"] },
603621
{ "name" : "engine_call_slice", "parameterTypes" : ["long"] },
604622
{ "name" : "engine_call_sort", "parameterTypes" : ["long"] },
605-
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }
623+
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] },
624+
625+
{ "name" : "engine_convert_to_godot", "parameterTypes" : ["float[]"] },
626+
{ "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] }
606627
]
607628
},
608629
{
@@ -636,7 +657,10 @@
636657
{ "name" : "engine_call_size", "parameterTypes" : ["long"] },
637658
{ "name" : "engine_call_slice", "parameterTypes" : ["long"] },
638659
{ "name" : "engine_call_sort", "parameterTypes" : ["long"] },
639-
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] }
660+
{ "name" : "engine_call_to_byte_array", "parameterTypes" : ["long"] },
661+
662+
{ "name" : "engine_convert_to_godot", "parameterTypes" : ["float[]"] },
663+
{ "name" : "engine_convert_to_jvm", "parameterTypes" : ["long"] }
640664
]
641665
},
642666
{

src/jvm_wrapper/bridge/callable_bridge.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "jvm_wrapper/jvm_singleton_wrapper.h"
55

66
namespace bridges {
7-
JVM_SINGLETON_WRAPPER(CallableBridge, "godot.core.NativeCallable$Bridge") {
7+
JVM_SINGLETON_WRAPPER(CallableBridge, "godot.core.Callable$Bridge") {
88
SINGLETON_CLASS(CallableBridge)
99

1010
// clang-format off

0 commit comments

Comments
 (0)