From 40a3659552bf69c96231b79ebae5ab36e9a631b3 Mon Sep 17 00:00:00 2001 From: Ced Naru Date: Wed, 1 Jan 2025 00:29:41 +0100 Subject: [PATCH] Fix registration --- .../FreeformRegistrationFileTestClass.gdj | 4 ++-- .../CopyModificationCheckTestClass.gdj | 6 +++--- .../tests/scripts/CoreTypePropertyChecks.gdj | 4 ++-- .../tests/scripts/ScriptInOtherSourceDir.gdj | 4 ++-- .../tests/library/flattened/FLSimple.gdj | 6 +++--- .../godot_tests_library_fqname_FQNLSimple.gdj | 6 +++--- ...t_tests_library_fqname_FQNLSimpleChild.gdj | 6 +++--- .../tests/library/hierarchical/HLSimple.gdj | 6 +++--- .../godot/tests/CoreTypesIdentityTest.gdj | 4 ++-- .../tests/scripts/godot/tests/FuncRefTest.gdj | 4 ++-- .../tests/scripts/godot/tests/Invocation.gdj | 6 +++--- .../scripts/godot/tests/JavaTestClass.gdj | 4 ++-- .../godot/tests/LambdaCallableTest.gdj | 4 ++-- .../godot/tests/MultiArgsConstructorTest.gdj | 4 ++-- .../tests/args/ConstructorArgSizeTest.gdj | 4 ++-- .../godot/tests/args/FunctionArgSizeTest.gdj | 4 ++-- .../scripts/godot/tests/binding/BindingA.gdj | 4 ++-- .../scripts/godot/tests/binding/BindingB.gdj | 4 ++-- .../godot/tests/binding/BindingTest.gdj | 2 +- .../tests/callable/CallableMethodBindTest.gdj | 4 ++-- .../ConstructorRegistrationTest.gdj | 4 ++-- .../godot/tests/coretypes/BasisTest.gdj | 4 ++-- .../godot/tests/coretypes/StringTest.gdj | 4 ++-- .../godot/tests/coretypes/Vector3Test.gdj | 4 ++-- .../godot/tests/coroutine/CoroutineTest.gdj | 2 +- .../godot/tests/exception/ExceptionTest.gdj | 4 ++-- .../AbstractClassInheritanceChild.gdj | 4 ++-- .../AbstractClassInheritanceEmptyChild.gdj | 12 ++++++------ .../inheritance/ClassInheritanceChild.gdj | 4 ++-- .../inheritance/ClassInheritanceParent.gdj | 4 ++-- .../godot/tests/instance/NodeInstance.gdj | 4 ++-- .../godot/tests/instance/ObjectInstance.gdj | 2 +- .../tests/instance/RefCountedInstance.gdj | 4 ++-- .../tests/packedarray/PackedArrayTest.gdj | 4 ++-- .../tests/reflection/BaseReflectionTest.gdj | 4 ++-- .../tests/reflection/GH571_ReflectionTest.gdj | 4 ++-- .../TypedVariantArrayRegistration.gdj | 4 ++-- .../scripts/godot/tests/rpctests/RPCTests.gdj | 4 ++-- .../scripts/godot/tests/signal/SignalTest.gdj | 4 ++-- .../godot/tests/static/CallStaticTest.gdj | 4 ++-- .../godot/tests/subpackage/OtherScript.gdj | 4 ++-- .../main/java/godot/tests/JavaTestClass.java | 4 ++-- .../FunctionRegistrationGenerator.kt | 13 +++++++------ .../PropertyRegistrationGenerator.kt | 5 +++-- .../typehint/PropertyTypeHintProvider.kt | 15 ++++++++------- .../array/JvmArrayTypeHintGenerator.kt | 3 ++- .../coretypes/JvmCoreTypeTypeHintGenerator.kt | 5 +++-- .../JvmPrimitivesTypeHintGenerator.kt | 19 ++++++++++--------- .../godot/entrygenerator/model/Clazz.kt | 3 ++- 49 files changed, 126 insertions(+), 119 deletions(-) diff --git a/harness/tests/FreeformRegistrationFileTestClass.gdj b/harness/tests/FreeformRegistrationFileTestClass.gdj index 6ffea34b5e..41bc437b2d 100644 --- a/harness/tests/FreeformRegistrationFileTestClass.gdj +++ b/harness/tests/FreeformRegistrationFileTestClass.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.freeform.FreeformRegistrationFileTestClass relativeSourcePath = src/main/kotlin/godot/tests/freeform/FreeformRegistrationFileTestClass.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/CopyModificationCheckTestClass.gdj b/harness/tests/scripts/CopyModificationCheckTestClass.gdj index e4aa641995..d6c897fd37 100644 --- a/harness/tests/scripts/CopyModificationCheckTestClass.gdj +++ b/harness/tests/scripts/CopyModificationCheckTestClass.gdj @@ -6,9 +6,9 @@ fqName = CopyModificationCheckTestClass relativeSourcePath = otherSourceDir/CopyModificationCheckTestClass.kt baseType = Node3D supertypes = [ - godot.Node3D, - godot.Node, - godot.Object, + godot.api.Node3D, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/CoreTypePropertyChecks.gdj b/harness/tests/scripts/CoreTypePropertyChecks.gdj index ce48e2c444..9cb2c5b8bc 100644 --- a/harness/tests/scripts/CoreTypePropertyChecks.gdj +++ b/harness/tests/scripts/CoreTypePropertyChecks.gdj @@ -6,8 +6,8 @@ fqName = CoreTypePropertyChecks relativeSourcePath = otherSourceDir/CoreTypePropertyChecks.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/ScriptInOtherSourceDir.gdj b/harness/tests/scripts/ScriptInOtherSourceDir.gdj index a0bd010e91..ad704e9afc 100644 --- a/harness/tests/scripts/ScriptInOtherSourceDir.gdj +++ b/harness/tests/scripts/ScriptInOtherSourceDir.gdj @@ -6,8 +6,8 @@ fqName = ScriptInOtherSourceDir relativeSourcePath = otherSourceDir/ScriptInOtherSourceDir.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/dependencies/flattened-library-tests/godot/tests/library/flattened/FLSimple.gdj b/harness/tests/scripts/dependencies/flattened-library-tests/godot/tests/library/flattened/FLSimple.gdj index 0c34169019..601b71a89d 100644 --- a/harness/tests/scripts/dependencies/flattened-library-tests/godot/tests/library/flattened/FLSimple.gdj +++ b/harness/tests/scripts/dependencies/flattened-library-tests/godot/tests/library/flattened/FLSimple.gdj @@ -6,9 +6,9 @@ fqName = godot.tests.library.flattened.Simple relativeSourcePath = src/main/kotlin/godot/tests/library/flattened/Simple.kt baseType = Node3D supertypes = [ - godot.Node3D, - godot.Node, - godot.Object, + godot.api.Node3D, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/dependencies/fqname-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimple.gdj b/harness/tests/scripts/dependencies/fqname-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimple.gdj index c53081b6a5..f49fed082c 100644 --- a/harness/tests/scripts/dependencies/fqname-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimple.gdj +++ b/harness/tests/scripts/dependencies/fqname-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimple.gdj @@ -6,9 +6,9 @@ fqName = godot.tests.library.fqname.Simple relativeSourcePath = src/main/kotlin/godot/tests/library/fqname/Simple.kt baseType = Node3D supertypes = [ - godot.Node3D, - godot.Node, - godot.Object, + godot.api.Node3D, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/dependencies/fqname-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimpleChild.gdj b/harness/tests/scripts/dependencies/fqname-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimpleChild.gdj index f81df2eeab..707ca5a8e1 100644 --- a/harness/tests/scripts/dependencies/fqname-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimpleChild.gdj +++ b/harness/tests/scripts/dependencies/fqname-library-tests/godot/tests/library/fqname/godot_tests_library_fqname_FQNLSimpleChild.gdj @@ -7,9 +7,9 @@ relativeSourcePath = src/main/kotlin/godot/tests/library/fqname/SimpleChild.kt baseType = Node3D supertypes = [ godot.tests.library.fqname.Simple, - godot.Node3D, - godot.Node, - godot.Object, + godot.api.Node3D, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/dependencies/hierarchical-library-tests/godot/tests/library/hierarchical/HLSimple.gdj b/harness/tests/scripts/dependencies/hierarchical-library-tests/godot/tests/library/hierarchical/HLSimple.gdj index 832be83bd6..51f7b19067 100644 --- a/harness/tests/scripts/dependencies/hierarchical-library-tests/godot/tests/library/hierarchical/HLSimple.gdj +++ b/harness/tests/scripts/dependencies/hierarchical-library-tests/godot/tests/library/hierarchical/HLSimple.gdj @@ -6,9 +6,9 @@ fqName = godot.tests.library.hierarchical.Simple relativeSourcePath = src/main/kotlin/godot/tests/library/hierarchical/Simple.kt baseType = Node3D supertypes = [ - godot.Node3D, - godot.Node, - godot.Object, + godot.api.Node3D, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj b/harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj index b9542ccdf5..c542b7be20 100644 --- a/harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj +++ b/harness/tests/scripts/godot/tests/CoreTypesIdentityTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.CoreTypesIdentityTest relativeSourcePath = src/main/kotlin/godot/tests/CoreTypesIdentityTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/FuncRefTest.gdj b/harness/tests/scripts/godot/tests/FuncRefTest.gdj index 79590295fc..a328522126 100644 --- a/harness/tests/scripts/godot/tests/FuncRefTest.gdj +++ b/harness/tests/scripts/godot/tests/FuncRefTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.FuncRefTest relativeSourcePath = src/main/kotlin/godot/tests/FuncRefTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/Invocation.gdj b/harness/tests/scripts/godot/tests/Invocation.gdj index 5a1882042c..b6ae0b42f1 100644 --- a/harness/tests/scripts/godot/tests/Invocation.gdj +++ b/harness/tests/scripts/godot/tests/Invocation.gdj @@ -6,9 +6,9 @@ fqName = godot.tests.Invocation relativeSourcePath = src/main/kotlin/godot/tests/Invocation.kt baseType = Node3D supertypes = [ - godot.Node3D, - godot.Node, - godot.Object, + godot.api.Node3D, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/JavaTestClass.gdj b/harness/tests/scripts/godot/tests/JavaTestClass.gdj index 249d4cbf7d..655a8a716a 100644 --- a/harness/tests/scripts/godot/tests/JavaTestClass.gdj +++ b/harness/tests/scripts/godot/tests/JavaTestClass.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.JavaTestClass relativeSourcePath = src/main/java/godot/tests/JavaTestClass.java baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/LambdaCallableTest.gdj b/harness/tests/scripts/godot/tests/LambdaCallableTest.gdj index e37077369c..b1c294fcbe 100644 --- a/harness/tests/scripts/godot/tests/LambdaCallableTest.gdj +++ b/harness/tests/scripts/godot/tests/LambdaCallableTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.LambdaCallableTest relativeSourcePath = src/main/kotlin/godot/tests/LambdaCallableTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/MultiArgsConstructorTest.gdj b/harness/tests/scripts/godot/tests/MultiArgsConstructorTest.gdj index 78ecab0a5c..f13ffb2c4e 100644 --- a/harness/tests/scripts/godot/tests/MultiArgsConstructorTest.gdj +++ b/harness/tests/scripts/godot/tests/MultiArgsConstructorTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.MultiArgsConstructorTest relativeSourcePath = src/main/kotlin/godot/tests/MultiArgsConstructorTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/args/ConstructorArgSizeTest.gdj b/harness/tests/scripts/godot/tests/args/ConstructorArgSizeTest.gdj index bd7158bc8b..c118e14cfd 100644 --- a/harness/tests/scripts/godot/tests/args/ConstructorArgSizeTest.gdj +++ b/harness/tests/scripts/godot/tests/args/ConstructorArgSizeTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.args.ConstructorArgSizeTest relativeSourcePath = src/main/kotlin/godot/tests/args/ConstructorArgSizeTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/args/FunctionArgSizeTest.gdj b/harness/tests/scripts/godot/tests/args/FunctionArgSizeTest.gdj index 2d1aec8763..488e1770c2 100644 --- a/harness/tests/scripts/godot/tests/args/FunctionArgSizeTest.gdj +++ b/harness/tests/scripts/godot/tests/args/FunctionArgSizeTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.args.FunctionArgSizeTest relativeSourcePath = src/main/kotlin/godot/tests/args/FunctionArgSizeTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/binding/BindingA.gdj b/harness/tests/scripts/godot/tests/binding/BindingA.gdj index b43addfb69..25bc4cc4e9 100644 --- a/harness/tests/scripts/godot/tests/binding/BindingA.gdj +++ b/harness/tests/scripts/godot/tests/binding/BindingA.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.binding.BindingA relativeSourcePath = src/main/kotlin/godot/tests/binding/BindingA.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/binding/BindingB.gdj b/harness/tests/scripts/godot/tests/binding/BindingB.gdj index 0a9b9bbe2a..6ed3c744d7 100644 --- a/harness/tests/scripts/godot/tests/binding/BindingB.gdj +++ b/harness/tests/scripts/godot/tests/binding/BindingB.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.binding.BindingB relativeSourcePath = src/main/kotlin/godot/tests/binding/BindingB.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/binding/BindingTest.gdj b/harness/tests/scripts/godot/tests/binding/BindingTest.gdj index f02a45fd32..eb5d71ea0e 100644 --- a/harness/tests/scripts/godot/tests/binding/BindingTest.gdj +++ b/harness/tests/scripts/godot/tests/binding/BindingTest.gdj @@ -6,7 +6,7 @@ fqName = godot.tests.binding.BindingTest relativeSourcePath = src/main/kotlin/godot/tests/binding/BindingTest.kt baseType = Object supertypes = [ - godot.Object, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/callable/CallableMethodBindTest.gdj b/harness/tests/scripts/godot/tests/callable/CallableMethodBindTest.gdj index 9e0c6c284e..bbfb0c4b81 100644 --- a/harness/tests/scripts/godot/tests/callable/CallableMethodBindTest.gdj +++ b/harness/tests/scripts/godot/tests/callable/CallableMethodBindTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.callable.CallableMethodBindTest relativeSourcePath = src/main/kotlin/godot/tests/callable/CallableMethodBindTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/constructor/ConstructorRegistrationTest.gdj b/harness/tests/scripts/godot/tests/constructor/ConstructorRegistrationTest.gdj index 5e93991fae..11e4ecda6c 100644 --- a/harness/tests/scripts/godot/tests/constructor/ConstructorRegistrationTest.gdj +++ b/harness/tests/scripts/godot/tests/constructor/ConstructorRegistrationTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.constructor.ConstructorRegistrationTest relativeSourcePath = src/main/kotlin/godot/tests/constructor/ConstructorRegistrationTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/coretypes/BasisTest.gdj b/harness/tests/scripts/godot/tests/coretypes/BasisTest.gdj index 73968d8d2c..7552d5d59f 100644 --- a/harness/tests/scripts/godot/tests/coretypes/BasisTest.gdj +++ b/harness/tests/scripts/godot/tests/coretypes/BasisTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.coretypes.BasisTest relativeSourcePath = src/main/kotlin/godot/tests/coretypes/BasisTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/coretypes/StringTest.gdj b/harness/tests/scripts/godot/tests/coretypes/StringTest.gdj index 6dd1ab48bb..ce8480adba 100644 --- a/harness/tests/scripts/godot/tests/coretypes/StringTest.gdj +++ b/harness/tests/scripts/godot/tests/coretypes/StringTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.coretypes.StringTest relativeSourcePath = src/main/kotlin/godot/tests/coretypes/StringTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/coretypes/Vector3Test.gdj b/harness/tests/scripts/godot/tests/coretypes/Vector3Test.gdj index 151da1f64b..270dc59c20 100644 --- a/harness/tests/scripts/godot/tests/coretypes/Vector3Test.gdj +++ b/harness/tests/scripts/godot/tests/coretypes/Vector3Test.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.coretypes.Vector3Test relativeSourcePath = src/main/kotlin/godot/tests/coretypes/Vector3Test.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/coroutine/CoroutineTest.gdj b/harness/tests/scripts/godot/tests/coroutine/CoroutineTest.gdj index c7f99711d0..18c21850d1 100644 --- a/harness/tests/scripts/godot/tests/coroutine/CoroutineTest.gdj +++ b/harness/tests/scripts/godot/tests/coroutine/CoroutineTest.gdj @@ -6,7 +6,7 @@ fqName = godot.tests.coroutine.CoroutineTest relativeSourcePath = src/main/kotlin/godot/tests/coroutine/CoroutineTest.kt baseType = Object supertypes = [ - godot.Object, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/exception/ExceptionTest.gdj b/harness/tests/scripts/godot/tests/exception/ExceptionTest.gdj index 282ab0f973..9d393f0e33 100644 --- a/harness/tests/scripts/godot/tests/exception/ExceptionTest.gdj +++ b/harness/tests/scripts/godot/tests/exception/ExceptionTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.exception.ExceptionTest relativeSourcePath = src/main/kotlin/godot/tests/exception/ExceptionTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceChild.gdj b/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceChild.gdj index aa0e910b13..d1a76365b5 100644 --- a/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceChild.gdj +++ b/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceChild.gdj @@ -7,8 +7,8 @@ relativeSourcePath = src/main/kotlin/godot/tests/inheritance/AbstractClassInheri baseType = Node supertypes = [ godot.tests.inheritance.AbstractClassInheritanceParent, - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceEmptyChild.gdj b/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceEmptyChild.gdj index 591d52488c..90b8c2226c 100644 --- a/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceEmptyChild.gdj +++ b/harness/tests/scripts/godot/tests/inheritance/AbstractClassInheritanceEmptyChild.gdj @@ -7,12 +7,12 @@ relativeSourcePath = src/main/kotlin/godot/tests/inheritance/AbstractClassInheri baseType = CharacterBody3D supertypes = [ godot.tests.inheritance.AbstractClassInheritanceEmptyParent, - godot.CharacterBody3D, - godot.PhysicsBody3D, - godot.CollisionObject3D, - godot.Node3D, - godot.Node, - godot.Object, + godot.api.CharacterBody3D, + godot.api.PhysicsBody3D, + godot.api.CollisionObject3D, + godot.api.Node3D, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceChild.gdj b/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceChild.gdj index 5eee396cc0..1553c44b5d 100644 --- a/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceChild.gdj +++ b/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceChild.gdj @@ -7,8 +7,8 @@ relativeSourcePath = src/main/kotlin/godot/tests/inheritance/ClassInheritanceChi baseType = Node supertypes = [ godot.tests.inheritance.ClassInheritanceParent, - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceParent.gdj b/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceParent.gdj index 4109f0a0fc..c57e541b0d 100644 --- a/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceParent.gdj +++ b/harness/tests/scripts/godot/tests/inheritance/ClassInheritanceParent.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.inheritance.ClassInheritanceParent relativeSourcePath = src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/instance/NodeInstance.gdj b/harness/tests/scripts/godot/tests/instance/NodeInstance.gdj index 365e68fbd1..ffd9861be7 100644 --- a/harness/tests/scripts/godot/tests/instance/NodeInstance.gdj +++ b/harness/tests/scripts/godot/tests/instance/NodeInstance.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.instance.NodeInstance relativeSourcePath = src/main/kotlin/godot/tests/instance/NodeInstance.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/instance/ObjectInstance.gdj b/harness/tests/scripts/godot/tests/instance/ObjectInstance.gdj index bb54b76eaa..3102a82b80 100644 --- a/harness/tests/scripts/godot/tests/instance/ObjectInstance.gdj +++ b/harness/tests/scripts/godot/tests/instance/ObjectInstance.gdj @@ -6,7 +6,7 @@ fqName = godot.tests.instance.ObjectInstance relativeSourcePath = src/main/kotlin/godot/tests/instance/ObjectInstance.kt baseType = Object supertypes = [ - godot.Object, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/instance/RefCountedInstance.gdj b/harness/tests/scripts/godot/tests/instance/RefCountedInstance.gdj index 1971f99124..1552a802e3 100644 --- a/harness/tests/scripts/godot/tests/instance/RefCountedInstance.gdj +++ b/harness/tests/scripts/godot/tests/instance/RefCountedInstance.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.instance.RefCountedInstance relativeSourcePath = src/main/kotlin/godot/tests/instance/RefCountedInstance.kt baseType = RefCounted supertypes = [ - godot.RefCounted, - godot.Object, + godot.api.RefCounted, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/packedarray/PackedArrayTest.gdj b/harness/tests/scripts/godot/tests/packedarray/PackedArrayTest.gdj index 82febbdc09..07fa993352 100644 --- a/harness/tests/scripts/godot/tests/packedarray/PackedArrayTest.gdj +++ b/harness/tests/scripts/godot/tests/packedarray/PackedArrayTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.packedarray.PackedArrayTest relativeSourcePath = src/main/kotlin/godot/tests/packedarray/PackedArrayTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/reflection/BaseReflectionTest.gdj b/harness/tests/scripts/godot/tests/reflection/BaseReflectionTest.gdj index 95d7161767..7fcd9766a7 100644 --- a/harness/tests/scripts/godot/tests/reflection/BaseReflectionTest.gdj +++ b/harness/tests/scripts/godot/tests/reflection/BaseReflectionTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.reflection.BaseReflectionTest relativeSourcePath = src/main/kotlin/godot/tests/reflection/BaseReflectionTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/reflection/GH571_ReflectionTest.gdj b/harness/tests/scripts/godot/tests/reflection/GH571_ReflectionTest.gdj index 68e6621d5c..e42122d8b5 100644 --- a/harness/tests/scripts/godot/tests/reflection/GH571_ReflectionTest.gdj +++ b/harness/tests/scripts/godot/tests/reflection/GH571_ReflectionTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.reflection.GH571_ReflectionTest relativeSourcePath = src/main/kotlin/godot/tests/reflection/GH571_ReflectionTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/registration/TypedVariantArrayRegistration.gdj b/harness/tests/scripts/godot/tests/registration/TypedVariantArrayRegistration.gdj index e0200823bd..5cd0748bed 100644 --- a/harness/tests/scripts/godot/tests/registration/TypedVariantArrayRegistration.gdj +++ b/harness/tests/scripts/godot/tests/registration/TypedVariantArrayRegistration.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.registration.TypedVariantArrayRegistration relativeSourcePath = src/main/kotlin/godot/tests/registration/TypedVariantArrayRegistration.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/rpctests/RPCTests.gdj b/harness/tests/scripts/godot/tests/rpctests/RPCTests.gdj index 038b3d2726..056fa05b76 100644 --- a/harness/tests/scripts/godot/tests/rpctests/RPCTests.gdj +++ b/harness/tests/scripts/godot/tests/rpctests/RPCTests.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.rpctests.RpcTests relativeSourcePath = src/main/kotlin/godot/tests/rpctests/RpcTests.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/signal/SignalTest.gdj b/harness/tests/scripts/godot/tests/signal/SignalTest.gdj index bce9e93e96..ed1f855a8b 100644 --- a/harness/tests/scripts/godot/tests/signal/SignalTest.gdj +++ b/harness/tests/scripts/godot/tests/signal/SignalTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.signal.SignalTest relativeSourcePath = src/main/kotlin/godot/tests/signal/SignalTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/static/CallStaticTest.gdj b/harness/tests/scripts/godot/tests/static/CallStaticTest.gdj index 38323e13a9..9b407b54f4 100644 --- a/harness/tests/scripts/godot/tests/static/CallStaticTest.gdj +++ b/harness/tests/scripts/godot/tests/static/CallStaticTest.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.static.CallStaticTest relativeSourcePath = src/main/kotlin/godot/tests/static/CallStaticTest.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/scripts/godot/tests/subpackage/OtherScript.gdj b/harness/tests/scripts/godot/tests/subpackage/OtherScript.gdj index 83bd8638ef..3d90598744 100644 --- a/harness/tests/scripts/godot/tests/subpackage/OtherScript.gdj +++ b/harness/tests/scripts/godot/tests/subpackage/OtherScript.gdj @@ -6,8 +6,8 @@ fqName = godot.tests.subpackage.OtherScript relativeSourcePath = src/main/kotlin/godot/tests/subpackage/OtherScript.kt baseType = Node supertypes = [ - godot.Node, - godot.Object, + godot.api.Node, + godot.api.Object, godot.core.KtObject, godot.common.interop.NativeWrapper, godot.common.interop.NativePointer, diff --git a/harness/tests/src/main/java/godot/tests/JavaTestClass.java b/harness/tests/src/main/java/godot/tests/JavaTestClass.java index 1c58965014..ea7261e004 100644 --- a/harness/tests/src/main/java/godot/tests/JavaTestClass.java +++ b/harness/tests/src/main/java/godot/tests/JavaTestClass.java @@ -1,8 +1,8 @@ package godot.tests; -import godot.Button; +import godot.api.Button; import godot.api.Node; -import godot.RenderingServer; +import godot.api.RenderingServer; import godot.annotation.*; import godot.core.*; import org.jetbrains.annotations.NotNull; diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/FunctionRegistrationGenerator.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/FunctionRegistrationGenerator.kt index 119f3f1acd..629d1e8f53 100644 --- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/FunctionRegistrationGenerator.kt +++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/FunctionRegistrationGenerator.kt @@ -17,6 +17,7 @@ import godot.tools.common.constants.GodotKotlinJvmTypes import godot.tools.common.constants.GodotTypes import godot.tools.common.constants.KOTLIN_LIST_OF import godot.tools.common.constants.VARIANT_PARSER_NIL +import godot.tools.common.constants.godotApiPackage import godot.tools.common.constants.godotPackage import godot.tools.common.constants.godotCorePackage import godot.tools.common.constants.godotRegistrationPackage @@ -130,18 +131,18 @@ object FunctionRegistrationGenerator { private fun getRpcModeEnum(registeredFunction: RegisteredFunction): ClassName { return when (registeredFunction.annotations.getAnnotation()?.rpcMode) { null, - RpcMode.DISABLED -> ClassName("$godotPackage.${GodotTypes.rpcMode}", "RPC_MODE_DISABLED") - RpcMode.ANY -> ClassName("$godotPackage.${GodotTypes.rpcMode}", "RPC_MODE_ANY_PEER") - RpcMode.AUTHORITY -> ClassName("$godotPackage.${GodotTypes.rpcMode}", "RPC_MODE_AUTHORITY") + RpcMode.DISABLED -> ClassName("$godotApiPackage.${GodotTypes.rpcMode}", "RPC_MODE_DISABLED") + RpcMode.ANY -> ClassName("$godotApiPackage.${GodotTypes.rpcMode}", "RPC_MODE_ANY_PEER") + RpcMode.AUTHORITY -> ClassName("$godotApiPackage.${GodotTypes.rpcMode}", "RPC_MODE_AUTHORITY") } } private fun getRpcTransferModeEnum(registeredFunction: RegisteredFunction): ClassName { return when (registeredFunction.annotations.getAnnotation()?.transferMode) { null, - TransferMode.RELIABLE -> ClassName("$godotPackage.${GodotTypes.transferMode}", "TRANSFER_MODE_RELIABLE") - TransferMode.UNRELIABLE -> ClassName("$godotPackage.${GodotTypes.transferMode}", "TRANSFER_MODE_UNRELIABLE") - TransferMode.UNRELIABLE_ORDERED -> ClassName("$godotPackage.${GodotTypes.transferMode}", "TRANSFER_MODE_UNRELIABLE_ORDERED") + TransferMode.RELIABLE -> ClassName("$godotApiPackage.${GodotTypes.transferMode}", "TRANSFER_MODE_RELIABLE") + TransferMode.UNRELIABLE -> ClassName("$godotApiPackage.${GodotTypes.transferMode}", "TRANSFER_MODE_UNRELIABLE") + TransferMode.UNRELIABLE_ORDERED -> ClassName("$godotApiPackage.${GodotTypes.transferMode}", "TRANSFER_MODE_UNRELIABLE_ORDERED") } } diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/PropertyRegistrationGenerator.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/PropertyRegistrationGenerator.kt index be03e89733..aba273ed16 100644 --- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/PropertyRegistrationGenerator.kt +++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/PropertyRegistrationGenerator.kt @@ -15,6 +15,7 @@ import godot.entrygenerator.model.RegisteredClass import godot.entrygenerator.model.RegisteredProperty import godot.entrygenerator.model.TypeKind import godot.tools.common.constants.GodotTypes +import godot.tools.common.constants.godotCorePackage import godot.tools.common.constants.godotPackage object PropertyRegistrationGenerator { @@ -140,12 +141,12 @@ object PropertyRegistrationGenerator { private fun getPropertyUsage(registeredProperty: RegisteredProperty): ClassName { return if (registeredProperty.annotations.hasAnnotation()) { ClassName( - "$godotPackage.${GodotTypes.propertyUsage}", + "$godotCorePackage.${GodotTypes.propertyUsage}", "PROPERTY_USAGE_DEFAULT" ) } else { ClassName( - "$godotPackage.${GodotTypes.propertyUsage}", + "$godotCorePackage.${GodotTypes.propertyUsage}", "PROPERTY_USAGE_NONE" ) } diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/PropertyTypeHintProvider.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/PropertyTypeHintProvider.kt index e0581319a8..8fa7676aed 100644 --- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/PropertyTypeHintProvider.kt +++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/PropertyTypeHintProvider.kt @@ -15,6 +15,7 @@ import godot.entrygenerator.model.PlaceHolderTextHintAnnotation import godot.entrygenerator.model.RegisteredProperty import godot.entrygenerator.model.TypeKind import godot.tools.common.constants.GodotTypes +import godot.tools.common.constants.godotCorePackage import godot.tools.common.constants.godotPackage object PropertyTypeHintProvider { @@ -24,20 +25,20 @@ object PropertyTypeHintProvider { ): ClassName { return when { registeredProperty.type.fqName == Int::class.qualifiedName -> if (registeredProperty.annotations.hasAnnotation()) { - ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_FLAGS") + ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_FLAGS") } else { JvmPrimitivesTypeHintGenerator(registeredProperty).getPropertyTypeHint() } registeredProperty.type.fqName == String::class.qualifiedName -> when { registeredProperty.annotations.hasAnnotation() -> { ClassName( - "$godotPackage.${GodotTypes.propertyHint}", + "$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_MULTILINE_TEXT" ) } registeredProperty.annotations.hasAnnotation() -> { ClassName( - "$godotPackage.${GodotTypes.propertyHint}", + "$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_PLACEHOLDER_TEXT" ) } @@ -58,22 +59,22 @@ object PropertyTypeHintProvider { ).getPropertyTypeHint() registeredProperty.type.isRefCounted() -> ClassName( - "$godotPackage.${GodotTypes.propertyHint}", + "$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_RESOURCE_TYPE" ) registeredProperty.type.isCompatibleList() -> JvmArrayTypeHintGenerator(registeredProperty).getPropertyTypeHint() registeredProperty.type.fqName.matches(Regex("^kotlin\\.collections\\..*Set\$")) -> ClassName( - "$godotPackage.${GodotTypes.propertyHint}", + "$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_RESOURCE_TYPE" ) registeredProperty.type.isNodeType() -> ClassName( - "$godotPackage.${GodotTypes.propertyHint}", + "$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_NODE_TYPE" ) - else -> ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_NONE") + else -> ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_NONE") } } } diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/array/JvmArrayTypeHintGenerator.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/array/JvmArrayTypeHintGenerator.kt index fea83d622f..25b54d8448 100644 --- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/array/JvmArrayTypeHintGenerator.kt +++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/array/JvmArrayTypeHintGenerator.kt @@ -5,6 +5,7 @@ import godot.entrygenerator.exceptions.WrongAnnotationUsageException import godot.entrygenerator.generator.typehint.PropertyTypeHintGenerator import godot.entrygenerator.model.RegisteredProperty import godot.tools.common.constants.GodotTypes +import godot.tools.common.constants.godotCorePackage import godot.tools.common.constants.godotPackage class JvmArrayTypeHintGenerator( @@ -12,7 +13,7 @@ class JvmArrayTypeHintGenerator( ) : PropertyTypeHintGenerator(registeredProperty) { override fun getPropertyTypeHint(): ClassName { return when (propertyHintAnnotation) { - null -> ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_NONE") + null -> ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_NONE") else -> throw WrongAnnotationUsageException(registeredProperty, propertyHintAnnotation) } } diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/coretypes/JvmCoreTypeTypeHintGenerator.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/coretypes/JvmCoreTypeTypeHintGenerator.kt index ab97b18242..b203c65c0a 100644 --- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/coretypes/JvmCoreTypeTypeHintGenerator.kt +++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/coretypes/JvmCoreTypeTypeHintGenerator.kt @@ -6,6 +6,7 @@ import godot.entrygenerator.generator.typehint.PropertyTypeHintGenerator import godot.entrygenerator.model.ColorNoAlphaHintAnnotation import godot.entrygenerator.model.RegisteredProperty import godot.tools.common.constants.GodotTypes +import godot.tools.common.constants.godotCorePackage import godot.tools.common.constants.godotPackage class JvmCoreTypeTypeHintGenerator( @@ -13,12 +14,12 @@ class JvmCoreTypeTypeHintGenerator( ) : PropertyTypeHintGenerator(registeredProperty) { override fun getPropertyTypeHint(): ClassName { return when (propertyHintAnnotation) { - is ColorNoAlphaHintAnnotation -> ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_COLOR_NO_ALPHA") + is ColorNoAlphaHintAnnotation -> ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_COLOR_NO_ALPHA") //TODO: implement ImageCompressLossy //TODO: implement ImageCompressLossLess //TODO: implement NodePathToEditedNode //TODO: implement NodePathValidTypes - null -> ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_NONE") + null -> ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_NONE") else -> throw WrongAnnotationUsageException(registeredProperty, propertyHintAnnotation) } } diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/primitives/JvmPrimitivesTypeHintGenerator.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/primitives/JvmPrimitivesTypeHintGenerator.kt index fe77f9e9f4..9c167d7487 100644 --- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/primitives/JvmPrimitivesTypeHintGenerator.kt +++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/typehint/primitives/JvmPrimitivesTypeHintGenerator.kt @@ -11,6 +11,7 @@ import godot.entrygenerator.model.PlaceHolderTextHintAnnotation import godot.entrygenerator.model.RangeHintAnnotation import godot.entrygenerator.model.RegisteredProperty import godot.tools.common.constants.GodotTypes +import godot.tools.common.constants.godotCorePackage import godot.tools.common.constants.godotPackage class JvmPrimitivesTypeHintGenerator( @@ -18,21 +19,21 @@ class JvmPrimitivesTypeHintGenerator( ) : PropertyTypeHintGenerator(registeredProperty) { override fun getPropertyTypeHint(): ClassName { return when (propertyHintAnnotation) { - is RangeHintAnnotation<*> -> ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_RANGE") - is ExpEasingHintAnnotation -> ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_EXP_EASING") + is RangeHintAnnotation<*> -> ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_RANGE") + is ExpEasingHintAnnotation -> ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_EXP_EASING") is FileHintAnnotation -> if (propertyHintAnnotation.global) { - ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_GLOBAL_FILE") + ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_GLOBAL_FILE") } else { - ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_FILE") + ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_FILE") } is DirHintAnnotation -> if (propertyHintAnnotation.global) { - ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_GLOBAL_DIR") + ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_GLOBAL_DIR") } else { - ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_DIR") + ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_DIR") } - is MultilineTextHintAnnotation -> ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_MULTILINE_TEXT") - is PlaceHolderTextHintAnnotation -> ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_PLACE_HOLDER_TEXT") - null -> ClassName("$godotPackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_NONE") + is MultilineTextHintAnnotation -> ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_MULTILINE_TEXT") + is PlaceHolderTextHintAnnotation -> ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_PLACE_HOLDER_TEXT") + null -> ClassName("$godotCorePackage.${GodotTypes.propertyHint}", "PROPERTY_HINT_NONE") else -> throw WrongAnnotationUsageException(registeredProperty, propertyHintAnnotation) } diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/Clazz.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/Clazz.kt index aa9823912e..604b347e4f 100644 --- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/Clazz.kt +++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/Clazz.kt @@ -2,6 +2,7 @@ package godot.entrygenerator.model import godot.entrygenerator.ext.hasAnnotation import godot.tools.common.constants.GodotKotlinJvmTypes +import godot.tools.common.constants.godotApiPackage import godot.tools.common.constants.godotPackage open class Clazz( @@ -26,5 +27,5 @@ open class Clazz( ?.hasAnnotation() == true internal val inheritsRefCounted: Boolean - get() = supertypes.any { it.fqName == "$godotPackage.${GodotKotlinJvmTypes.refCounted}" } + get() = supertypes.any { it.fqName == "$godotApiPackage.${GodotKotlinJvmTypes.refCounted}" } }