From 7627398c11a3c3f44fe96389e4aa17e4069dfb9c Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sat, 12 Oct 2024 18:49:33 +0200
Subject: [PATCH 01/18] Add todo for annotation rework

---
 TODO.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 TODO.md

diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000000..b01b164c4a
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,22 @@
+# Annotations rework
+
+Replace existing annotations with:
+- `GodotScript` -> classes
+- `GodotMember` -> functions, properties (also allow signals but not relevant for them)
+
+Add meta annotation to api signals and overridable api functions: `GodotApiMember`.
+
+# New processing logic
+## Properties
+1. Collect all properties from hierarchy
+2. Filter by existence of `GodotMember` annotation
+
+## Functions
+1. Collect all functions from hierarchy
+2. Filter by existence of `GodotMember` annotation or override function which has the annotation `GodotApiMember`
+
+## Signals
+1. Collect all properties from hierarchy
+2. Filter by type signal
+3. Filter not has annotation `GodotApiMember`
+

From c40141c03c4f588a259bce7a0e26898e7ea9574e Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sat, 12 Oct 2024 19:14:25 +0200
Subject: [PATCH 02/18] Add `GodotApiMember` to api functions and signals for
 easier detection in the symbol processor

---
 .../tests/scripts/godot/tests/Invocation.gdj  |   1 +
 .../scripts/godot/tests/JavaTestClass.gdj     |   3 +-
 .../services/impl/GenerationService.kt        |  15 +-
 .../kotlin/godot/annotation/GodotApiMember.kt |  10 +
 .../main/kotlin/godot/gen/godot/AStar2D.kt    |   3 +
 .../main/kotlin/godot/gen/godot/AStar3D.kt    |   3 +
 .../kotlin/godot/gen/godot/AStarGrid2D.kt     |   3 +
 .../kotlin/godot/gen/godot/AcceptDialog.kt    |   4 +
 .../godot/gen/godot/AnimatedSprite2D.kt       |   6 +
 .../godot/gen/godot/AnimatedSprite3D.kt       |   6 +
 .../godot/gen/godot/AnimationLibrary.kt       |   5 +
 .../kotlin/godot/gen/godot/AnimationMixer.kt  |   9 +
 .../kotlin/godot/gen/godot/AnimationNode.kt   |  12 +
 .../gen/godot/AnimationNodeBlendSpace2D.kt    |   2 +
 .../godot/gen/godot/AnimationNodeBlendTree.kt |   2 +
 .../AnimationNodeStateMachineTransition.kt    |   2 +
 .../kotlin/godot/gen/godot/AnimationPlayer.kt |   3 +
 .../kotlin/godot/gen/godot/AnimationTree.kt   |   2 +
 .../src/main/kotlin/godot/gen/godot/Area2D.kt |   9 +
 .../src/main/kotlin/godot/gen/godot/Area3D.kt |   9 +
 .../kotlin/godot/gen/godot/AudioEffect.kt     |   2 +
 .../godot/gen/godot/AudioEffectInstance.kt    |   2 +
 .../kotlin/godot/gen/godot/AudioServer.kt     |   3 +
 .../kotlin/godot/gen/godot/AudioStream.kt     |   9 +
 .../godot/gen/godot/AudioStreamPlayback.kt    |  10 +
 .../gen/godot/AudioStreamPlaybackResampled.kt |   2 +
 .../godot/gen/godot/AudioStreamPlayer.kt      |   2 +
 .../godot/gen/godot/AudioStreamPlayer2D.kt    |   2 +
 .../godot/gen/godot/AudioStreamPlayer3D.kt    |   2 +
 .../main/kotlin/godot/gen/godot/BaseButton.kt |   7 +
 .../main/kotlin/godot/gen/godot/BoneMap.kt    |   3 +
 .../kotlin/godot/gen/godot/ButtonGroup.kt     |   2 +
 .../kotlin/godot/gen/godot/CPUParticles2D.kt  |   2 +
 .../kotlin/godot/gen/godot/CPUParticles3D.kt  |   2 +
 .../kotlin/godot/gen/godot/CameraServer.kt    |   3 +
 .../main/kotlin/godot/gen/godot/CanvasItem.kt |   6 +
 .../kotlin/godot/gen/godot/CanvasLayer.kt     |   2 +
 .../main/kotlin/godot/gen/godot/CodeEdit.kt   |   8 +
 .../godot/gen/godot/CollisionObject2D.kt      |  11 +
 .../godot/gen/godot/CollisionObject3D.kt      |   7 +
 .../kotlin/godot/gen/godot/ColorPicker.kt     |   4 +
 .../godot/gen/godot/ColorPickerButton.kt      |   4 +
 .../godot/gen/godot/CompositorEffect.kt       |   2 +
 .../main/kotlin/godot/gen/godot/Container.kt  |   5 +
 .../main/kotlin/godot/gen/godot/Control.kt    |  19 ++
 .../src/main/kotlin/godot/gen/godot/Curve.kt  |   2 +
 .../kotlin/godot/gen/godot/EngineProfiler.kt  |   4 +
 .../main/kotlin/godot/gen/godot/FileDialog.kt |   4 +
 .../godot/gen/godot/GDExtensionManager.kt     |   2 +
 .../godot/gen/godot/GLTFDocumentExtension.kt  |  20 ++
 .../kotlin/godot/gen/godot/GPUParticles2D.kt  |   2 +
 .../kotlin/godot/gen/godot/GPUParticles3D.kt  |   2 +
 .../main/kotlin/godot/gen/godot/GraphEdit.kt  |  23 ++
 .../kotlin/godot/gen/godot/GraphElement.kt    |   9 +
 .../main/kotlin/godot/gen/godot/GraphFrame.kt |   2 +
 .../main/kotlin/godot/gen/godot/GraphNode.kt  |   3 +
 .../main/kotlin/godot/gen/godot/GridMap.kt    |   3 +
 .../kotlin/godot/gen/godot/HTTPRequest.kt     |   2 +
 .../gen/godot/ImageFormatLoaderExtension.kt   |   3 +
 .../src/main/kotlin/godot/gen/godot/Input.kt  |   2 +
 .../main/kotlin/godot/gen/godot/ItemList.kt   |   6 +
 .../godot/gen/godot/JavaScriptBridge.kt       |   2 +
 .../main/kotlin/godot/gen/godot/LineEdit.kt   |   4 +
 .../main/kotlin/godot/gen/godot/MainLoop.kt   |   6 +
 .../main/kotlin/godot/gen/godot/Material.kt   |   5 +
 .../main/kotlin/godot/gen/godot/MenuButton.kt |   2 +
 .../src/main/kotlin/godot/gen/godot/Mesh.kt   |  15 ++
 .../kotlin/godot/gen/godot/MeshInstance2D.kt  |   2 +
 .../kotlin/godot/gen/godot/MovieWriter.kt     |   6 +
 .../godot/gen/godot/MultiMeshInstance2D.kt    |   2 +
 .../kotlin/godot/gen/godot/MultiplayerAPI.kt  |   6 +
 .../gen/godot/MultiplayerAPIExtension.kt      |  10 +
 .../kotlin/godot/gen/godot/MultiplayerPeer.kt |   3 +
 .../gen/godot/MultiplayerPeerExtension.kt     |  22 ++
 .../godot/gen/godot/MultiplayerSpawner.kt     |   3 +
 .../gen/godot/MultiplayerSynchronizer.kt      |   4 +
 .../godot/gen/godot/NavigationAgent2D.kt      |   7 +
 .../godot/gen/godot/NavigationAgent3D.kt      |   7 +
 .../godot/gen/godot/NavigationRegion2D.kt     |   3 +
 .../godot/gen/godot/NavigationRegion3D.kt     |   3 +
 .../godot/gen/godot/NavigationServer2D.kt     |   3 +
 .../godot/gen/godot/NavigationServer3D.kt     |   4 +
 .../kotlin/godot/gen/godot/NinePatchRect.kt   |   2 +
 .../src/main/kotlin/godot/gen/godot/Node.kt   |  21 ++
 .../src/main/kotlin/godot/gen/godot/Node3D.kt |   2 +
 .../src/main/kotlin/godot/gen/godot/Object.kt |   3 +
 .../godot/OpenXRExtensionWrapperExtension.kt  |  25 +++
 .../kotlin/godot/gen/godot/OpenXRInterface.kt |   9 +
 .../kotlin/godot/gen/godot/OptionButton.kt    |   3 +
 .../godot/gen/godot/PacketPeerExtension.kt    |   3 +
 .../src/main/kotlin/godot/gen/godot/Path3D.kt |   2 +
 .../kotlin/godot/gen/godot/PhysicalBone3D.kt  |   2 +
 .../PhysicsDirectBodyState2DExtension.kt      |  45 ++++
 .../PhysicsDirectBodyState3DExtension.kt      |  47 ++++
 .../PhysicsDirectSpaceState3DExtension.kt     |   2 +
 .../PhysicsServer3DRenderingServerHandler.kt  |   4 +
 .../src/main/kotlin/godot/gen/godot/Popup.kt  |   2 +
 .../main/kotlin/godot/gen/godot/PopupMenu.kt  |   5 +
 .../kotlin/godot/gen/godot/PrimitiveMesh.kt   |   2 +
 .../kotlin/godot/gen/godot/ProjectSettings.kt |   2 +
 .../src/main/kotlin/godot/gen/godot/Range.kt  |   4 +
 .../godot/gen/godot/RenderDataExtension.kt    |   5 +
 .../gen/godot/RenderSceneBuffersExtension.kt  |   5 +
 .../gen/godot/RenderSceneDataExtension.kt     |   7 +
 .../kotlin/godot/gen/godot/RenderingServer.kt |   3 +
 .../main/kotlin/godot/gen/godot/Resource.kt   |   4 +
 .../godot/gen/godot/ResourceFormatLoader.kt   |  12 +
 .../godot/gen/godot/ResourceFormatSaver.kt    |   6 +
 .../kotlin/godot/gen/godot/RichTextEffect.kt  |   2 +
 .../kotlin/godot/gen/godot/RichTextLabel.kt   |   5 +
 .../kotlin/godot/gen/godot/RigidBody2D.kt     |   7 +
 .../kotlin/godot/gen/godot/RigidBody3D.kt     |   7 +
 .../godot/gen/godot/SceneMultiplayer.kt       |   4 +
 .../main/kotlin/godot/gen/godot/SceneTree.kt  |   9 +
 .../kotlin/godot/gen/godot/SceneTreeTimer.kt  |   2 +
 .../kotlin/godot/gen/godot/ScriptExtension.kt |  34 +++
 .../gen/godot/ScriptLanguageExtension.kt      |  57 +++++
 .../main/kotlin/godot/gen/godot/ScrollBar.kt  |   2 +
 .../kotlin/godot/gen/godot/ScrollContainer.kt |   3 +
 .../main/kotlin/godot/gen/godot/Skeleton2D.kt |   2 +
 .../main/kotlin/godot/gen/godot/Skeleton3D.kt |   6 +
 .../godot/gen/godot/SkeletonModification2D.kt |   4 +
 .../godot/gen/godot/SkeletonModifier3D.kt     |   3 +
 .../kotlin/godot/gen/godot/SkeletonProfile.kt |   2 +
 .../src/main/kotlin/godot/gen/godot/Slider.kt |   3 +
 .../kotlin/godot/gen/godot/SplitContainer.kt  |   2 +
 .../main/kotlin/godot/gen/godot/Sprite2D.kt   |   3 +
 .../main/kotlin/godot/gen/godot/Sprite3D.kt   |   3 +
 .../kotlin/godot/gen/godot/StatusIndicator.kt |   2 +
 .../godot/gen/godot/StreamPeerExtension.kt    |   2 +
 .../main/kotlin/godot/gen/godot/StyleBox.kt   |   5 +
 .../godot/gen/godot/SubViewportContainer.kt   |   2 +
 .../godot/gen/godot/SyntaxHighlighter.kt      |   4 +
 .../src/main/kotlin/godot/gen/godot/TabBar.kt |   9 +
 .../kotlin/godot/gen/godot/TabContainer.kt    |   8 +
 .../main/kotlin/godot/gen/godot/TextEdit.kt   |  14 ++
 .../godot/gen/godot/TextServerExtension.kt    | 212 ++++++++++++++++++
 .../godot/gen/godot/TextServerManager.kt      |   3 +
 .../main/kotlin/godot/gen/godot/Texture2D.kt  |   8 +
 .../main/kotlin/godot/gen/godot/Texture3D.kt  |   7 +
 .../kotlin/godot/gen/godot/TextureLayered.kt  |   8 +
 .../main/kotlin/godot/gen/godot/ThemeDB.kt    |   2 +
 .../main/kotlin/godot/gen/godot/TileData.kt   |   2 +
 .../main/kotlin/godot/gen/godot/TileMap.kt    |   4 +
 .../kotlin/godot/gen/godot/TileMapLayer.kt    |   4 +
 .../src/main/kotlin/godot/gen/godot/Timer.kt  |   2 +
 .../godot/gen/godot/TouchScreenButton.kt      |   3 +
 .../kotlin/godot/gen/godot/Translation.kt     |   3 +
 .../src/main/kotlin/godot/gen/godot/Tree.kt   |  16 ++
 .../src/main/kotlin/godot/gen/godot/Tween.kt  |   4 +
 .../main/kotlin/godot/gen/godot/Tweener.kt    |   2 +
 .../main/kotlin/godot/gen/godot/UndoRedo.kt   |   2 +
 .../kotlin/godot/gen/godot/VideoStream.kt     |   2 +
 .../godot/gen/godot/VideoStreamPlayback.kt    |  14 ++
 .../godot/gen/godot/VideoStreamPlayer.kt      |   2 +
 .../main/kotlin/godot/gen/godot/Viewport.kt   |   3 +
 .../gen/godot/VisibleOnScreenNotifier2D.kt    |   3 +
 .../gen/godot/VisibleOnScreenNotifier3D.kt    |   3 +
 .../godot/gen/godot/VisualInstance3D.kt       |   2 +
 .../godot/gen/godot/VisualShaderNodeCustom.kt |  22 ++
 .../godot/gen/godot/VisualShaderNodeInput.kt  |   2 +
 .../gen/godot/WebRTCDataChannelExtension.kt   |  17 ++
 .../godot/gen/godot/WebRTCPeerConnection.kt   |   4 +
 .../godot/WebRTCPeerConnectionExtension.kt    |  12 +
 .../kotlin/godot/gen/godot/WebXRInterface.kt  |  14 ++
 .../src/main/kotlin/godot/gen/godot/Window.kt |  15 ++
 .../kotlin/godot/gen/godot/XRController3D.kt  |   6 +
 .../kotlin/godot/gen/godot/XRInterface.kt     |   2 +
 .../godot/gen/godot/XRInterfaceExtension.kt   |  32 +++
 .../main/kotlin/godot/gen/godot/XRNode3D.kt   |   2 +
 .../godot/gen/godot/XRPositionalTracker.kt    |   8 +
 .../main/kotlin/godot/gen/godot/XRServer.kt   |   7 +
 .../godot/tools/common/constants/Classes.kt   |   2 +
 173 files changed, 1322 insertions(+), 5 deletions(-)
 create mode 100644 kt/godot-library/src/main/kotlin/godot/annotation/GodotApiMember.kt

diff --git a/harness/tests/scripts/godot/tests/Invocation.gdj b/harness/tests/scripts/godot/tests/Invocation.gdj
index 1de7614948..514052f873 100644
--- a/harness/tests/scripts/godot/tests/Invocation.gdj
+++ b/harness/tests/scripts/godot/tests/Invocation.gdj
@@ -40,6 +40,7 @@ properties = [
 	nav_meshes_dictionary,
 	nullable_dictionary,
 	color,
+	rid,
 	packed_byte_array,
 	packed_int32_array,
 	packed_float64_array,
diff --git a/harness/tests/scripts/godot/tests/JavaTestClass.gdj b/harness/tests/scripts/godot/tests/JavaTestClass.gdj
index 2ac65467a3..8f5e99a539 100644
--- a/harness/tests/scripts/godot/tests/JavaTestClass.gdj
+++ b/harness/tests/scripts/godot/tests/JavaTestClass.gdj
@@ -30,7 +30,8 @@ properties = [
 	dictionary
 ]
 functions = [
-    greeting,
+    _ready,
+	greeting,
 	connect_and_trigger_signal,
 	signal_callback
 ]
\ No newline at end of file
diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt b/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt
index d5169a6fe4..125c31328c 100644
--- a/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt
+++ b/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt
@@ -47,6 +47,7 @@ import godot.tools.common.constants.TO_GODOT_NAME_UTIL_FUNCTION
 import godot.tools.common.constants.CORE_TYPE_HELPER
 import godot.tools.common.constants.CORE_TYPE_LOCAL_COPY
 import godot.tools.common.constants.GENERATED_COMMENT
+import godot.tools.common.constants.GODOT_API_MEMBER
 import godot.tools.common.constants.GODOT_BASE_TYPE
 import godot.tools.common.constants.GODOT_ERROR
 import godot.tools.common.constants.GodotKotlinJvmTypes
@@ -398,6 +399,8 @@ class GenerationService(
                 signalClass.typeName
             )
             .addKdoc(signal)
+            // add entry generation helper marker to distinguish user signals from api signals
+            .addAnnotation(GODOT_API_MEMBER)
             .delegate(
                 "%T",
                 ClassName(godotCorePackage, "Signal" + arguments.size)
@@ -578,17 +581,21 @@ class GenerationService(
             modifiers.add(KModifier.OVERRIDE)
         }
 
+        val generatedFunBuilder = FunSpec
+            .builder(method.name)
+            .applyJvmNameIfNecessary(method.name)
+
         // Godot doesn't override its methods, they are either final or meant to be implemented by script or extension.
         if (method.internal.isVirtual) {
             modifiers.add(KModifier.OPEN)
+
+            // add entry generation helper marker to find overridden functions to register
+            generatedFunBuilder.addAnnotation(GODOT_API_MEMBER)
         } else {
             modifiers.add(KModifier.FINAL)
         }
 
-        val generatedFunBuilder = FunSpec
-            .builder(method.name)
-            .addModifiers(modifiers)
-            .applyJvmNameIfNecessary(method.name)
+        generatedFunBuilder.addModifiers(modifiers)
 
         val methodTypeName = method.getCastedType()
         val shouldReturn = method.getTypeClassName().typeName != UNIT
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/GodotApiMember.kt b/kt/godot-library/src/main/kotlin/godot/annotation/GodotApiMember.kt
new file mode 100644
index 0000000000..0906a77007
--- /dev/null
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/GodotApiMember.kt
@@ -0,0 +1,10 @@
+package godot.annotation
+
+/**
+ * Only applicable to godot type members generated in the api gen
+ *
+ * Here for the entry generation as marker to determine whether to register a signal or function.
+ */
+@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class GodotApiMember
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AStar2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AStar2D.kt
index 2470bf86cb..b26bc63ff2 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AStar2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AStar2D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedInt64Array
@@ -46,6 +47,7 @@ public open class AStar2D : RefCounted() {
    * Called when estimating the cost between a point and the path's ending point.
    * Note that this function is hidden in the default [AStar2D] class.
    */
+  @GodotApiMember
   public open fun _estimateCost(fromId: Long, toId: Long): Float {
     throw NotImplementedError("_estimate_cost is not implemented for AStar2D")
   }
@@ -54,6 +56,7 @@ public open class AStar2D : RefCounted() {
    * Called when computing the cost between two connected points.
    * Note that this function is hidden in the default [AStar2D] class.
    */
+  @GodotApiMember
   public open fun _computeCost(fromId: Long, toId: Long): Float {
     throw NotImplementedError("_compute_cost is not implemented for AStar2D")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AStar3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AStar3D.kt
index ddb8ecd4a0..fe85c258c1 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AStar3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AStar3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedInt64Array
@@ -91,6 +92,7 @@ public open class AStar3D : RefCounted() {
    * Called when estimating the cost between a point and the path's ending point.
    * Note that this function is hidden in the default [AStar3D] class.
    */
+  @GodotApiMember
   public open fun _estimateCost(fromId: Long, toId: Long): Float {
     throw NotImplementedError("_estimate_cost is not implemented for AStar3D")
   }
@@ -99,6 +101,7 @@ public open class AStar3D : RefCounted() {
    * Called when computing the cost between two connected points.
    * Note that this function is hidden in the default [AStar3D] class.
    */
+  @GodotApiMember
   public open fun _computeCost(fromId: Long, toId: Long): Float {
     throw NotImplementedError("_compute_cost is not implemented for AStar3D")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AStarGrid2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AStarGrid2D.kt
index 70ba97bcb2..73f075a515 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AStarGrid2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AStarGrid2D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedVector2Array
@@ -294,6 +295,7 @@ public open class AStarGrid2D : RefCounted() {
    * Called when estimating the cost between a point and the path's ending point.
    * Note that this function is hidden in the default [AStarGrid2D] class.
    */
+  @GodotApiMember
   public open fun _estimateCost(fromId: Vector2i, toId: Vector2i): Float {
     throw NotImplementedError("_estimate_cost is not implemented for AStarGrid2D")
   }
@@ -302,6 +304,7 @@ public open class AStarGrid2D : RefCounted() {
    * Called when computing the cost between two connected points.
    * Note that this function is hidden in the default [AStarGrid2D] class.
    */
+  @GodotApiMember
   public open fun _computeCost(fromId: Vector2i, toId: Vector2i): Float {
     throw NotImplementedError("_compute_cost is not implemented for AStarGrid2D")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AcceptDialog.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AcceptDialog.kt
index 7472c6f5c0..ccf52587d9 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AcceptDialog.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AcceptDialog.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -35,16 +36,19 @@ public open class AcceptDialog : Window() {
   /**
    * Emitted when the dialog is accepted, i.e. the OK button is pressed.
    */
+  @GodotApiMember
   public val confirmed: Signal0 by Signal0
 
   /**
    * Emitted when the dialog is closed or the button created with [addCancelButton] is pressed.
    */
+  @GodotApiMember
   public val canceled: Signal0 by Signal0
 
   /**
    * Emitted when a custom button is pressed. See [addButton].
    */
+  @GodotApiMember
   public val customAction: Signal1<StringName> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite2D.kt
index c8c7d1fede..5d60a05fd4 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite2D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -45,21 +46,25 @@ public open class AnimatedSprite2D : Node2D() {
   /**
    * Emitted when [spriteFrames] changes.
    */
+  @GodotApiMember
   public val spriteFramesChanged: Signal0 by Signal0
 
   /**
    * Emitted when [animation] changes.
    */
+  @GodotApiMember
   public val animationChanged: Signal0 by Signal0
 
   /**
    * Emitted when [frame] changes.
    */
+  @GodotApiMember
   public val frameChanged: Signal0 by Signal0
 
   /**
    * Emitted when the animation loops.
    */
+  @GodotApiMember
   public val animationLooped: Signal0 by Signal0
 
   /**
@@ -67,6 +72,7 @@ public open class AnimatedSprite2D : Node2D() {
    * animation finishes, it pauses the playback.
    * **Note:** This signal is not emitted if an animation is looping.
    */
+  @GodotApiMember
   public val animationFinished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite3D.kt
index 5456dc1359..661ed01939 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimatedSprite3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -42,21 +43,25 @@ public open class AnimatedSprite3D : SpriteBase3D() {
   /**
    * Emitted when [spriteFrames] changes.
    */
+  @GodotApiMember
   public val spriteFramesChanged: Signal0 by Signal0
 
   /**
    * Emitted when [animation] changes.
    */
+  @GodotApiMember
   public val animationChanged: Signal0 by Signal0
 
   /**
    * Emitted when [frame] changes.
    */
+  @GodotApiMember
   public val frameChanged: Signal0 by Signal0
 
   /**
    * Emitted when the animation loops.
    */
+  @GodotApiMember
   public val animationLooped: Signal0 by Signal0
 
   /**
@@ -64,6 +69,7 @@ public open class AnimatedSprite3D : SpriteBase3D() {
    * animation finishes, it pauses the playback.
    * **Note:** This signal is not emitted if an animation is looping.
    */
+  @GodotApiMember
   public val animationFinished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationLibrary.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationLibrary.kt
index cce4a3dfd7..94aa10a7ba 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationLibrary.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationLibrary.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal1
@@ -35,16 +36,19 @@ public open class AnimationLibrary : Resource() {
   /**
    * Emitted when an [Animation] is added, under the key [name].
    */
+  @GodotApiMember
   public val animationAdded: Signal1<StringName> by Signal1
 
   /**
    * Emitted when an [Animation] stored with the key [name] is removed.
    */
+  @GodotApiMember
   public val animationRemoved: Signal1<StringName> by Signal1
 
   /**
    * Emitted when the key for an [Animation] is changed, from [name] to [toName].
    */
+  @GodotApiMember
   public val animationRenamed: Signal2<StringName, StringName> by Signal2
 
   /**
@@ -52,6 +56,7 @@ public open class AnimationLibrary : Resource() {
    * changed paths. [name] is the key of the animation that was changed.
    * See also [signal Resource.changed], which this acts as a relay for.
    */
+  @GodotApiMember
   public val animationChanged: Signal1<StringName> by Signal1
 
   public override fun new(scriptIndex: Int): Unit {
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationMixer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationMixer.kt
index c0025d8d6b..e8685ee174 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationMixer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationMixer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.NodePath
@@ -51,38 +52,45 @@ public open class AnimationMixer internal constructor() : Node() {
   /**
    * Notifies when an animation list is changed.
    */
+  @GodotApiMember
   public val animationListChanged: Signal0 by Signal0
 
   /**
    * Notifies when the animation libraries have changed.
    */
+  @GodotApiMember
   public val animationLibrariesUpdated: Signal0 by Signal0
 
   /**
    * Notifies when an animation finished playing.
    * **Note:** This signal is not emitted if an animation is looping.
    */
+  @GodotApiMember
   public val animationFinished: Signal1<StringName> by Signal1
 
   /**
    * Notifies when an animation starts playing.
    */
+  @GodotApiMember
   public val animationStarted: Signal1<StringName> by Signal1
 
   /**
    * Notifies when the caches have been cleared, either automatically, or manually via
    * [clearCaches].
    */
+  @GodotApiMember
   public val cachesCleared: Signal0 by Signal0
 
   /**
    * Notifies when the blending result related have been applied to the target objects.
    */
+  @GodotApiMember
   public val mixerApplied: Signal0 by Signal0
 
   /**
    * Notifies when the property related process have been updated.
    */
+  @GodotApiMember
   public val mixerUpdated: Signal0 by Signal0
 
   /**
@@ -224,6 +232,7 @@ public open class AnimationMixer internal constructor() : Node() {
   /**
    * A virtual function for processing after getting a key during playback.
    */
+  @GodotApiMember
   public open fun _postProcessKeyValue(
     animation: Animation?,
     track: Int,
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNode.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNode.kt
index 7b5b3ed02c..4128badc7a 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNode.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNode.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -62,6 +63,7 @@ public open class AnimationNode : Resource() {
    * [AnimationNodeBlendSpace1D], [AnimationNodeBlendSpace2D], [AnimationNodeStateMachine],
    * [AnimationNodeBlendTree] and [AnimationNodeTransition].
    */
+  @GodotApiMember
   public val treeChanged: Signal0 by Signal0
 
   /**
@@ -70,6 +72,7 @@ public open class AnimationNode : Resource() {
    * [AnimationNodeBlendSpace1D], [AnimationNodeBlendSpace2D], [AnimationNodeStateMachine], and
    * [AnimationNodeBlendTree].
    */
+  @GodotApiMember
   public val animationNodeRenamed: Signal3<Long, String, String> by Signal3
 
   /**
@@ -78,6 +81,7 @@ public open class AnimationNode : Resource() {
    * [AnimationNodeBlendSpace1D], [AnimationNodeBlendSpace2D], [AnimationNodeStateMachine], and
    * [AnimationNodeBlendTree].
    */
+  @GodotApiMember
   public val animationNodeRemoved: Signal2<Long, String> by Signal2
 
   /**
@@ -99,6 +103,7 @@ public open class AnimationNode : Resource() {
    * When inheriting from [AnimationRootNode], implement this virtual method to return all child
    * animation nodes in order as a `name: node` dictionary.
    */
+  @GodotApiMember
   public open fun _getChildNodes(): Dictionary<Any?, Any?> {
     throw NotImplementedError("_get_child_nodes is not implemented for AnimationNode")
   }
@@ -109,6 +114,7 @@ public open class AnimationNode : Resource() {
    * nodes, given a resource can be reused in multiple trees. Format is similar to
    * [Object.getPropertyList].
    */
+  @GodotApiMember
   public open fun _getParameterList(): VariantArray<Any?> {
     throw NotImplementedError("_get_parameter_list is not implemented for AnimationNode")
   }
@@ -117,6 +123,7 @@ public open class AnimationNode : Resource() {
    * When inheriting from [AnimationRootNode], implement this virtual method to return a child
    * animation node by its [name].
    */
+  @GodotApiMember
   public open fun _getChildByName(name: StringName): AnimationNode? {
     throw NotImplementedError("_get_child_by_name is not implemented for AnimationNode")
   }
@@ -126,6 +133,7 @@ public open class AnimationNode : Resource() {
    * value of a [parameter]. Parameters are custom local memory used for your animation nodes, given a
    * resource can be reused in multiple trees.
    */
+  @GodotApiMember
   public open fun _getParameterDefaultValue(parameter: StringName): Any? {
     throw NotImplementedError("_get_parameter_default_value is not implemented for AnimationNode")
   }
@@ -135,6 +143,7 @@ public open class AnimationNode : Resource() {
    * [parameter] is read-only. Parameters are custom local memory used for your animation nodes, given
    * a resource can be reused in multiple trees.
    */
+  @GodotApiMember
   public open fun _isParameterReadOnly(parameter: StringName): Boolean {
     throw NotImplementedError("_is_parameter_read_only is not implemented for AnimationNode")
   }
@@ -147,6 +156,7 @@ public open class AnimationNode : Resource() {
    * [getParameter] and [setParameter] to modify local memory.
    * This function should return the delta.
    */
+  @GodotApiMember
   public open fun _process(
     time: Double,
     seek: Boolean,
@@ -160,6 +170,7 @@ public open class AnimationNode : Resource() {
    * When inheriting from [AnimationRootNode], implement this virtual method to override the text
    * caption for this animation node.
    */
+  @GodotApiMember
   public open fun _getCaption(): String {
     throw NotImplementedError("_get_caption is not implemented for AnimationNode")
   }
@@ -168,6 +179,7 @@ public open class AnimationNode : Resource() {
    * When inheriting from [AnimationRootNode], implement this virtual method to return whether the
    * blend tree editor should display filter editing on this animation node.
    */
+  @GodotApiMember
   public open fun _hasFilter(): Boolean {
     throw NotImplementedError("_has_filter is not implemented for AnimationNode")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendSpace2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendSpace2D.kt
index 027a2bba0c..57e85b52f0 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendSpace2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendSpace2D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -45,6 +46,7 @@ public open class AnimationNodeBlendSpace2D : AnimationRootNode() {
    * Emitted every time the blend space's triangles are created, removed, or when one of their
    * vertices changes position.
    */
+  @GodotApiMember
   public val trianglesUpdated: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendTree.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendTree.kt
index 090c8cb460..ad336cb7ee 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendTree.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeBlendTree.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal1
@@ -40,6 +41,7 @@ public open class AnimationNodeBlendTree : AnimationRootNode() {
   /**
    * Emitted when the input port information is changed.
    */
+  @GodotApiMember
   public val nodeChanged: Signal1<StringName> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeStateMachineTransition.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeStateMachineTransition.kt
index 78af9a4d45..7a1f955fd1 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeStateMachineTransition.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationNodeStateMachineTransition.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -39,6 +40,7 @@ public open class AnimationNodeStateMachineTransition : Resource() {
   /**
    * Emitted when [advanceCondition] is changed.
    */
+  @GodotApiMember
   public val advanceConditionChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationPlayer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationPlayer.kt
index d68082fbf2..5ea7646155 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationPlayer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationPlayer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.NodePath
@@ -51,6 +52,7 @@ public open class AnimationPlayer : AnimationMixer() {
   /**
    * Emitted when [currentAnimation] changes.
    */
+  @GodotApiMember
   public val currentAnimationChanged: Signal1<String> by Signal1
 
   /**
@@ -59,6 +61,7 @@ public open class AnimationPlayer : AnimationMixer() {
    * **Note:** The signal is not emitted when the animation is changed via [AnimationPlayer.play] or
    * by an [AnimationTree].
    */
+  @GodotApiMember
   public val animationChanged: Signal2<StringName, StringName> by Signal2
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationTree.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationTree.kt
index 1ec4417a78..8c17d0ca62 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationTree.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AnimationTree.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.NodePath
@@ -34,6 +35,7 @@ public open class AnimationTree : AnimationMixer() {
   /**
    * Emitted when the [animPlayer] is changed.
    */
+  @GodotApiMember
   public val animationPlayerChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Area2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Area2D.kt
index a30f826963..0c2d833c07 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Area2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Area2D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.RID
@@ -65,6 +66,7 @@ public open class Area2D : CollisionObject2D() {
    * var local_shape_node = shape_owner_get_owner(local_shape_owner)
    * ```
    */
+  @GodotApiMember
   public val bodyShapeEntered: Signal4<RID, Node2D, Long, Long> by Signal4
 
   /**
@@ -73,6 +75,7 @@ public open class Area2D : CollisionObject2D() {
    * configured. Requires [monitoring] to be set to `true`.
    * See also [signal body_shape_entered].
    */
+  @GodotApiMember
   public val bodyShapeExited: Signal4<RID, Node2D, Long, Long> by Signal4
 
   /**
@@ -80,6 +83,7 @@ public open class Area2D : CollisionObject2D() {
    * [TileMap]. [TileMap]s are detected if their [TileSet] has collision shapes configured. Requires
    * [monitoring] to be set to `true`.
    */
+  @GodotApiMember
   public val bodyEntered: Signal1<Node2D> by Signal1
 
   /**
@@ -87,6 +91,7 @@ public open class Area2D : CollisionObject2D() {
    * [TileMap]. [TileMap]s are detected if their [TileSet] has collision shapes configured. Requires
    * [monitoring] to be set to `true`.
    */
+  @GodotApiMember
   public val bodyExited: Signal1<Node2D> by Signal1
 
   /**
@@ -106,6 +111,7 @@ public open class Area2D : CollisionObject2D() {
    * var local_shape_node = shape_owner_get_owner(local_shape_owner)
    * ```
    */
+  @GodotApiMember
   public val areaShapeEntered: Signal4<RID, Area2D, Long, Long> by Signal4
 
   /**
@@ -113,16 +119,19 @@ public open class Area2D : CollisionObject2D() {
    * [monitoring] to be set to `true`.
    * See also [signal area_shape_entered].
    */
+  @GodotApiMember
   public val areaShapeExited: Signal4<RID, Area2D, Long, Long> by Signal4
 
   /**
    * Emitted when the received [area] enters this area. Requires [monitoring] to be set to `true`.
    */
+  @GodotApiMember
   public val areaEntered: Signal1<Area2D> by Signal1
 
   /**
    * Emitted when the received [area] exits this area. Requires [monitoring] to be set to `true`.
    */
+  @GodotApiMember
   public val areaExited: Signal1<Area2D> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Area3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Area3D.kt
index ce3eb84fb5..4b19e74e55 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Area3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Area3D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.NodePath
@@ -73,6 +74,7 @@ public open class Area3D : CollisionObject3D() {
    * var local_shape_node = shape_owner_get_owner(local_shape_owner)
    * ```
    */
+  @GodotApiMember
   public val bodyShapeEntered: Signal4<RID, Node3D, Long, Long> by Signal4
 
   /**
@@ -81,6 +83,7 @@ public open class Area3D : CollisionObject3D() {
    * shapes configured. Requires [monitoring] to be set to `true`.
    * See also [signal body_shape_entered].
    */
+  @GodotApiMember
   public val bodyShapeExited: Signal4<RID, Node3D, Long, Long> by Signal4
 
   /**
@@ -88,6 +91,7 @@ public open class Area3D : CollisionObject3D() {
    * [GridMap]. [GridMap]s are detected if their [MeshLibrary] has collision shapes configured.
    * Requires [monitoring] to be set to `true`.
    */
+  @GodotApiMember
   public val bodyEntered: Signal1<Node3D> by Signal1
 
   /**
@@ -95,6 +99,7 @@ public open class Area3D : CollisionObject3D() {
    * [GridMap]. [GridMap]s are detected if their [MeshLibrary] has collision shapes configured.
    * Requires [monitoring] to be set to `true`.
    */
+  @GodotApiMember
   public val bodyExited: Signal1<Node3D> by Signal1
 
   /**
@@ -114,6 +119,7 @@ public open class Area3D : CollisionObject3D() {
    * var local_shape_node = shape_owner_get_owner(local_shape_owner)
    * ```
    */
+  @GodotApiMember
   public val areaShapeEntered: Signal4<RID, Area3D, Long, Long> by Signal4
 
   /**
@@ -121,16 +127,19 @@ public open class Area3D : CollisionObject3D() {
    * [monitoring] to be set to `true`.
    * See also [signal area_shape_entered].
    */
+  @GodotApiMember
   public val areaShapeExited: Signal4<RID, Area3D, Long, Long> by Signal4
 
   /**
    * Emitted when the received [area] enters this area. Requires [monitoring] to be set to `true`.
    */
+  @GodotApiMember
   public val areaEntered: Signal1<Area3D> by Signal1
 
   /**
    * Emitted when the received [area] exits this area. Requires [monitoring] to be set to `true`.
    */
+  @GodotApiMember
   public val areaExited: Signal1<Area3D> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffect.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffect.kt
index a6254a9773..1844e3a2f7 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffect.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffect.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import kotlin.Int
 import kotlin.NotImplementedError
@@ -45,6 +46,7 @@ public open class AudioEffect : Resource() {
    * instance. Depending on the implementation this allows the effect instance to listen for changes at
    * run-time and be modified accordingly.
    */
+  @GodotApiMember
   public open fun _instantiate(): AudioEffectInstance? {
     throw NotImplementedError("_instantiate is not implemented for AudioEffect")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectInstance.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectInstance.kt
index eea560fc5f..6a490636b6 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectInstance.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioEffectInstance.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import kotlin.Boolean
 import kotlin.Int
@@ -30,6 +31,7 @@ public open class AudioEffectInstance : RefCounted() {
    * Should return `true` to force the [AudioServer] to always call [_process], even if the bus has
    * been muted or cannot otherwise be heard.
    */
+  @GodotApiMember
   public open fun _processSilence(): Boolean {
     throw NotImplementedError("_process_silence is not implemented for AudioEffectInstance")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioServer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioServer.kt
index e698e9e84c..86b816d28f 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioServer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioServer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedStringArray
@@ -42,12 +43,14 @@ public object AudioServer : Object() {
   /**
    * Emitted when an audio bus is added, deleted, or moved.
    */
+  @GodotApiMember
   @JvmStatic
   public val busLayoutChanged: Signal0 by Signal0
 
   /**
    * Emitted when the audio bus at [busIndex] is renamed from [oldName] to [newName].
    */
+  @GodotApiMember
   @JvmStatic
   public val busRenamed: Signal3<Long, StringName, StringName> by Signal3
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStream.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStream.kt
index b65ecbb8f9..7b3b31f79a 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStream.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStream.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -34,6 +35,7 @@ public open class AudioStream : Resource() {
   /**
    * Signal to be emitted to notify when the parameter list changed.
    */
+  @GodotApiMember
   public val parameterListChanged: Signal0 by Signal0
 
   public override fun new(scriptIndex: Int): Unit {
@@ -45,6 +47,7 @@ public open class AudioStream : Resource() {
    * a new [AudioStreamPlayback] created when the stream is played (such as by an
    * [AudioStreamPlayer])..
    */
+  @GodotApiMember
   public open fun _instantiatePlayback(): AudioStreamPlayback? {
     throw NotImplementedError("_instantiate_playback is not implemented for AudioStream")
   }
@@ -52,6 +55,7 @@ public open class AudioStream : Resource() {
   /**
    * Override this method to customize the name assigned to this audio stream. Unused by the engine.
    */
+  @GodotApiMember
   public open fun _getStreamName(): String {
     throw NotImplementedError("_get_stream_name is not implemented for AudioStream")
   }
@@ -60,6 +64,7 @@ public open class AudioStream : Resource() {
    * Override this method to customize the returned value of [getLength]. Should return the length
    * of this audio stream, in seconds.
    */
+  @GodotApiMember
   public open fun _getLength(): Double {
     throw NotImplementedError("_get_length is not implemented for AudioStream")
   }
@@ -68,6 +73,7 @@ public open class AudioStream : Resource() {
    * Override this method to customize the returned value of [isMonophonic]. Should return `true` if
    * this audio stream only supports one channel.
    */
+  @GodotApiMember
   public open fun _isMonophonic(): Boolean {
     throw NotImplementedError("_is_monophonic is not implemented for AudioStream")
   }
@@ -78,6 +84,7 @@ public open class AudioStream : Resource() {
    * Ideally, the returned value should be based off the stream's sample rate
    * ([AudioStreamWAV.mixRate], for example).
    */
+  @GodotApiMember
   public open fun _getBpm(): Double {
     throw NotImplementedError("_get_bpm is not implemented for AudioStream")
   }
@@ -88,6 +95,7 @@ public open class AudioStream : Resource() {
    * Ideally, the returned value should be based off the stream's sample rate
    * ([AudioStreamWAV.mixRate], for example).
    */
+  @GodotApiMember
   public open fun _getBeatCount(): Int {
     throw NotImplementedError("_get_beat_count is not implemented for AudioStream")
   }
@@ -97,6 +105,7 @@ public open class AudioStream : Resource() {
    * property info description format (see [Object.getPropertyList]). Additionally, the default value
    * for this parameter must be added tho each dictionary in "default_value" field.
    */
+  @GodotApiMember
   public open fun _getParameterList(): VariantArray<Dictionary<Any?, Any?>> {
     throw NotImplementedError("_get_parameter_list is not implemented for AudioStream")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayback.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayback.kt
index ada5f67360..232bd0ca80 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayback.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayback.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.StringName
@@ -35,6 +36,7 @@ public open class AudioStreamPlayback : RefCounted() {
    * Override this method to customize what happens when the playback starts at the given position,
    * such as by calling [AudioStreamPlayer.play].
    */
+  @GodotApiMember
   public open fun _start(fromPos: Double): Unit {
   }
 
@@ -42,6 +44,7 @@ public open class AudioStreamPlayback : RefCounted() {
    * Override this method to customize what happens when the playback is stopped, such as by calling
    * [AudioStreamPlayer.stop].
    */
+  @GodotApiMember
   public open fun _stop(): Unit {
   }
 
@@ -49,6 +52,7 @@ public open class AudioStreamPlayback : RefCounted() {
    * Overridable method. Should return `true` if this playback is active and playing its audio
    * stream.
    */
+  @GodotApiMember
   public open fun _isPlaying(): Boolean {
     throw NotImplementedError("_is_playing is not implemented for AudioStreamPlayback")
   }
@@ -57,6 +61,7 @@ public open class AudioStreamPlayback : RefCounted() {
    * Overridable method. Should return how many times this audio stream has looped. Most built-in
    * playbacks always return `0`.
    */
+  @GodotApiMember
   public open fun _getLoopCount(): Int {
     throw NotImplementedError("_get_loop_count is not implemented for AudioStreamPlayback")
   }
@@ -64,6 +69,7 @@ public open class AudioStreamPlayback : RefCounted() {
   /**
    * Overridable method. Should return the current progress along the audio stream, in seconds.
    */
+  @GodotApiMember
   public open fun _getPlaybackPosition(): Double {
     throw NotImplementedError("_get_playback_position is not implemented for AudioStreamPlayback")
   }
@@ -72,6 +78,7 @@ public open class AudioStreamPlayback : RefCounted() {
    * Override this method to customize what happens when seeking this audio stream at the given
    * [position], such as by calling [AudioStreamPlayer.seek].
    */
+  @GodotApiMember
   public open fun _seek(position: Double): Unit {
   }
 
@@ -80,18 +87,21 @@ public open class AudioStreamPlayback : RefCounted() {
    * [AudioServer.setEnableTaggingUsedAudioStreams] has been set to `true`. Editor plugins may use this
    * method to "tag" the current position along the audio stream and display it in a preview.
    */
+  @GodotApiMember
   public open fun _tagUsedStreams(): Unit {
   }
 
   /**
    * Set the current value of a playback parameter by name (see [AudioStream.GetParameterList]).
    */
+  @GodotApiMember
   public open fun _setParameter(name: StringName, `value`: Any?): Unit {
   }
 
   /**
    * Return the current value of a playback parameter by name (see [AudioStream.GetParameterList]).
    */
+  @GodotApiMember
   public open fun _getParameter(name: StringName): Any? {
     throw NotImplementedError("_get_parameter is not implemented for AudioStreamPlayback")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlaybackResampled.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlaybackResampled.kt
index 2e9f0468f3..ec950e5987 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlaybackResampled.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlaybackResampled.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.TypeManager
@@ -23,6 +24,7 @@ public open class AudioStreamPlaybackResampled : AudioStreamPlayback() {
     callConstructor(ENGINECLASS_AUDIOSTREAMPLAYBACKRESAMPLED, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _getStreamSamplingRate(): Float {
     throw NotImplementedError("_get_stream_sampling_rate is not implemented for AudioStreamPlaybackResampled")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer.kt
index 321a7ac01e..3ef6bdff2a 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -42,6 +43,7 @@ public open class AudioStreamPlayer : Node() {
    * Emitted when a sound finishes playing without interruptions. This signal is *not* emitted when
    * calling [stop], or when exiting the tree while sounds are playing.
    */
+  @GodotApiMember
   public val finished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer2D.kt
index a44a59360d..75412790f6 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer2D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -42,6 +43,7 @@ public open class AudioStreamPlayer2D : Node2D() {
   /**
    * Emitted when the audio stops playing.
    */
+  @GodotApiMember
   public val finished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer3D.kt
index 3a30d87ea8..63ef3fd248 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/AudioStreamPlayer3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -45,6 +46,7 @@ public open class AudioStreamPlayer3D : Node3D() {
   /**
    * Emitted when the audio stops playing.
    */
+  @GodotApiMember
   public val finished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/BaseButton.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/BaseButton.kt
index e876aa73a2..0c58d32f27 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/BaseButton.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/BaseButton.kt
@@ -7,6 +7,7 @@
 package godot
 
 import godot.MouseButtonMaskValue
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -35,22 +36,26 @@ public open class BaseButton : Control() {
    * If you need to know the button's pressed state (and [toggleMode] is active), use [signal
    * toggled] instead.
    */
+  @GodotApiMember
   public val pressed: Signal0 by Signal0
 
   /**
    * Emitted when the button stops being held down.
    */
+  @GodotApiMember
   public val buttonUp: Signal0 by Signal0
 
   /**
    * Emitted when the button starts being held down.
    */
+  @GodotApiMember
   public val buttonDown: Signal0 by Signal0
 
   /**
    * Emitted when the button was just toggled between pressed and normal states (only if
    * [toggleMode] is active). The new state is contained in the [toggledOn] argument.
    */
+  @GodotApiMember
   public val toggled: Signal1<Boolean> by Signal1
 
   /**
@@ -182,12 +187,14 @@ public open class BaseButton : Control() {
    * Called when the button is pressed. If you need to know the button's pressed state (and
    * [toggleMode] is active), use [_toggled] instead.
    */
+  @GodotApiMember
   public open fun _pressed(): Unit {
   }
 
   /**
    * Called when the button is toggled (only if [toggleMode] is active).
    */
+  @GodotApiMember
   public open fun _toggled(toggledOn: Boolean): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/BoneMap.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/BoneMap.kt
index de7d18ef6c..f2714c5382 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/BoneMap.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/BoneMap.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -32,12 +33,14 @@ public open class BoneMap : Resource() {
    * This signal is emitted when change the key value in the [BoneMap]. This is used to validate
    * mapping and to update [BoneMap] editor.
    */
+  @GodotApiMember
   public val boneMapUpdated: Signal0 by Signal0
 
   /**
    * This signal is emitted when change the value in profile or change the reference of profile.
    * This is used to update key names in the [BoneMap] and to redraw the [BoneMap] editor.
    */
+  @GodotApiMember
   public val profileUpdated: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ButtonGroup.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ButtonGroup.kt
index 9eabd66fad..247a7d71b0 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ButtonGroup.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ButtonGroup.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal1
@@ -33,6 +34,7 @@ public open class ButtonGroup : Resource() {
   /**
    * Emitted when one of the buttons of the group is pressed.
    */
+  @GodotApiMember
   public val pressed: Signal1<BaseButton> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/CPUParticles2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/CPUParticles2D.kt
index a9923cf933..5638aa96c9 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/CPUParticles2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/CPUParticles2D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -46,6 +47,7 @@ public open class CPUParticles2D : Node2D() {
    * Emitted when all active particles have finished processing. When [oneShot] is disabled,
    * particles will process continuously, so this is never emitted.
    */
+  @GodotApiMember
   public val finished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/CPUParticles3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/CPUParticles3D.kt
index ccdf211e68..7844aadb20 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/CPUParticles3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/CPUParticles3D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.AABB
@@ -47,6 +48,7 @@ public open class CPUParticles3D : GeometryInstance3D() {
    * Emitted when all active particles have finished processing. When [oneShot] is disabled,
    * particles will process continuously, so this is never emitted.
    */
+  @GodotApiMember
   public val finished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/CameraServer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/CameraServer.kt
index 3c61e708cf..6132f238b7 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/CameraServer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/CameraServer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal1
@@ -36,12 +37,14 @@ public object CameraServer : Object() {
   /**
    * Emitted when a [CameraFeed] is added (e.g. a webcam is plugged in).
    */
+  @GodotApiMember
   @JvmStatic
   public val cameraFeedAdded: Signal1<Long> by Signal1
 
   /**
    * Emitted when a [CameraFeed] is removed (e.g. a webcam is unplugged).
    */
+  @GodotApiMember
   @JvmStatic
   public val cameraFeedRemoved: Signal1<Long> by Signal1
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/CanvasItem.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/CanvasItem.kt
index dd6e471b94..312177f6f7 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/CanvasItem.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/CanvasItem.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -72,22 +73,26 @@ public open class CanvasItem internal constructor() : Node() {
    * notification, and *before* [_draw] is called.
    * **Note:** Deferred connections do not allow drawing through the `draw_*` methods.
    */
+  @GodotApiMember
   public val draw: Signal0 by Signal0
 
   /**
    * Emitted when the visibility (hidden/visible) changes.
    */
+  @GodotApiMember
   public val visibilityChanged: Signal0 by Signal0
 
   /**
    * Emitted when becoming hidden.
    */
+  @GodotApiMember
   public val hidden: Signal0 by Signal0
 
   /**
    * Emitted when the item's [Rect2] boundaries (position or size) have changed, or when an action
    * is taking place that may have impacted these boundaries (e.g. changing [Sprite2D.texture]).
    */
+  @GodotApiMember
   public val itemRectChanged: Signal0 by Signal0
 
   /**
@@ -345,6 +350,7 @@ public open class CanvasItem internal constructor() : Node() {
    * manually or by the engine).
    * Corresponds to the [NOTIFICATION_DRAW] notification in [Object.Notification].
    */
+  @GodotApiMember
   public open fun _draw(): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/CanvasLayer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/CanvasLayer.kt
index 3cabe84f93..5357b3839d 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/CanvasLayer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/CanvasLayer.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.RID
@@ -54,6 +55,7 @@ public open class CanvasLayer : Node() {
   /**
    * Emitted when visibility of the layer is changed. See [visible].
    */
+  @GodotApiMember
   public val visibilityChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/CodeEdit.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/CodeEdit.kt
index 9a354769c8..246fabf585 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/CodeEdit.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/CodeEdit.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -53,22 +54,26 @@ public open class CodeEdit : TextEdit() {
    * Emitted when a breakpoint is added or removed from a line. If the line is moved via backspace a
    * removed is emitted at the old line.
    */
+  @GodotApiMember
   public val breakpointToggled: Signal1<Long> by Signal1
 
   /**
    * Emitted when the user requests code completion.
    */
+  @GodotApiMember
   public val codeCompletionRequested: Signal0 by Signal0
 
   /**
    * Emitted when the user has clicked on a valid symbol.
    */
+  @GodotApiMember
   public val symbolLookup: Signal3<String, Long, Long> by Signal3
 
   /**
    * Emitted when the user hovers over a symbol. The symbol should be validated and responded to, by
    * calling [setSymbolLookupWordAsValid].
    */
+  @GodotApiMember
   public val symbolValidate: Signal1<String> by Signal1
 
   /**
@@ -306,6 +311,7 @@ public open class CodeEdit : TextEdit() {
    * Override this method to define how the selected entry should be inserted. If [replace] is
    * `true`, any existing text should be replaced.
    */
+  @GodotApiMember
   public open fun _confirmCodeCompletion(replace: Boolean): Unit {
   }
 
@@ -313,6 +319,7 @@ public open class CodeEdit : TextEdit() {
    * Override this method to define what happens when the user requests code completion. If [force]
    * is `true`, any checks should be bypassed.
    */
+  @GodotApiMember
   public open fun _requestCodeCompletion(force: Boolean): Unit {
   }
 
@@ -321,6 +328,7 @@ public open class CodeEdit : TextEdit() {
    * Both [candidates] and the return is a [Array] of [Dictionary], see [getCodeCompletionOption]
    * for [Dictionary] content.
    */
+  @GodotApiMember
   public open fun _filterCodeCompletionCandidates(candidates: VariantArray<Dictionary<Any?, Any?>>):
       VariantArray<Dictionary<Any?, Any?>> {
     throw NotImplementedError("_filter_code_completion_candidates is not implemented for CodeEdit")
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/CollisionObject2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/CollisionObject2D.kt
index a2e8fcb1d0..8ed0887d51 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/CollisionObject2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/CollisionObject2D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedInt32Array
@@ -47,6 +48,7 @@ public open class CollisionObject2D internal constructor() : Node2D() {
    * Emitted when an input event occurs. Requires [inputPickable] to be `true` and at least one
    * [collisionLayer] bit to be set. See [_inputEvent] for details.
    */
+  @GodotApiMember
   public val inputEvent: Signal3<Node, InputEvent, Long> by Signal3
 
   /**
@@ -58,6 +60,7 @@ public open class CollisionObject2D internal constructor() : Node2D() {
    * This signal may also not be emitted if another [CollisionObject2D] is overlapping the
    * [CollisionObject2D] in question.
    */
+  @GodotApiMember
   public val mouseEntered: Signal0 by Signal0
 
   /**
@@ -69,6 +72,7 @@ public open class CollisionObject2D internal constructor() : Node2D() {
    * This signal may also not be emitted if another [CollisionObject2D] is overlapping the
    * [CollisionObject2D] in question.
    */
+  @GodotApiMember
   public val mouseExited: Signal0 by Signal0
 
   /**
@@ -76,6 +80,7 @@ public open class CollisionObject2D internal constructor() : Node2D() {
    * another. [shapeIdx] is the child index of the newly entered [Shape2D]. Requires [inputPickable] to
    * be `true` and at least one [collisionLayer] bit to be set.
    */
+  @GodotApiMember
   public val mouseShapeEntered: Signal1<Long> by Signal1
 
   /**
@@ -83,6 +88,7 @@ public open class CollisionObject2D internal constructor() : Node2D() {
    * of the exited [Shape2D]. Requires [inputPickable] to be `true` and at least one [collisionLayer]
    * bit to be set.
    */
+  @GodotApiMember
   public val mouseShapeExited: Signal1<Long> by Signal1
 
   /**
@@ -165,6 +171,7 @@ public open class CollisionObject2D internal constructor() : Node2D() {
    * **Note:** [_inputEvent] requires [inputPickable] to be `true` and at least one [collisionLayer]
    * bit to be set.
    */
+  @GodotApiMember
   public open fun _inputEvent(
     viewport: Viewport?,
     event: InputEvent?,
@@ -177,6 +184,7 @@ public open class CollisionObject2D internal constructor() : Node2D() {
    * be `true` and at least one [collisionLayer] bit to be set. Note that moving between different
    * shapes within a single [CollisionObject2D] won't cause this function to be called.
    */
+  @GodotApiMember
   public open fun _mouseEnter(): Unit {
   }
 
@@ -185,6 +193,7 @@ public open class CollisionObject2D internal constructor() : Node2D() {
    * `true` and at least one [collisionLayer] bit to be set. Note that moving between different shapes
    * within a single [CollisionObject2D] won't cause this function to be called.
    */
+  @GodotApiMember
   public open fun _mouseExit(): Unit {
   }
 
@@ -193,6 +202,7 @@ public open class CollisionObject2D internal constructor() : Node2D() {
    * another. [shapeIdx] is the child index of the newly entered [Shape2D]. Requires [inputPickable] to
    * be `true` and at least one [collisionLayer] bit to be called.
    */
+  @GodotApiMember
   public open fun _mouseShapeEnter(shapeIdx: Int): Unit {
   }
 
@@ -201,6 +211,7 @@ public open class CollisionObject2D internal constructor() : Node2D() {
    * of the exited [Shape2D]. Requires [inputPickable] to be `true` and at least one [collisionLayer]
    * bit to be called.
    */
+  @GodotApiMember
   public open fun _mouseShapeExit(shapeIdx: Int): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/CollisionObject3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/CollisionObject3D.kt
index 92ffb82577..9e5bd53e81 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/CollisionObject3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/CollisionObject3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedInt32Array
@@ -47,6 +48,7 @@ public open class CollisionObject3D internal constructor() : Node3D() {
    * world space of the mouse pointer on the surface of the shape with index [shapeIdx] and [normal] is
    * the normal vector of the surface at that point.
    */
+  @GodotApiMember
   public val inputEvent: Signal5<Node, InputEvent, Vector3, Vector3, Long> by Signal5
 
   /**
@@ -57,6 +59,7 @@ public open class CollisionObject3D internal constructor() : Node3D() {
    * This signal may also not be emitted if another [CollisionObject3D] is overlapping the
    * [CollisionObject3D] in question.
    */
+  @GodotApiMember
   public val mouseEntered: Signal0 by Signal0
 
   /**
@@ -67,6 +70,7 @@ public open class CollisionObject3D internal constructor() : Node3D() {
    * This signal may also not be emitted if another [CollisionObject3D] is overlapping the
    * [CollisionObject3D] in question.
    */
+  @GodotApiMember
   public val mouseExited: Signal0 by Signal0
 
   /**
@@ -162,6 +166,7 @@ public open class CollisionObject3D internal constructor() : Node3D() {
    * **Note:** [_inputEvent] requires [inputRayPickable] to be `true` and at least one
    * [collisionLayer] bit to be set.
    */
+  @GodotApiMember
   public open fun _inputEvent(
     camera: Camera3D?,
     event: InputEvent?,
@@ -176,6 +181,7 @@ public open class CollisionObject3D internal constructor() : Node3D() {
    * to be `true` and at least one [collisionLayer] bit to be set. Note that moving between different
    * shapes within a single [CollisionObject3D] won't cause this function to be called.
    */
+  @GodotApiMember
   public open fun _mouseEnter(): Unit {
   }
 
@@ -184,6 +190,7 @@ public open class CollisionObject3D internal constructor() : Node3D() {
    * `true` and at least one [collisionLayer] bit to be set. Note that moving between different shapes
    * within a single [CollisionObject3D] won't cause this function to be called.
    */
+  @GodotApiMember
   public open fun _mouseExit(): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ColorPicker.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ColorPicker.kt
index bc0865d058..b0456c4b05 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ColorPicker.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ColorPicker.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -38,16 +39,19 @@ public open class ColorPicker : VBoxContainer() {
   /**
    * Emitted when the color is changed.
    */
+  @GodotApiMember
   public val colorChanged: Signal1<Color> by Signal1
 
   /**
    * Emitted when a preset is added.
    */
+  @GodotApiMember
   public val presetAdded: Signal1<Color> by Signal1
 
   /**
    * Emitted when a preset is removed.
    */
+  @GodotApiMember
   public val presetRemoved: Signal1<Color> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ColorPickerButton.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ColorPickerButton.kt
index 8e9d5c0cd7..bcdf28b31b 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ColorPickerButton.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ColorPickerButton.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -38,16 +39,19 @@ public open class ColorPickerButton : Button() {
   /**
    * Emitted when the color changes.
    */
+  @GodotApiMember
   public val colorChanged: Signal1<Color> by Signal1
 
   /**
    * Emitted when the [ColorPicker] is closed.
    */
+  @GodotApiMember
   public val popupClosed: Signal0 by Signal0
 
   /**
    * Emitted when the [ColorPicker] is created (the button is pressed for the first time).
    */
+  @GodotApiMember
   public val pickerCreated: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/CompositorEffect.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/CompositorEffect.kt
index 2ed4311048..a9a74ed2e6 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/CompositorEffect.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/CompositorEffect.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.TypeManager
@@ -141,6 +142,7 @@ public open class CompositorEffect : Resource() {
    * match the effect callback type you've specified in [effectCallbackType]. [renderData] provides
    * access to the rendering state, it is only valid during rendering and should not be stored.
    */
+  @GodotApiMember
   public open fun _renderCallback(effectCallbackType: Int, renderData: RenderData?): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Container.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Container.kt
index 5c5e8c21b6..766f0387c3 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Container.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Container.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedInt32Array
@@ -31,11 +32,13 @@ public open class Container : Control() {
   /**
    * Emitted when children are going to be sorted.
    */
+  @GodotApiMember
   public val preSortChildren: Signal0 by Signal0
 
   /**
    * Emitted when sorting the children is needed.
    */
+  @GodotApiMember
   public val sortChildren: Signal0 by Signal0
 
   public override fun new(scriptIndex: Int): Unit {
@@ -49,6 +52,7 @@ public open class Container : Control() {
    * **Note:** Having no size flags is equal to having [Control.SIZE_SHRINK_BEGIN]. As such, this
    * value is always implicitly allowed.
    */
+  @GodotApiMember
   public open fun _getAllowedSizeFlagsHorizontal(): PackedInt32Array {
     throw NotImplementedError("_get_allowed_size_flags_horizontal is not implemented for Container")
   }
@@ -60,6 +64,7 @@ public open class Container : Control() {
    * **Note:** Having no size flags is equal to having [Control.SIZE_SHRINK_BEGIN]. As such, this
    * value is always implicitly allowed.
    */
+  @GodotApiMember
   public open fun _getAllowedSizeFlagsVertical(): PackedInt32Array {
     throw NotImplementedError("_get_allowed_size_flags_vertical is not implemented for Container")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Control.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Control.kt
index 2c52871a82..e4e19b339b 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Control.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Control.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Callable
@@ -85,11 +86,13 @@ public open class Control : CanvasItem() {
   /**
    * Emitted when the control changes size.
    */
+  @GodotApiMember
   public val resized: Signal0 by Signal0
 
   /**
    * Emitted when the node receives an [InputEvent].
    */
+  @GodotApiMember
   public val guiInput: Signal1<InputEvent> by Signal1
 
   /**
@@ -98,6 +101,7 @@ public open class Control : CanvasItem() {
    * it and regardless if it's currently focused or not.
    * **Note:** [CanvasItem.zIndex] doesn't affect, which Control receives the signal.
    */
+  @GodotApiMember
   public val mouseEntered: Signal0 by Signal0
 
   /**
@@ -113,31 +117,37 @@ public open class Control : CanvasItem() {
    *         # Not hovering over area.
    * [/codeblock]
    */
+  @GodotApiMember
   public val mouseExited: Signal0 by Signal0
 
   /**
    * Emitted when the node gains focus.
    */
+  @GodotApiMember
   public val focusEntered: Signal0 by Signal0
 
   /**
    * Emitted when the node loses focus.
    */
+  @GodotApiMember
   public val focusExited: Signal0 by Signal0
 
   /**
    * Emitted when one of the size flags changes. See [sizeFlagsHorizontal] and [sizeFlagsVertical].
    */
+  @GodotApiMember
   public val sizeFlagsChanged: Signal0 by Signal0
 
   /**
    * Emitted when the node's minimum size changes.
    */
+  @GodotApiMember
   public val minimumSizeChanged: Signal0 by Signal0
 
   /**
    * Emitted when the [NOTIFICATION_THEME_CHANGED] notification is sent.
    */
+  @GodotApiMember
   public val themeChanged: Signal0 by Signal0
 
   /**
@@ -788,6 +798,7 @@ public open class Control : CanvasItem() {
    * **Note:** If you want to check if a point is inside the control, you can use
    * `Rect2(Vector2.ZERO, size).has_point(point)`.
    */
+  @GodotApiMember
   public open fun _hasPoint(point: Vector2): Boolean {
     throw NotImplementedError("_has_point is not implemented for Control")
   }
@@ -798,6 +809,7 @@ public open class Control : CanvasItem() {
    * order. Ranges should cover full source [text] without overlaps. BiDi algorithm will be used on
    * each range separately.
    */
+  @GodotApiMember
   public open fun _structuredTextParser(args: VariantArray<Any?>, text: String):
       VariantArray<Vector3i> {
     throw NotImplementedError("_structured_text_parser is not implemented for Control")
@@ -812,6 +824,7 @@ public open class Control : CanvasItem() {
    * already overrides its minimum size (e.g. [Label], [Button], [PanelContainer] etc.). It can only be
    * used with most basic GUI nodes, like [Control], [Container], [Panel] etc.
    */
+  @GodotApiMember
   public open fun _getMinimumSize(): Vector2 {
     throw NotImplementedError("_get_minimum_size is not implemented for Control")
   }
@@ -822,6 +835,7 @@ public open class Control : CanvasItem() {
    * resting over this control. See [getTooltip].
    * **Note:** If this method returns an empty [String], no tooltip is displayed.
    */
+  @GodotApiMember
   public open fun _getTooltip(atPosition: Vector2): String {
     throw NotImplementedError("_get_tooltip is not implemented for Control")
   }
@@ -853,6 +867,7 @@ public open class Control : CanvasItem() {
    * }
    * ```
    */
+  @GodotApiMember
   public open fun _getDragData(atPosition: Vector2): Any? {
     throw NotImplementedError("_get_drag_data is not implemented for Control")
   }
@@ -880,6 +895,7 @@ public open class Control : CanvasItem() {
    * }
    * ```
    */
+  @GodotApiMember
   public open fun _canDropData(atPosition: Vector2, `data`: Any?): Boolean {
     throw NotImplementedError("_can_drop_data is not implemented for Control")
   }
@@ -911,6 +927,7 @@ public open class Control : CanvasItem() {
    * }
    * ```
    */
+  @GodotApiMember
   public open fun _dropData(atPosition: Vector2, `data`: Any?): Unit {
   }
 
@@ -970,6 +987,7 @@ public open class Control : CanvasItem() {
    * }
    * ```
    */
+  @GodotApiMember
   public open fun _makeCustomTooltip(forText: String): Object? {
     throw NotImplementedError("_make_custom_tooltip is not implemented for Control")
   }
@@ -1009,6 +1027,7 @@ public open class Control : CanvasItem() {
    * * it happens outside the parent's rectangle and the parent has either [clipContents] enabled.
    * **Note:** Event position is relative to the control origin.
    */
+  @GodotApiMember
   public open fun _guiInput(event: InputEvent?): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Curve.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Curve.kt
index 39a8c91af4..802df5607d 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Curve.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Curve.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -36,6 +37,7 @@ public open class Curve : Resource() {
   /**
    * Emitted when [maxValue] or [minValue] is changed.
    */
+  @GodotApiMember
   public val rangeChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/EngineProfiler.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/EngineProfiler.kt
index efef9ab746..d0c178efee 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/EngineProfiler.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/EngineProfiler.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.VariantArray
 import kotlin.Any
@@ -29,12 +30,14 @@ public open class EngineProfiler : RefCounted() {
   /**
    * Called when the profiler is enabled/disabled, along with a set of [options].
    */
+  @GodotApiMember
   public open fun _toggle(enable: Boolean, options: VariantArray<Any?>): Unit {
   }
 
   /**
    * Called when data is added to profiler using [EngineDebugger.profilerAddFrameData].
    */
+  @GodotApiMember
   public open fun _addFrame(`data`: VariantArray<Any?>): Unit {
   }
 
@@ -43,6 +46,7 @@ public open class EngineProfiler : RefCounted() {
    * current frame. All time values are in seconds. Lower values represent faster processing times and
    * are therefore considered better.
    */
+  @GodotApiMember
   public open fun _tick(
     frameTime: Double,
     processTime: Double,
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/FileDialog.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/FileDialog.kt
index e11fc20e42..6567b49ee5 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/FileDialog.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/FileDialog.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -40,16 +41,19 @@ public open class FileDialog : ConfirmationDialog() {
   /**
    * Emitted when the user selects a file by double-clicking it or pressing the **OK** button.
    */
+  @GodotApiMember
   public val fileSelected: Signal1<String> by Signal1
 
   /**
    * Emitted when the user selects multiple files.
    */
+  @GodotApiMember
   public val filesSelected: Signal1<PackedStringArray> by Signal1
 
   /**
    * Emitted when the user selects a directory.
    */
+  @GodotApiMember
   public val dirSelected: Signal1<String> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/GDExtensionManager.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/GDExtensionManager.kt
index 84ba8e9f36..7533fc72c0 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/GDExtensionManager.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/GDExtensionManager.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedStringArray
@@ -35,6 +36,7 @@ public object GDExtensionManager : Object() {
   /**
    * Emitted after the editor has finished reloading one or more extensions.
    */
+  @GodotApiMember
   @JvmStatic
   public val extensionsReloaded: Signal0 by Signal0
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/GLTFDocumentExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/GLTFDocumentExtension.kt
index db33a658c1..e31e01e820 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/GLTFDocumentExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/GLTFDocumentExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.Dictionary
 import godot.core.PackedByteArray
@@ -40,6 +41,7 @@ public open class GLTFDocumentExtension : Resource() {
    * for importing a given GLTF file. If [OK], the import will use this [GLTFDocumentExtension]
    * instance. If not overridden, [OK] is returned.
    */
+  @GodotApiMember
   public open fun _importPreflight(state: GLTFState?, extensions: PackedStringArray): Error {
     throw NotImplementedError("_import_preflight is not implemented for GLTFDocumentExtension")
   }
@@ -50,6 +52,7 @@ public open class GLTFDocumentExtension : Resource() {
    * Returns an array of the GLTF extensions supported by this GLTFDocumentExtension class. This is
    * used to validate if a GLTF file with required extensions can be loaded.
    */
+  @GodotApiMember
   public open fun _getSupportedExtensions(): PackedStringArray {
     throw NotImplementedError("_get_supported_extensions is not implemented for GLTFDocumentExtension")
   }
@@ -61,6 +64,7 @@ public open class GLTFDocumentExtension : Resource() {
    * extension JSON data into a format that can be used by [_generateSceneNode]. The return value
    * should be a member of the [Error] enum.
    */
+  @GodotApiMember
   public open fun _parseNodeExtensions(
     state: GLTFState?,
     gltfNode: GLTFNode?,
@@ -75,6 +79,7 @@ public open class GLTFDocumentExtension : Resource() {
    * Runs when parsing image data from a GLTF file. The data could be sourced from a separate file,
    * a URI, or a buffer, and then is passed as a byte array.
    */
+  @GodotApiMember
   public open fun _parseImageData(
     state: GLTFState?,
     imageData: PackedByteArray,
@@ -91,6 +96,7 @@ public open class GLTFDocumentExtension : Resource() {
    * be a [ResourceImporter] class able to import the file. If not defined or empty, Godot will save
    * the image into a PNG file.
    */
+  @GodotApiMember
   public open fun _getImageFileExtension(): String {
     throw NotImplementedError("_get_image_file_extension is not implemented for GLTFDocumentExtension")
   }
@@ -101,6 +107,7 @@ public open class GLTFDocumentExtension : Resource() {
    * Runs when parsing the texture JSON from the GLTF textures array. This can be used to set the
    * source image index to use as the texture.
    */
+  @GodotApiMember
   public open fun _parseTextureJson(
     state: GLTFState?,
     textureJson: Dictionary<Any?, Any?>,
@@ -117,6 +124,7 @@ public open class GLTFDocumentExtension : Resource() {
    * returned node.
    * **Note:** The [sceneParent] parameter may be null if this is the single root node.
    */
+  @GodotApiMember
   public open fun _generateSceneNode(
     state: GLTFState?,
     gltfNode: GLTFNode?,
@@ -131,6 +139,7 @@ public open class GLTFDocumentExtension : Resource() {
    * This method can be used to modify any of the data imported so far after parsing, before
    * generating the nodes and then running the final per-node import step.
    */
+  @GodotApiMember
   public open fun _importPostParse(state: GLTFState?): Error {
     throw NotImplementedError("_import_post_parse is not implemented for GLTFDocumentExtension")
   }
@@ -140,6 +149,7 @@ public open class GLTFDocumentExtension : Resource() {
    * [_importPost].
    * This method can be used to make modifications to each of the generated Godot scene nodes.
    */
+  @GodotApiMember
   public open fun _importNode(
     state: GLTFState?,
     gltfNode: GLTFNode?,
@@ -154,6 +164,7 @@ public open class GLTFDocumentExtension : Resource() {
    * process.
    * This method can be used to modify the final Godot scene generated by the import process.
    */
+  @GodotApiMember
   public open fun _importPost(state: GLTFState?, root: Node?): Error {
     throw NotImplementedError("_import_post is not implemented for GLTFDocumentExtension")
   }
@@ -165,6 +176,7 @@ public open class GLTFDocumentExtension : Resource() {
    * for exporting a given GLTF file. If [OK], the export will use this [GLTFDocumentExtension]
    * instance. If not overridden, [OK] is returned.
    */
+  @GodotApiMember
   public open fun _exportPreflight(state: GLTFState?, root: Node?): Error {
     throw NotImplementedError("_export_preflight is not implemented for GLTFDocumentExtension")
   }
@@ -175,6 +187,7 @@ public open class GLTFDocumentExtension : Resource() {
    * Runs when converting the data from a Godot scene node. This method can be used to process the
    * Godot scene node data into a format that can be used by [_exportNode].
    */
+  @GodotApiMember
   public open fun _convertSceneNode(
     state: GLTFState?,
     gltfNode: GLTFNode?,
@@ -189,6 +202,7 @@ public open class GLTFDocumentExtension : Resource() {
    * when generating a buffer with [GLTFDocument.generateBuffer] or writing to the file system with
    * [GLTFDocument.writeToFilesystem].
    */
+  @GodotApiMember
   public open fun _exportPreserialize(state: GLTFState?): Error {
     throw NotImplementedError("_export_preserialize is not implemented for GLTFDocumentExtension")
   }
@@ -203,6 +217,7 @@ public open class GLTFDocumentExtension : Resource() {
    * otherwise [_exportNode] will run next. If the format name contains `"Lossy"`, the lossy quality
    * slider will be displayed.
    */
+  @GodotApiMember
   public open fun _getSaveableImageFormats(): PackedStringArray {
     throw NotImplementedError("_get_saveable_image_formats is not implemented for GLTFDocumentExtension")
   }
@@ -217,6 +232,7 @@ public open class GLTFDocumentExtension : Resource() {
    * example, for a PNG image, it would be set to `"image/png"`. The return value must be a
    * [PackedByteArray] containing the image data.
    */
+  @GodotApiMember
   public open fun _serializeImageToBytes(
     state: GLTFState?,
     image: Image?,
@@ -234,6 +250,7 @@ public open class GLTFDocumentExtension : Resource() {
    * [_serializeImageToBytes] runs instead. Note that these methods only run when this
    * [GLTFDocumentExtension] is selected as the image exporter.
    */
+  @GodotApiMember
   public open fun _saveImageAtPath(
     state: GLTFState?,
     image: Image?,
@@ -252,6 +269,7 @@ public open class GLTFDocumentExtension : Resource() {
    * The extension must also be added as used extension with [GLTFState.addUsedExtension], be sure to
    * set `required` to `true` if you are not providing a fallback.
    */
+  @GodotApiMember
   public open fun _serializeTextureJson(
     state: GLTFState?,
     textureJson: Dictionary<Any?, Any?>,
@@ -270,6 +288,7 @@ public open class GLTFDocumentExtension : Resource() {
    * available. The node may be null if not available, such as when exporting GLTF data not generated
    * from a Godot scene.
    */
+  @GodotApiMember
   public open fun _exportNode(
     state: GLTFState?,
     gltfNode: GLTFNode?,
@@ -284,6 +303,7 @@ public open class GLTFDocumentExtension : Resource() {
    * process.
    * This method can be used to modify the final JSON of the generated GLTF file.
    */
+  @GodotApiMember
   public open fun _exportPost(state: GLTFState?): Error {
     throw NotImplementedError("_export_post is not implemented for GLTFDocumentExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/GPUParticles2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/GPUParticles2D.kt
index 450d30162c..762156637f 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/GPUParticles2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/GPUParticles2D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -57,6 +58,7 @@ public open class GPUParticles2D : Node2D() {
    * a short period after receiving the signal during which setting [emitting] to `true` will not
    * restart the emission cycle. This delay is avoided by instead calling [restart].
    */
+  @GodotApiMember
   public val finished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/GPUParticles3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/GPUParticles3D.kt
index 71be941450..fbca1f92ec 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/GPUParticles3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/GPUParticles3D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.AABB
@@ -53,6 +54,7 @@ public open class GPUParticles3D : GeometryInstance3D() {
    * a short period after receiving the signal during which setting [emitting] to `true` will not
    * restart the emission cycle. This delay is avoided by instead calling [restart].
    */
+  @GodotApiMember
   public val finished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphEdit.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphEdit.kt
index b81093fa55..de45e578e9 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphEdit.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphEdit.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -68,44 +69,52 @@ public open class GraphEdit : Control() {
    * Emitted to the GraphEdit when the connection between the [fromPort] of the [fromNode]
    * [GraphNode] and the [toPort] of the [toNode] [GraphNode] is attempted to be created.
    */
+  @GodotApiMember
   public val connectionRequest: Signal4<StringName, Long, StringName, Long> by Signal4
 
   /**
    * Emitted to the GraphEdit when the connection between [fromPort] of [fromNode] [GraphNode] and
    * [toPort] of [toNode] [GraphNode] is attempted to be removed.
    */
+  @GodotApiMember
   public val disconnectionRequest: Signal4<StringName, Long, StringName, Long> by Signal4
 
   /**
    * Emitted when user drags a connection from an output port into the empty space of the graph.
    */
+  @GodotApiMember
   public val connectionToEmpty: Signal3<StringName, Long, Vector2> by Signal3
 
   /**
    * Emitted when user drags a connection from an input port into the empty space of the graph.
    */
+  @GodotApiMember
   public val connectionFromEmpty: Signal3<StringName, Long, Vector2> by Signal3
 
   /**
    * Emitted at the beginning of a connection drag.
    */
+  @GodotApiMember
   public val connectionDragStarted: Signal3<StringName, Long, Boolean> by Signal3
 
   /**
    * Emitted at the end of a connection drag.
    */
+  @GodotApiMember
   public val connectionDragEnded: Signal0 by Signal0
 
   /**
    * Emitted when this [GraphEdit] captures a `ui_copy` action ([kbd]Ctrl + C[/kbd] by default). In
    * general, this signal indicates that the selected [GraphElement]s should be copied.
    */
+  @GodotApiMember
   public val copyNodesRequest: Signal0 by Signal0
 
   /**
    * Emitted when this [GraphEdit] captures a `ui_paste` action ([kbd]Ctrl + V[/kbd] by default). In
    * general, this signal indicates that previously copied [GraphElement]s should be pasted.
    */
+  @GodotApiMember
   public val pasteNodesRequest: Signal0 by Signal0
 
   /**
@@ -113,6 +122,7 @@ public open class GraphEdit : Control() {
    * default). In general, this signal indicates that the selected [GraphElement]s should be
    * duplicated.
    */
+  @GodotApiMember
   public val duplicateNodesRequest: Signal0 by Signal0
 
   /**
@@ -121,37 +131,44 @@ public open class GraphEdit : Control() {
    * [nodes] is an array of node names that should be removed. These usually include all selected
    * nodes.
    */
+  @GodotApiMember
   public val deleteNodesRequest: Signal1<VariantArray<StringName>> by Signal1
 
   /**
    * Emitted when the given [GraphElement] node is selected.
    */
+  @GodotApiMember
   public val nodeSelected: Signal1<Node> by Signal1
 
   /**
    * Emitted when the given [GraphElement] node is deselected.
    */
+  @GodotApiMember
   public val nodeDeselected: Signal1<Node> by Signal1
 
   /**
    * Emitted when the [GraphFrame] [frame] is resized to [newRect].
    */
+  @GodotApiMember
   public val frameRectChanged: Signal2<GraphFrame, Vector2> by Signal2
 
   /**
    * Emitted when a popup is requested. Happens on right-clicking in the GraphEdit. [atPosition] is
    * the position of the mouse pointer when the signal is sent.
    */
+  @GodotApiMember
   public val popupRequest: Signal1<Vector2> by Signal1
 
   /**
    * Emitted at the beginning of a [GraphElement]'s movement.
    */
+  @GodotApiMember
   public val beginNodeMove: Signal0 by Signal0
 
   /**
    * Emitted at the end of a [GraphElement]'s movement.
    */
+  @GodotApiMember
   public val endNodeMove: Signal0 by Signal0
 
   /**
@@ -159,12 +176,14 @@ public open class GraphEdit : Control() {
    * they were not previously attached to any other one.
    * [elements] is an array of [GraphElement]s to be attached.
    */
+  @GodotApiMember
   public val graphElementsLinkedToFrameRequest: Signal2<VariantArray<Any?>, StringName> by Signal2
 
   /**
    * Emitted when the scroll offset is changed by the user. It will not be emitted when changed in
    * code.
    */
+  @GodotApiMember
   public val scrollOffsetChanged: Signal1<Vector2> by Signal1
 
   /**
@@ -496,6 +515,7 @@ public open class GraphEdit : Control() {
    *     return rect.has_point(mouse_position)
    * [/codeblock]
    */
+  @GodotApiMember
   public open fun _isInInputHotzone(
     inNode: Object?,
     inPort: Int,
@@ -519,6 +539,7 @@ public open class GraphEdit : Control() {
    *     return rect.has_point(mouse_position)
    * [/codeblock]
    */
+  @GodotApiMember
   public open fun _isInOutputHotzone(
     inNode: Object?,
     inPort: Int,
@@ -530,6 +551,7 @@ public open class GraphEdit : Control() {
   /**
    * Virtual method which can be overridden to customize how connections are drawn.
    */
+  @GodotApiMember
   public open fun _getConnectionLine(fromPosition: Vector2, toPosition: Vector2):
       PackedVector2Array {
     throw NotImplementedError("_get_connection_line is not implemented for GraphEdit")
@@ -557,6 +579,7 @@ public open class GraphEdit : Control() {
    * }
    * ```
    */
+  @GodotApiMember
   public open fun _isNodeHoverValid(
     fromNode: StringName,
     fromPort: Int,
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphElement.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphElement.kt
index 940df93054..99a85fc250 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphElement.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphElement.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -35,43 +36,51 @@ public open class GraphElement : Container() {
   /**
    * Emitted when the GraphElement is selected.
    */
+  @GodotApiMember
   public val nodeSelected: Signal0 by Signal0
 
   /**
    * Emitted when the GraphElement is deselected.
    */
+  @GodotApiMember
   public val nodeDeselected: Signal0 by Signal0
 
   /**
    * Emitted when displaying the GraphElement over other ones is requested. Happens on focusing
    * (clicking into) the GraphElement.
    */
+  @GodotApiMember
   public val raiseRequest: Signal0 by Signal0
 
   /**
    * Emitted when removing the GraphElement is requested.
    */
+  @GodotApiMember
   public val deleteRequest: Signal0 by Signal0
 
   /**
    * Emitted when resizing the GraphElement is requested. Happens on dragging the resizer handle
    * (see [resizable]).
    */
+  @GodotApiMember
   public val resizeRequest: Signal1<Vector2> by Signal1
 
   /**
    * Emitted when releasing the mouse button after dragging the resizer handle (see [resizable]).
    */
+  @GodotApiMember
   public val resizeEnd: Signal1<Vector2> by Signal1
 
   /**
    * Emitted when the GraphElement is dragged.
    */
+  @GodotApiMember
   public val dragged: Signal2<Vector2, Vector2> by Signal2
 
   /**
    * Emitted when the GraphElement is moved.
    */
+  @GodotApiMember
   public val positionOffsetChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphFrame.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphFrame.kt
index 8db633955d..4b335b49c2 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphFrame.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphFrame.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -40,6 +41,7 @@ public open class GraphFrame : GraphElement() {
   /**
    * Emitted when [autoshrinkEnabled] or [autoshrinkMargin] changes.
    */
+  @GodotApiMember
   public val autoshrinkChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphNode.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphNode.kt
index 490c4464bd..3bd2c68561 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphNode.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/GraphNode.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -53,6 +54,7 @@ public open class GraphNode : GraphElement() {
   /**
    * Emitted when any GraphNode's slot is updated.
    */
+  @GodotApiMember
   public val slotUpdated: Signal1<Long> by Signal1
 
   /**
@@ -82,6 +84,7 @@ public open class GraphNode : GraphElement() {
     callConstructor(ENGINECLASS_GRAPHNODE, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _drawPort(
     slotIndex: Int,
     position: Vector2i,
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/GridMap.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/GridMap.kt
index a784c1a197..1174cd965c 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/GridMap.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/GridMap.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Basis
@@ -58,11 +59,13 @@ public open class GridMap : Node3D() {
   /**
    * Emitted when [cellSize] changes.
    */
+  @GodotApiMember
   public val cellSizeChanged: Signal1<Vector3> by Signal1
 
   /**
    * Emitted when the [MeshLibrary] of this GridMap changes.
    */
+  @GodotApiMember
   public val changed: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/HTTPRequest.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/HTTPRequest.kt
index e75f0525a6..fb1c640320 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/HTTPRequest.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/HTTPRequest.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedByteArray
@@ -197,6 +198,7 @@ public open class HTTPRequest : Node() {
   /**
    * Emitted when a request is completed.
    */
+  @GodotApiMember
   public val requestCompleted: Signal4<Long, Long, PackedStringArray, PackedByteArray> by Signal4
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ImageFormatLoaderExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ImageFormatLoaderExtension.kt
index bc2cd0c7e2..328206f434 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ImageFormatLoaderExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ImageFormatLoaderExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedStringArray
@@ -34,6 +35,7 @@ public open class ImageFormatLoaderExtension : ImageFormatLoader() {
    * Returns the list of file extensions for this image format. Files with the given extensions will
    * be treated as image file and loaded using this class.
    */
+  @GodotApiMember
   public open fun _getRecognizedExtensions(): PackedStringArray {
     throw NotImplementedError("_get_recognized_extensions is not implemented for ImageFormatLoaderExtension")
   }
@@ -41,6 +43,7 @@ public open class ImageFormatLoaderExtension : ImageFormatLoader() {
   /**
    * Loads the content of [fileaccess] into the provided [image].
    */
+  @GodotApiMember
   public open fun _loadImage(
     image: Image?,
     fileaccess: FileAccess?,
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Input.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Input.kt
index 6ab17008cf..5ce55356bd 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Input.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Input.kt
@@ -7,6 +7,7 @@
 package godot
 
 import godot.MouseButtonMaskValue
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -53,6 +54,7 @@ public object Input : Object() {
   /**
    * Emitted when a joypad device has been connected or disconnected.
    */
+  @GodotApiMember
   @JvmStatic
   public val joyConnectionChanged: Signal2<Long, Boolean> by Signal2
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ItemList.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ItemList.kt
index 5bb9ed33c1..c424fe7a89 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ItemList.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ItemList.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -73,11 +74,13 @@ public open class ItemList : Control() {
    * Triggered when specified item has been selected.
    * [allowReselect] must be enabled to reselect an item.
    */
+  @GodotApiMember
   public val itemSelected: Signal1<Long> by Signal1
 
   /**
    * Triggered when any mouse click is issued within the rect of the list but on empty space.
    */
+  @GodotApiMember
   public val emptyClicked: Signal2<Vector2, Long> by Signal2
 
   /**
@@ -85,17 +88,20 @@ public open class ItemList : Control() {
    * The click position is also provided to allow appropriate popup of context menus at the correct
    * location.
    */
+  @GodotApiMember
   public val itemClicked: Signal3<Long, Vector2, Long> by Signal3
 
   /**
    * Triggered when a multiple selection is altered on a list allowing multiple selection.
    */
+  @GodotApiMember
   public val multiSelected: Signal2<Long, Boolean> by Signal2
 
   /**
    * Triggered when specified list item is activated via double-clicking or by pressing
    * [kbd]Enter[/kbd].
    */
+  @GodotApiMember
   public val itemActivated: Signal1<Long> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/JavaScriptBridge.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/JavaScriptBridge.kt
index c9c54235d0..e3140508cb 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/JavaScriptBridge.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/JavaScriptBridge.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Callable
@@ -48,6 +49,7 @@ public object JavaScriptBridge : Object() {
    * activated because a previous version is active. See [pwaUpdate] to force the update to take place
    * immediately.
    */
+  @GodotApiMember
   @JvmStatic
   public val pwaUpdateAvailable: Signal0 by Signal0
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/LineEdit.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/LineEdit.kt
index e73c2cf829..ff94f775f3 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/LineEdit.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/LineEdit.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal1
@@ -63,17 +64,20 @@ public open class LineEdit : Control() {
   /**
    * Emitted when the text changes.
    */
+  @GodotApiMember
   public val textChanged: Signal1<String> by Signal1
 
   /**
    * Emitted when appending text that overflows the [maxLength]. The appended text is truncated to
    * fit [maxLength], and the part that couldn't fit is passed as the [rejectedSubstring] argument.
    */
+  @GodotApiMember
   public val textChangeRejected: Signal1<String> by Signal1
 
   /**
    * Emitted when the user presses [KEY_ENTER] on the [LineEdit].
    */
+  @GodotApiMember
   public val textSubmitted: Signal1<String> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/MainLoop.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/MainLoop.kt
index 6261372526..46f60bd63b 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/MainLoop.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/MainLoop.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.Signal2
 import kotlin.Boolean
@@ -82,6 +83,7 @@ public open class MainLoop : Object() {
   /**
    * Emitted when a user responds to a permission request.
    */
+  @GodotApiMember
   public val onRequestPermissionsResult: Signal2<String, Boolean> by Signal2
 
   public override fun new(scriptIndex: Int): Unit {
@@ -91,6 +93,7 @@ public open class MainLoop : Object() {
   /**
    * Called once during initialization.
    */
+  @GodotApiMember
   public open fun _initialize(): Unit {
   }
 
@@ -100,6 +103,7 @@ public open class MainLoop : Object() {
    * If implemented, the method must return a boolean value. `true` ends the main loop, while
    * `false` lets it proceed to the next frame.
    */
+  @GodotApiMember
   public open fun _physicsProcess(delta: Double): Boolean {
     throw NotImplementedError("_physics_process is not implemented for MainLoop")
   }
@@ -110,6 +114,7 @@ public open class MainLoop : Object() {
    * If implemented, the method must return a boolean value. `true` ends the main loop, while
    * `false` lets it proceed to the next frame.
    */
+  @GodotApiMember
   public open fun _process(delta: Double): Boolean {
     throw NotImplementedError("_process is not implemented for MainLoop")
   }
@@ -117,6 +122,7 @@ public open class MainLoop : Object() {
   /**
    * Called before the program exits.
    */
+  @GodotApiMember
   public open fun _finalize(): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Material.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Material.kt
index 3214e3c2cc..428141de24 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Material.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Material.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.RID
@@ -73,6 +74,7 @@ public open class Material : Resource() {
    * Only exposed for the purpose of overriding. You cannot call this function directly. Used
    * internally by various editor tools. Used to access the RID of the [Material]'s [Shader].
    */
+  @GodotApiMember
   public open fun _getShaderRid(): RID {
     throw NotImplementedError("_get_shader_rid is not implemented for Material")
   }
@@ -81,6 +83,7 @@ public open class Material : Resource() {
    * Only exposed for the purpose of overriding. You cannot call this function directly. Used
    * internally by various editor tools.
    */
+  @GodotApiMember
   public open fun _getShaderMode(): Shader.Mode {
     throw NotImplementedError("_get_shader_mode is not implemented for Material")
   }
@@ -89,6 +92,7 @@ public open class Material : Resource() {
    * Only exposed for the purpose of overriding. You cannot call this function directly. Used
    * internally to determine if [nextPass] should be shown in the editor or not.
    */
+  @GodotApiMember
   public open fun _canDoNextPass(): Boolean {
     throw NotImplementedError("_can_do_next_pass is not implemented for Material")
   }
@@ -97,6 +101,7 @@ public open class Material : Resource() {
    * Only exposed for the purpose of overriding. You cannot call this function directly. Used
    * internally to determine if [renderPriority] should be shown in the editor or not.
    */
+  @GodotApiMember
   public open fun _canUseRenderPriority(): Boolean {
     throw NotImplementedError("_can_use_render_priority is not implemented for Material")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/MenuButton.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/MenuButton.kt
index 8e78a5fca4..318576a670 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/MenuButton.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/MenuButton.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -33,6 +34,7 @@ public open class MenuButton : Button() {
   /**
    * Emitted when the [PopupMenu] of this MenuButton is about to show.
    */
+  @GodotApiMember
   public val aboutToPopup: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Mesh.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Mesh.kt
index 777e3c03c4..494ebd200b 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Mesh.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Mesh.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.AABB
@@ -91,6 +92,7 @@ public open class Mesh : Resource() {
   /**
    * Virtual method to override the surface count for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _getSurfaceCount(): Int {
     throw NotImplementedError("_get_surface_count is not implemented for Mesh")
   }
@@ -98,6 +100,7 @@ public open class Mesh : Resource() {
   /**
    * Virtual method to override the surface array length for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _surfaceGetArrayLen(index: Int): Int {
     throw NotImplementedError("_surface_get_array_len is not implemented for Mesh")
   }
@@ -105,6 +108,7 @@ public open class Mesh : Resource() {
   /**
    * Virtual method to override the surface array index length for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _surfaceGetArrayIndexLen(index: Int): Int {
     throw NotImplementedError("_surface_get_array_index_len is not implemented for Mesh")
   }
@@ -112,6 +116,7 @@ public open class Mesh : Resource() {
   /**
    * Virtual method to override the surface arrays for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _surfaceGetArrays(index: Int): VariantArray<Any?> {
     throw NotImplementedError("_surface_get_arrays is not implemented for Mesh")
   }
@@ -119,6 +124,7 @@ public open class Mesh : Resource() {
   /**
    * Virtual method to override the blend shape arrays for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _surfaceGetBlendShapeArrays(index: Int): VariantArray<VariantArray<Any?>> {
     throw NotImplementedError("_surface_get_blend_shape_arrays is not implemented for Mesh")
   }
@@ -126,6 +132,7 @@ public open class Mesh : Resource() {
   /**
    * Virtual method to override the surface LODs for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _surfaceGetLods(index: Int): Dictionary<Any?, Any?> {
     throw NotImplementedError("_surface_get_lods is not implemented for Mesh")
   }
@@ -133,6 +140,7 @@ public open class Mesh : Resource() {
   /**
    * Virtual method to override the surface format for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _surfaceGetFormat(index: Int): Long {
     throw NotImplementedError("_surface_get_format is not implemented for Mesh")
   }
@@ -140,6 +148,7 @@ public open class Mesh : Resource() {
   /**
    * Virtual method to override the surface primitive type for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _surfaceGetPrimitiveType(index: Int): Long {
     throw NotImplementedError("_surface_get_primitive_type is not implemented for Mesh")
   }
@@ -148,12 +157,14 @@ public open class Mesh : Resource() {
    * Virtual method to override the setting of a [material] at the given [index] for a custom class
    * extending [Mesh].
    */
+  @GodotApiMember
   public open fun _surfaceSetMaterial(index: Int, material: Material?): Unit {
   }
 
   /**
    * Virtual method to override the surface material for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _surfaceGetMaterial(index: Int): Material? {
     throw NotImplementedError("_surface_get_material is not implemented for Mesh")
   }
@@ -161,6 +172,7 @@ public open class Mesh : Resource() {
   /**
    * Virtual method to override the number of blend shapes for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _getBlendShapeCount(): Int {
     throw NotImplementedError("_get_blend_shape_count is not implemented for Mesh")
   }
@@ -169,6 +181,7 @@ public open class Mesh : Resource() {
    * Virtual method to override the retrieval of blend shape names for a custom class extending
    * [Mesh].
    */
+  @GodotApiMember
   public open fun _getBlendShapeName(index: Int): StringName {
     throw NotImplementedError("_get_blend_shape_name is not implemented for Mesh")
   }
@@ -176,12 +189,14 @@ public open class Mesh : Resource() {
   /**
    * Virtual method to override the names of blend shapes for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _setBlendShapeName(index: Int, name: StringName): Unit {
   }
 
   /**
    * Virtual method to override the [AABB] for a custom class extending [Mesh].
    */
+  @GodotApiMember
   public open fun _getAabb(): AABB {
     throw NotImplementedError("_get_aabb is not implemented for Mesh")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/MeshInstance2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/MeshInstance2D.kt
index b7a2be44c8..b0899829ca 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/MeshInstance2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/MeshInstance2D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -28,6 +29,7 @@ public open class MeshInstance2D : Node2D() {
   /**
    * Emitted when the [texture] is changed.
    */
+  @GodotApiMember
   public val textureChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/MovieWriter.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/MovieWriter.kt
index 8c945ea0c9..036d2e6bc5 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/MovieWriter.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/MovieWriter.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.TypeManager
@@ -65,6 +66,7 @@ public open class MovieWriter : Object() {
    * value returned must be specified in Hz. Defaults to 48000 Hz if [_getAudioMixRate] is not
    * overridden.
    */
+  @GodotApiMember
   public open fun _getAudioMixRate(): Long {
     throw NotImplementedError("_get_audio_mix_rate is not implemented for MovieWriter")
   }
@@ -74,6 +76,7 @@ public open class MovieWriter : Object() {
    * This can affect the number of output channels in the resulting audio file/stream. Defaults to
    * [AudioServer.SPEAKER_MODE_STEREO] if [_getAudioSpeakerMode] is not overridden.
    */
+  @GodotApiMember
   public open fun _getAudioSpeakerMode(): AudioServer.SpeakerMode {
     throw NotImplementedError("_get_audio_speaker_mode is not implemented for MovieWriter")
   }
@@ -90,6 +93,7 @@ public open class MovieWriter : Object() {
    *     return path.get_extension().to_lower() == "mkv"
    * [/codeblock]
    */
+  @GodotApiMember
   public open fun _handlesFile(path: String): Boolean {
     throw NotImplementedError("_handles_file is not implemented for MovieWriter")
   }
@@ -100,6 +104,7 @@ public open class MovieWriter : Object() {
    * settings or using the `--fixed-fps <fps>`
    * [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url].
    */
+  @GodotApiMember
   public open fun _writeBegin(
     movieSize: Vector2i,
     fps: Long,
@@ -114,6 +119,7 @@ public open class MovieWriter : Object() {
    * **Note:** Pressing [kbd]Ctrl + C[/kbd] on the terminal running the editor/project does *not*
    * result in [_writeEnd] being called.
    */
+  @GodotApiMember
   public open fun _writeEnd(): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiMeshInstance2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiMeshInstance2D.kt
index 8fb2ee85d7..da4ba97803 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiMeshInstance2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiMeshInstance2D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -27,6 +28,7 @@ public open class MultiMeshInstance2D : Node2D() {
   /**
    * Emitted when the [texture] is changed.
    */
+  @GodotApiMember
   public val textureChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerAPI.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerAPI.kt
index 643a858c49..546918c683 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerAPI.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerAPI.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedInt32Array
@@ -50,30 +51,35 @@ public open class MultiplayerAPI internal constructor() : RefCounted() {
    * ID of the new peer. Clients get notified when other clients connect to the same server. Upon
    * connecting to a server, a client also receives this signal for the server (with ID being 1).
    */
+  @GodotApiMember
   public val peerConnected: Signal1<Long> by Signal1
 
   /**
    * Emitted when this MultiplayerAPI's [multiplayerPeer] disconnects from a peer. Clients get
    * notified when other clients disconnect from the same server.
    */
+  @GodotApiMember
   public val peerDisconnected: Signal1<Long> by Signal1
 
   /**
    * Emitted when this MultiplayerAPI's [multiplayerPeer] successfully connected to a server. Only
    * emitted on clients.
    */
+  @GodotApiMember
   public val connectedToServer: Signal0 by Signal0
 
   /**
    * Emitted when this MultiplayerAPI's [multiplayerPeer] fails to establish a connection to a
    * server. Only emitted on clients.
    */
+  @GodotApiMember
   public val connectionFailed: Signal0 by Signal0
 
   /**
    * Emitted when this MultiplayerAPI's [multiplayerPeer] disconnects from server. Only emitted on
    * clients.
    */
+  @GodotApiMember
   public val serverDisconnected: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerAPIExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerAPIExtension.kt
index 9cb68f4df3..c78d5bc71b 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerAPIExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerAPIExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.PackedInt32Array
 import godot.core.StringName
@@ -107,6 +108,7 @@ public open class MultiplayerAPIExtension : MultiplayerAPI() {
   /**
    * Callback for [MultiplayerAPI.poll].
    */
+  @GodotApiMember
   public open fun _poll(): Error {
     throw NotImplementedError("_poll is not implemented for MultiplayerAPIExtension")
   }
@@ -114,12 +116,14 @@ public open class MultiplayerAPIExtension : MultiplayerAPI() {
   /**
    * Called when the [MultiplayerAPI.multiplayerPeer] is set.
    */
+  @GodotApiMember
   public open fun _setMultiplayerPeer(multiplayerPeer: MultiplayerPeer?): Unit {
   }
 
   /**
    * Called when the [MultiplayerAPI.multiplayerPeer] is retrieved.
    */
+  @GodotApiMember
   public open fun _getMultiplayerPeer(): MultiplayerPeer? {
     throw NotImplementedError("_get_multiplayer_peer is not implemented for MultiplayerAPIExtension")
   }
@@ -127,6 +131,7 @@ public open class MultiplayerAPIExtension : MultiplayerAPI() {
   /**
    * Callback for [MultiplayerAPI.getUniqueId].
    */
+  @GodotApiMember
   public open fun _getUniqueId(): Int {
     throw NotImplementedError("_get_unique_id is not implemented for MultiplayerAPIExtension")
   }
@@ -134,6 +139,7 @@ public open class MultiplayerAPIExtension : MultiplayerAPI() {
   /**
    * Callback for [MultiplayerAPI.getPeers].
    */
+  @GodotApiMember
   public open fun _getPeerIds(): PackedInt32Array {
     throw NotImplementedError("_get_peer_ids is not implemented for MultiplayerAPIExtension")
   }
@@ -141,6 +147,7 @@ public open class MultiplayerAPIExtension : MultiplayerAPI() {
   /**
    * Callback for [MultiplayerAPI.rpc].
    */
+  @GodotApiMember
   public open fun _rpc(
     peer: Int,
     `object`: Object?,
@@ -153,6 +160,7 @@ public open class MultiplayerAPIExtension : MultiplayerAPI() {
   /**
    * Callback for [MultiplayerAPI.getRemoteSenderId].
    */
+  @GodotApiMember
   public open fun _getRemoteSenderId(): Int {
     throw NotImplementedError("_get_remote_sender_id is not implemented for MultiplayerAPIExtension")
   }
@@ -160,6 +168,7 @@ public open class MultiplayerAPIExtension : MultiplayerAPI() {
   /**
    * Callback for [MultiplayerAPI.objectConfigurationAdd].
    */
+  @GodotApiMember
   public open fun _objectConfigurationAdd(`object`: Object?, configuration: Any?): Error {
     throw NotImplementedError("_object_configuration_add is not implemented for MultiplayerAPIExtension")
   }
@@ -167,6 +176,7 @@ public open class MultiplayerAPIExtension : MultiplayerAPI() {
   /**
    * Callback for [MultiplayerAPI.objectConfigurationRemove].
    */
+  @GodotApiMember
   public open fun _objectConfigurationRemove(`object`: Object?, configuration: Any?): Error {
     throw NotImplementedError("_object_configuration_remove is not implemented for MultiplayerAPIExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerPeer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerPeer.kt
index c3b7646c84..cefc1db9c7 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerPeer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerPeer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal1
@@ -36,11 +37,13 @@ public open class MultiplayerPeer internal constructor() : PacketPeer() {
   /**
    * Emitted when a remote peer connects.
    */
+  @GodotApiMember
   public val peerConnected: Signal1<Long> by Signal1
 
   /**
    * Emitted when a remote peer has disconnected.
    */
+  @GodotApiMember
   public val peerDisconnected: Signal1<Long> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerPeerExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerPeerExtension.kt
index 99bf9c3baf..740f68ce4c 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerPeerExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerPeerExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.PackedByteArray
 import kotlin.Boolean
@@ -28,6 +29,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
   /**
    * Called when the available packet count is internally requested by the [MultiplayerAPI].
    */
+  @GodotApiMember
   public open fun _getAvailablePacketCount(): Int {
     throw NotImplementedError("_get_available_packet_count is not implemented for MultiplayerPeerExtension")
   }
@@ -35,6 +37,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
   /**
    * Called when the maximum allowed packet size (in bytes) is requested by the [MultiplayerAPI].
    */
+  @GodotApiMember
   public open fun _getMaxPacketSize(): Int {
     throw NotImplementedError("_get_max_packet_size is not implemented for MultiplayerPeerExtension")
   }
@@ -43,6 +46,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when a packet needs to be received by the [MultiplayerAPI], if [_getPacket] isn't
    * implemented. Use this when extending this class via GDScript.
    */
+  @GodotApiMember
   public open fun _getPacketScript(): PackedByteArray {
     throw NotImplementedError("_get_packet_script is not implemented for MultiplayerPeerExtension")
   }
@@ -51,6 +55,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when a packet needs to be sent by the [MultiplayerAPI], if [_putPacket] isn't
    * implemented. Use this when extending this class via GDScript.
    */
+  @GodotApiMember
   public open fun _putPacketScript(pBuffer: PackedByteArray): Error {
     throw NotImplementedError("_put_packet_script is not implemented for MultiplayerPeerExtension")
   }
@@ -59,6 +64,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called to get the channel over which the next available packet was received. See
    * [MultiplayerPeer.getPacketChannel].
    */
+  @GodotApiMember
   public open fun _getPacketChannel(): Int {
     throw NotImplementedError("_get_packet_channel is not implemented for MultiplayerPeerExtension")
   }
@@ -67,6 +73,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called to get the transfer mode the remote peer used to send the next available packet. See
    * [MultiplayerPeer.getPacketMode].
    */
+  @GodotApiMember
   public open fun _getPacketMode(): MultiplayerPeer.TransferMode {
     throw NotImplementedError("_get_packet_mode is not implemented for MultiplayerPeerExtension")
   }
@@ -75,6 +82,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the channel to use is set for this [MultiplayerPeer] (see
    * [MultiplayerPeer.transferChannel]).
    */
+  @GodotApiMember
   public open fun _setTransferChannel(pChannel: Int): Unit {
   }
 
@@ -82,6 +90,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the transfer channel to use is read on this [MultiplayerPeer] (see
    * [MultiplayerPeer.transferChannel]).
    */
+  @GodotApiMember
   public open fun _getTransferChannel(): Int {
     throw NotImplementedError("_get_transfer_channel is not implemented for MultiplayerPeerExtension")
   }
@@ -90,6 +99,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the transfer mode is set on this [MultiplayerPeer] (see
    * [MultiplayerPeer.transferMode]).
    */
+  @GodotApiMember
   public open fun _setTransferMode(pMode: MultiplayerPeer.TransferMode): Unit {
   }
 
@@ -97,6 +107,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the transfer mode to use is read on this [MultiplayerPeer] (see
    * [MultiplayerPeer.transferMode]).
    */
+  @GodotApiMember
   public open fun _getTransferMode(): MultiplayerPeer.TransferMode {
     throw NotImplementedError("_get_transfer_mode is not implemented for MultiplayerPeerExtension")
   }
@@ -105,6 +116,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the target peer to use is set for this [MultiplayerPeer] (see
    * [MultiplayerPeer.setTargetPeer]).
    */
+  @GodotApiMember
   public open fun _setTargetPeer(pPeer: Int): Unit {
   }
 
@@ -112,6 +124,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the ID of the [MultiplayerPeer] who sent the most recent packet is requested (see
    * [MultiplayerPeer.getPacketPeer]).
    */
+  @GodotApiMember
   public open fun _getPacketPeer(): Int {
     throw NotImplementedError("_get_packet_peer is not implemented for MultiplayerPeerExtension")
   }
@@ -120,6 +133,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the "is server" status is requested on the [MultiplayerAPI]. See
    * [MultiplayerAPI.isServer].
    */
+  @GodotApiMember
   public open fun _isServer(): Boolean {
     throw NotImplementedError("_is_server is not implemented for MultiplayerPeerExtension")
   }
@@ -127,12 +141,14 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
   /**
    * Called when the [MultiplayerAPI] is polled. See [MultiplayerAPI.poll].
    */
+  @GodotApiMember
   public open fun _poll(): Unit {
   }
 
   /**
    * Called when the multiplayer peer should be immediately closed (see [MultiplayerPeer.close]).
    */
+  @GodotApiMember
   public open fun _close(): Unit {
   }
 
@@ -140,6 +156,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the connected [pPeer] should be forcibly disconnected (see
    * [MultiplayerPeer.disconnectPeer]).
    */
+  @GodotApiMember
   public open fun _disconnectPeer(pPeer: Int, pForce: Boolean): Unit {
   }
 
@@ -147,6 +164,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the unique ID of this [MultiplayerPeer] is requested (see
    * [MultiplayerPeer.getUniqueId]). The value must be between `1` and `2147483647`.
    */
+  @GodotApiMember
   public open fun _getUniqueId(): Int {
     throw NotImplementedError("_get_unique_id is not implemented for MultiplayerPeerExtension")
   }
@@ -155,6 +173,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the "refuse new connections" status is set on this [MultiplayerPeer] (see
    * [MultiplayerPeer.refuseNewConnections]).
    */
+  @GodotApiMember
   public open fun _setRefuseNewConnections(pEnable: Boolean): Unit {
   }
 
@@ -162,6 +181,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the "refuse new connections" status is requested on this [MultiplayerPeer] (see
    * [MultiplayerPeer.refuseNewConnections]).
    */
+  @GodotApiMember
   public open fun _isRefusingNewConnections(): Boolean {
     throw NotImplementedError("_is_refusing_new_connections is not implemented for MultiplayerPeerExtension")
   }
@@ -170,6 +190,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called to check if the server can act as a relay in the current configuration. See
    * [MultiplayerPeer.isServerRelaySupported].
    */
+  @GodotApiMember
   public open fun _isServerRelaySupported(): Boolean {
     throw NotImplementedError("_is_server_relay_supported is not implemented for MultiplayerPeerExtension")
   }
@@ -178,6 +199,7 @@ public open class MultiplayerPeerExtension : MultiplayerPeer() {
    * Called when the connection status is requested on the [MultiplayerPeer] (see
    * [MultiplayerPeer.getConnectionStatus]).
    */
+  @GodotApiMember
   public open fun _getConnectionStatus(): MultiplayerPeer.ConnectionStatus {
     throw NotImplementedError("_get_connection_status is not implemented for MultiplayerPeerExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerSpawner.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerSpawner.kt
index 6e1d0de8a7..0143fcea9c 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerSpawner.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerSpawner.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Callable
@@ -42,12 +43,14 @@ public open class MultiplayerSpawner : Node() {
    * Emitted when a spawnable scene or custom spawn was despawned by the multiplayer authority. Only
    * called on puppets.
    */
+  @GodotApiMember
   public val despawned: Signal1<Node> by Signal1
 
   /**
    * Emitted when a spawnable scene or custom spawn was spawned by the multiplayer authority. Only
    * called on puppets.
    */
+  @GodotApiMember
   public val spawned: Signal1<Node> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerSynchronizer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerSynchronizer.kt
index 6c54e6039f..678bf47385 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerSynchronizer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/MultiplayerSynchronizer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Callable
@@ -50,17 +51,20 @@ public open class MultiplayerSynchronizer : Node() {
    * Emitted when a new synchronization state is received by this synchronizer after the properties
    * have been updated.
    */
+  @GodotApiMember
   public val synchronized: Signal0 by Signal0
 
   /**
    * Emitted when a new delta synchronization state is received by this synchronizer after the
    * properties have been updated.
    */
+  @GodotApiMember
   public val deltaSynchronized: Signal0 by Signal0
 
   /**
    * Emitted when visibility of [forPeer] is updated. See [updateVisibility].
    */
+  @GodotApiMember
   public val visibilityChanged: Signal1<Long> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationAgent2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationAgent2D.kt
index 0423b496d3..dd6744fbea 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationAgent2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationAgent2D.kt
@@ -9,6 +9,7 @@ package godot
 import godot.NavigationPathQueryParameters2D.PathMetadataFlagsValue
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -57,6 +58,7 @@ public open class NavigationAgent2D : Node() {
    * - because navigation map has changed.
    * - because agent pushed further away from the current path segment than the [pathMaxDistance].
    */
+  @GodotApiMember
   public val pathChanged: Signal0 by Signal0
 
   /**
@@ -67,6 +69,7 @@ public open class NavigationAgent2D : Node() {
    * It may not always be possible to reach the target but it should always be possible to reach the
    * final position. See [getFinalPosition].
    */
+  @GodotApiMember
   public val targetReached: Signal0 by Signal0
 
   /**
@@ -79,6 +82,7 @@ public open class NavigationAgent2D : Node() {
    * - `rid`: The [RID] of the containing navigation primitive (region or link).
    * - `owner`: The object which manages the containing navigation primitive (region or link).
    */
+  @GodotApiMember
   public val waypointReached: Signal1<Dictionary<Any?, Any?>> by Signal1
 
   /**
@@ -95,6 +99,7 @@ public open class NavigationAgent2D : Node() {
    * - `link_exit_position`: If `owner` is available and the owner is a [NavigationLink2D], it will
    * contain the global position of the link's point which the agent is exiting.
    */
+  @GodotApiMember
   public val linkReached: Signal1<Dictionary<Any?, Any?>> by Signal1
 
   /**
@@ -103,12 +108,14 @@ public open class NavigationAgent2D : Node() {
    * of the path is reached. This signal is emitted only once per loaded path.
    * This signal will be emitted just after [signal target_reached] when the target is reachable.
    */
+  @GodotApiMember
   public val navigationFinished: Signal0 by Signal0
 
   /**
    * Notifies when the collision avoidance velocity is calculated. Emitted every update as long as
    * [avoidanceEnabled] is `true` and the agent has a navigation map.
    */
+  @GodotApiMember
   public val velocityComputed: Signal1<Vector2> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationAgent3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationAgent3D.kt
index 4ee242913d..b96378091a 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationAgent3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationAgent3D.kt
@@ -9,6 +9,7 @@ package godot
 import godot.NavigationPathQueryParameters3D.PathMetadataFlagsValue
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -57,6 +58,7 @@ public open class NavigationAgent3D : Node() {
    * - because navigation map has changed.
    * - because agent pushed further away from the current path segment than the [pathMaxDistance].
    */
+  @GodotApiMember
   public val pathChanged: Signal0 by Signal0
 
   /**
@@ -67,6 +69,7 @@ public open class NavigationAgent3D : Node() {
    * It may not always be possible to reach the target but it should always be possible to reach the
    * final position. See [getFinalPosition].
    */
+  @GodotApiMember
   public val targetReached: Signal0 by Signal0
 
   /**
@@ -79,6 +82,7 @@ public open class NavigationAgent3D : Node() {
    * - `rid`: The [RID] of the containing navigation primitive (region or link).
    * - `owner`: The object which manages the containing navigation primitive (region or link).
    */
+  @GodotApiMember
   public val waypointReached: Signal1<Dictionary<Any?, Any?>> by Signal1
 
   /**
@@ -95,6 +99,7 @@ public open class NavigationAgent3D : Node() {
    * - `link_exit_position`: If `owner` is available and the owner is a [NavigationLink3D], it will
    * contain the global position of the link's point which the agent is exiting.
    */
+  @GodotApiMember
   public val linkReached: Signal1<Dictionary<Any?, Any?>> by Signal1
 
   /**
@@ -103,12 +108,14 @@ public open class NavigationAgent3D : Node() {
    * of the path is reached. This signal is emitted only once per loaded path.
    * This signal will be emitted just after [signal target_reached] when the target is reachable.
    */
+  @GodotApiMember
   public val navigationFinished: Signal0 by Signal0
 
   /**
    * Notifies when the collision avoidance velocity is calculated. Emitted every update as long as
    * [avoidanceEnabled] is `true` and the agent has a navigation map.
    */
+  @GodotApiMember
   public val velocityComputed: Signal1<Vector3> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationRegion2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationRegion2D.kt
index ae0f5e07b5..9943e795d5 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationRegion2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationRegion2D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.RID
@@ -51,11 +52,13 @@ public open class NavigationRegion2D : Node2D() {
    * Emitted when the used navigation polygon is replaced or changes to the internals of the current
    * navigation polygon are committed.
    */
+  @GodotApiMember
   public val navigationPolygonChanged: Signal0 by Signal0
 
   /**
    * Emitted when a navigation polygon bake operation is completed.
    */
+  @GodotApiMember
   public val bakeFinished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationRegion3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationRegion3D.kt
index 3fe112e9ab..b42580f318 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationRegion3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationRegion3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.RID
@@ -50,11 +51,13 @@ public open class NavigationRegion3D : Node3D() {
   /**
    * Notifies when the [NavigationMesh] has changed.
    */
+  @GodotApiMember
   public val navigationMeshChanged: Signal0 by Signal0
 
   /**
    * Notifies when the navigation mesh bake operation is completed.
    */
+  @GodotApiMember
   public val bakeFinished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationServer2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationServer2D.kt
index eecf940cec..fccadf115a 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationServer2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationServer2D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Callable
@@ -66,12 +67,14 @@ public object NavigationServer2D : Object() {
   /**
    * Emitted when a navigation map is updated, when a region moves or is modified.
    */
+  @GodotApiMember
   @JvmStatic
   public val mapChanged: Signal1<RID> by Signal1
 
   /**
    * Emitted when navigation debug settings are changed. Only available in debug builds.
    */
+  @GodotApiMember
   @JvmStatic
   public val navigationDebugChanged: Signal0 by Signal0
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationServer3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationServer3D.kt
index 4c4a3c770b..a4fcdf1d59 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationServer3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/NavigationServer3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Callable
@@ -66,18 +67,21 @@ public object NavigationServer3D : Object() {
   /**
    * Emitted when a navigation map is updated, when a region moves or is modified.
    */
+  @GodotApiMember
   @JvmStatic
   public val mapChanged: Signal1<RID> by Signal1
 
   /**
    * Emitted when navigation debug settings are changed. Only available in debug builds.
    */
+  @GodotApiMember
   @JvmStatic
   public val navigationDebugChanged: Signal0 by Signal0
 
   /**
    * Emitted when avoidance debug settings are changed. Only available in debug builds.
    */
+  @GodotApiMember
   @JvmStatic
   public val avoidanceDebugChanged: Signal0 by Signal0
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/NinePatchRect.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/NinePatchRect.kt
index f6f053ebf7..c1b0deba8a 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/NinePatchRect.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/NinePatchRect.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Rect2
@@ -37,6 +38,7 @@ public open class NinePatchRect : Control() {
   /**
    * Emitted when the node's texture changes.
    */
+  @GodotApiMember
   public val textureChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Node.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Node.kt
index dae6f01e1e..4c7d0576a9 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Node.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Node.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.NodePath
@@ -103,17 +104,20 @@ public open class Node : Object() {
   /**
    * Emitted when the node is considered ready, after [_ready] is called.
    */
+  @GodotApiMember
   public val ready: Signal0 by Signal0
 
   /**
    * Emitted when the node's [name] is changed, if the node is inside the tree.
    */
+  @GodotApiMember
   public val renamed: Signal0 by Signal0
 
   /**
    * Emitted when the node enters the tree.
    * This signal is emitted *after* the related [NOTIFICATION_ENTER_TREE] notification.
    */
+  @GodotApiMember
   public val treeEntered: Signal0 by Signal0
 
   /**
@@ -122,12 +126,14 @@ public open class Node : Object() {
    * This signal is emitted *after* the node's [_exitTree], and *before* the related
    * [NOTIFICATION_EXIT_TREE].
    */
+  @GodotApiMember
   public val treeExiting: Signal0 by Signal0
 
   /**
    * Emitted after the node exits the tree and is no longer active.
    * This signal is emitted *after* the related [NOTIFICATION_EXIT_TREE] notification.
    */
+  @GodotApiMember
   public val treeExited: Signal0 by Signal0
 
   /**
@@ -136,6 +142,7 @@ public open class Node : Object() {
    * This signal is emitted *after* the child node's own [NOTIFICATION_ENTER_TREE] and [signal
    * tree_entered].
    */
+  @GodotApiMember
   public val childEnteredTree: Signal1<Node> by Signal1
 
   /**
@@ -145,12 +152,14 @@ public open class Node : Object() {
    * When this signal is received, the child [node] is still accessible inside the tree. This signal
    * is emitted *after* the child node's own [signal tree_exiting] and [NOTIFICATION_EXIT_TREE].
    */
+  @GodotApiMember
   public val childExitingTree: Signal1<Node> by Signal1
 
   /**
    * Emitted when the list of children is changed. This happens when child nodes are added, moved or
    * removed.
    */
+  @GodotApiMember
   public val childOrderChanged: Signal0 by Signal0
 
   /**
@@ -158,11 +167,13 @@ public open class Node : Object() {
    * This signal is emitted *after* [node] has been added as a child of the original parent node,
    * but *before* all original child nodes have been reparented to [node].
    */
+  @GodotApiMember
   public val replacingBy: Signal1<Node> by Signal1
 
   /**
    * Emitted when the node's editor description field changed.
    */
+  @GodotApiMember
   public val editorDescriptionChanged: Signal1<Node> by Signal1
 
   /**
@@ -596,6 +607,7 @@ public open class Node : Object() {
    * **Note:** This method is only called if the node is present in the scene tree (i.e. if it's not
    * an orphan).
    */
+  @GodotApiMember
   public open fun _process(delta: Double): Unit {
   }
 
@@ -609,6 +621,7 @@ public open class Node : Object() {
    * **Note:** This method is only called if the node is present in the scene tree (i.e. if it's not
    * an orphan).
    */
+  @GodotApiMember
   public open fun _physicsProcess(delta: Double): Unit {
   }
 
@@ -618,6 +631,7 @@ public open class Node : Object() {
    * called first, and then that of the children.
    * Corresponds to the [NOTIFICATION_ENTER_TREE] notification in [Object.Notification].
    */
+  @GodotApiMember
   public open fun _enterTree(): Unit {
   }
 
@@ -629,6 +643,7 @@ public open class Node : Object() {
    * [signal tree_exiting]. To get notified when the node has already left the active tree, connect to
    * the [signal tree_exited].
    */
+  @GodotApiMember
   public open fun _exitTree(): Unit {
   }
 
@@ -645,6 +660,7 @@ public open class Node : Object() {
    * bypassed by requesting another call with [requestReady], which may be called anywhere before
    * adding the node again.
    */
+  @GodotApiMember
   public open fun _ready(): Unit {
   }
 
@@ -666,6 +682,7 @@ public open class Node : Object() {
    *         return []
    * [/codeblock]
    */
+  @GodotApiMember
   public open fun _getConfigurationWarnings(): PackedStringArray {
     throw NotImplementedError("_get_configuration_warnings is not implemented for Node")
   }
@@ -682,6 +699,7 @@ public open class Node : Object() {
    * **Note:** This method is only called if the node is present in the scene tree (i.e. if it's not
    * an orphan).
    */
+  @GodotApiMember
   public open fun _input(event: InputEvent?): Unit {
   }
 
@@ -698,6 +716,7 @@ public open class Node : Object() {
    * **Note:** This method is only called if the node is present in the scene tree (i.e. if it's not
    * orphan).
    */
+  @GodotApiMember
   public open fun _shortcutInput(event: InputEvent?): Unit {
   }
 
@@ -716,6 +735,7 @@ public open class Node : Object() {
    * **Note:** This method is only called if the node is present in the scene tree (i.e. if it's not
    * an orphan).
    */
+  @GodotApiMember
   public open fun _unhandledInput(event: InputEvent?): Unit {
   }
 
@@ -736,6 +756,7 @@ public open class Node : Object() {
    * **Note:** This method is only called if the node is present in the scene tree (i.e. if it's not
    * an orphan).
    */
+  @GodotApiMember
   public open fun _unhandledKeyInput(event: InputEvent?): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Node3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Node3D.kt
index e064abe759..bd0ebaca0e 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Node3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Node3D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Basis
@@ -58,6 +59,7 @@ public open class Node3D : Node() {
   /**
    * Emitted when node visibility changes.
    */
+  @GodotApiMember
   public val visibilityChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Object.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Object.kt
index 9f92141346..bd17f729c0 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Object.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Object.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Callable
@@ -88,11 +89,13 @@ public open class Object : KtObject() {
    * **Note:** When this signal is emitted, the new script is not initialized yet. If you need to
    * access the new script, defer connections to this signal with [CONNECT_DEFERRED].
    */
+  @GodotApiMember
   public val scriptChanged: Signal0 by Signal0
 
   /**
    * Emitted when [notifyPropertyListChanged] is called.
    */
+  @GodotApiMember
   public val propertyListChanged: Signal0 by Signal0
 
   public override fun new(scriptIndex: Int): Unit {
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/OpenXRExtensionWrapperExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/OpenXRExtensionWrapperExtension.kt
index fc3a8b20c9..bbec21c609 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/OpenXRExtensionWrapperExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/OpenXRExtensionWrapperExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -39,6 +40,7 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * - If the `bool *` points to a boolean, the boolean will be updated to `true` if the extension
    * is enabled.
    */
+  @GodotApiMember
   public open fun _getRequestedExtensions(): Dictionary<Any?, Any?> {
     throw NotImplementedError("_get_requested_extensions is not implemented for OpenXRExtensionWrapperExtension")
   }
@@ -49,6 +51,7 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * This will only be called if the extension previously registered itself with
    * [OpenXRAPIExtension.registerCompositionLayerProvider].
    */
+  @GodotApiMember
   public open fun _getCompositionLayerCount(): Int {
     throw NotImplementedError("_get_composition_layer_count is not implemented for OpenXRExtensionWrapperExtension")
   }
@@ -59,6 +62,7 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * This will only be called if the extension previously registered itself with
    * [OpenXRAPIExtension.registerCompositionLayerProvider].
    */
+  @GodotApiMember
   public open fun _getCompositionLayer(index: Int): Long {
     throw NotImplementedError("_get_composition_layer is not implemented for OpenXRExtensionWrapperExtension")
   }
@@ -71,6 +75,7 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * This will only be called if the extension previously registered itself with
    * [OpenXRAPIExtension.registerCompositionLayerProvider].
    */
+  @GodotApiMember
   public open fun _getCompositionLayerOrder(index: Int): Int {
     throw NotImplementedError("_get_composition_layer_order is not implemented for OpenXRExtensionWrapperExtension")
   }
@@ -79,6 +84,7 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * Returns a [PackedStringArray] of positional tracker names that are used within the extension
    * wrapper.
    */
+  @GodotApiMember
   public open fun _getSuggestedTrackerNames(): PackedStringArray {
     throw NotImplementedError("_get_suggested_tracker_names is not implemented for OpenXRExtensionWrapperExtension")
   }
@@ -90,30 +96,35 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * system. The controller data is used to setup action maps for users who may have access to the
    * relevant hardware.
    */
+  @GodotApiMember
   public open fun _onRegisterMetadata(): Unit {
   }
 
   /**
    * Called before the OpenXR instance is created.
    */
+  @GodotApiMember
   public open fun _onBeforeInstanceCreated(): Unit {
   }
 
   /**
    * Called right after the OpenXR instance is created.
    */
+  @GodotApiMember
   public open fun _onInstanceCreated(instance: Long): Unit {
   }
 
   /**
    * Called right before the OpenXR instance is destroyed.
    */
+  @GodotApiMember
   public open fun _onInstanceDestroyed(): Unit {
   }
 
   /**
    * Called right after the OpenXR session is created.
    */
+  @GodotApiMember
   public open fun _onSessionCreated(session: Long): Unit {
   }
 
@@ -122,30 +133,35 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * processing steps of the main loop. During this step controller data is queried and made available
    * to game logic.
    */
+  @GodotApiMember
   public open fun _onProcess(): Unit {
   }
 
   /**
    * Called right before the XR viewports begin their rendering step.
    */
+  @GodotApiMember
   public open fun _onPreRender(): Unit {
   }
 
   /**
    * Called right after the main swapchains are (re)created.
    */
+  @GodotApiMember
   public open fun _onMainSwapchainsCreated(): Unit {
   }
 
   /**
    * Called right before the OpenXR session is destroyed.
    */
+  @GodotApiMember
   public open fun _onSessionDestroyed(): Unit {
   }
 
   /**
    * Called when the OpenXR session state is changed to idle.
    */
+  @GodotApiMember
   public open fun _onStateIdle(): Unit {
   }
 
@@ -153,6 +169,7 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * Called when the OpenXR session state is changed to ready. This means OpenXR is ready to set up
    * the session.
    */
+  @GodotApiMember
   public open fun _onStateReady(): Unit {
   }
 
@@ -160,6 +177,7 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * Called when the OpenXR session state is changed to synchronized. OpenXR also returns to this
    * state when the application loses focus.
    */
+  @GodotApiMember
   public open fun _onStateSynchronized(): Unit {
   }
 
@@ -167,6 +185,7 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * Called when the OpenXR session state is changed to visible. This means OpenXR is now ready to
    * receive frames.
    */
+  @GodotApiMember
   public open fun _onStateVisible(): Unit {
   }
 
@@ -174,24 +193,28 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * Called when the OpenXR session state is changed to focused. This state is the active state when
    * the game runs.
    */
+  @GodotApiMember
   public open fun _onStateFocused(): Unit {
   }
 
   /**
    * Called when the OpenXR session state is changed to stopping.
    */
+  @GodotApiMember
   public open fun _onStateStopping(): Unit {
   }
 
   /**
    * Called when the OpenXR session state is changed to loss pending.
    */
+  @GodotApiMember
   public open fun _onStateLossPending(): Unit {
   }
 
   /**
    * Called when the OpenXR session state is changed to exiting.
    */
+  @GodotApiMember
   public open fun _onStateExiting(): Unit {
   }
 
@@ -199,6 +222,7 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * Gets an array of [Dictionary]s that represent properties, just like [Object.GetPropertyList],
    * that will be added to [OpenXRCompositionLayer] nodes.
    */
+  @GodotApiMember
   public open fun _getViewportCompositionLayerExtensionProperties():
       VariantArray<Dictionary<Any?, Any?>> {
     throw NotImplementedError("_get_viewport_composition_layer_extension_properties is not implemented for OpenXRExtensionWrapperExtension")
@@ -208,6 +232,7 @@ public open class OpenXRExtensionWrapperExtension : Object() {
    * Gets a [Dictionary] containing the default values for the properties returned by
    * [_getViewportCompositionLayerExtensionProperties].
    */
+  @GodotApiMember
   public open fun _getViewportCompositionLayerExtensionPropertyDefaults(): Dictionary<Any?, Any?> {
     throw NotImplementedError("_get_viewport_composition_layer_extension_property_defaults is not implemented for OpenXRExtensionWrapperExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/OpenXRInterface.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/OpenXRInterface.kt
index f64e8c19bd..0d8fe05ec7 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/OpenXRInterface.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/OpenXRInterface.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Quaternion
@@ -49,42 +50,50 @@ public open class OpenXRInterface : XRInterface() {
   /**
    * Informs our OpenXR session has been started.
    */
+  @GodotApiMember
   public val sessionBegun: Signal0 by Signal0
 
   /**
    * Informs our OpenXR session is stopping.
    */
+  @GodotApiMember
   public val sessionStopping: Signal0 by Signal0
 
   /**
    * Informs our OpenXR session now has focus.
    */
+  @GodotApiMember
   public val sessionFocussed: Signal0 by Signal0
 
   /**
    * Informs our OpenXR session is now visible (output is being sent to the HMD).
    */
+  @GodotApiMember
   public val sessionVisible: Signal0 by Signal0
 
   /**
    * Informs our OpenXR session is in the process of being lost.
    */
+  @GodotApiMember
   public val sessionLossPending: Signal0 by Signal0
 
   /**
    * Informs our OpenXR instance is exiting.
    */
+  @GodotApiMember
   public val instanceExiting: Signal0 by Signal0
 
   /**
    * Informs the user queued a recenter of the player position.
    */
+  @GodotApiMember
   public val poseRecentered: Signal0 by Signal0
 
   /**
    * Informs the user the HMD refresh rate has changed.
    * **Note:** Only emitted if XR runtime supports the refresh rate extension.
    */
+  @GodotApiMember
   public val refreshRateChanged: Signal1<Double> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/OptionButton.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/OptionButton.kt
index 27e00ca2eb..4fe38f6102 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/OptionButton.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/OptionButton.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal1
@@ -43,6 +44,7 @@ public open class OptionButton : Button() {
    * passed as argument.
    * [allowReselect] must be enabled to reselect an item.
    */
+  @GodotApiMember
   public val itemSelected: Signal1<Long> by Signal1
 
   /**
@@ -50,6 +52,7 @@ public open class OptionButton : Button() {
    * [ProjectSettings.input/uiDown] input actions. The index of the item selected is passed as
    * argument.
    */
+  @GodotApiMember
   public val itemFocused: Signal1<Long> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/PacketPeerExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/PacketPeerExtension.kt
index c050cbced3..d8e0049519 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/PacketPeerExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/PacketPeerExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import kotlin.Int
 import kotlin.NotImplementedError
@@ -18,10 +19,12 @@ public open class PacketPeerExtension : PacketPeer() {
     callConstructor(ENGINECLASS_PACKETPEEREXTENSION, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _getAvailablePacketCount(): Int {
     throw NotImplementedError("_get_available_packet_count is not implemented for PacketPeerExtension")
   }
 
+  @GodotApiMember
   public open fun _getMaxPacketSize(): Int {
     throw NotImplementedError("_get_max_packet_size is not implemented for PacketPeerExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Path3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Path3D.kt
index fb099a5380..cdf5b5c279 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Path3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Path3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -29,6 +30,7 @@ public open class Path3D : Node3D() {
   /**
    * Emitted when the [curve] changes.
    */
+  @GodotApiMember
   public val curveChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicalBone3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicalBone3D.kt
index 7bd796dbc7..265e3c2aee 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicalBone3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicalBone3D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Transform3D
@@ -375,6 +376,7 @@ public open class PhysicalBone3D : PhysicsBody3D() {
    * [customIntegrator] property allows you to disable the standard force integration and do fully
    * custom force integration for a body.
    */
+  @GodotApiMember
   public open fun _integrateForces(state: PhysicsDirectBodyState3D?): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectBodyState2DExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectBodyState2DExtension.kt
index f592d8ea8c..08099c286c 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectBodyState2DExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectBodyState2DExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.RID
 import godot.core.Transform2D
@@ -34,6 +35,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.totalGravity] and its
    * respective getter.
    */
+  @GodotApiMember
   public open fun _getTotalGravity(): Vector2 {
     throw NotImplementedError("_get_total_gravity is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -42,6 +44,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.totalLinearDamp] and its
    * respective getter.
    */
+  @GodotApiMember
   public open fun _getTotalLinearDamp(): Float {
     throw NotImplementedError("_get_total_linear_damp is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -50,6 +53,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.totalAngularDamp] and its
    * respective getter.
    */
+  @GodotApiMember
   public open fun _getTotalAngularDamp(): Float {
     throw NotImplementedError("_get_total_angular_damp is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -58,6 +62,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.centerOfMass] and its
    * respective getter.
    */
+  @GodotApiMember
   public open fun _getCenterOfMass(): Vector2 {
     throw NotImplementedError("_get_center_of_mass is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -66,6 +71,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.centerOfMassLocal] and its
    * respective getter.
    */
+  @GodotApiMember
   public open fun _getCenterOfMassLocal(): Vector2 {
     throw NotImplementedError("_get_center_of_mass_local is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -74,6 +80,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.inverseMass] and its respective
    * getter.
    */
+  @GodotApiMember
   public open fun _getInverseMass(): Float {
     throw NotImplementedError("_get_inverse_mass is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -82,6 +89,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.inverseInertia] and its
    * respective getter.
    */
+  @GodotApiMember
   public open fun _getInverseInertia(): Float {
     throw NotImplementedError("_get_inverse_inertia is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -90,6 +98,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.linearVelocity] and its
    * respective setter.
    */
+  @GodotApiMember
   public open fun _setLinearVelocity(velocity: Vector2): Unit {
   }
 
@@ -97,6 +106,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.linearVelocity] and its
    * respective getter.
    */
+  @GodotApiMember
   public open fun _getLinearVelocity(): Vector2 {
     throw NotImplementedError("_get_linear_velocity is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -105,6 +115,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.angularVelocity] and its
    * respective setter.
    */
+  @GodotApiMember
   public open fun _setAngularVelocity(velocity: Float): Unit {
   }
 
@@ -112,6 +123,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.angularVelocity] and its
    * respective getter.
    */
+  @GodotApiMember
   public open fun _getAngularVelocity(): Float {
     throw NotImplementedError("_get_angular_velocity is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -120,6 +132,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.transform] and its respective
    * setter.
    */
+  @GodotApiMember
   public open fun _setTransform(transform: Transform2D): Unit {
   }
 
@@ -127,6 +140,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.transform] and its respective
    * getter.
    */
+  @GodotApiMember
   public open fun _getTransform(): Transform2D {
     throw NotImplementedError("_get_transform is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -134,6 +148,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getVelocityAtLocalPosition].
    */
+  @GodotApiMember
   public open fun _getVelocityAtLocalPosition(localPosition: Vector2): Vector2 {
     throw NotImplementedError("_get_velocity_at_local_position is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -141,66 +156,77 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.applyCentralImpulse].
    */
+  @GodotApiMember
   public open fun _applyCentralImpulse(impulse: Vector2): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.applyImpulse].
    */
+  @GodotApiMember
   public open fun _applyImpulse(impulse: Vector2, position: Vector2): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.applyTorqueImpulse].
    */
+  @GodotApiMember
   public open fun _applyTorqueImpulse(impulse: Float): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.applyCentralForce].
    */
+  @GodotApiMember
   public open fun _applyCentralForce(force: Vector2): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.applyForce].
    */
+  @GodotApiMember
   public open fun _applyForce(force: Vector2, position: Vector2): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.applyTorque].
    */
+  @GodotApiMember
   public open fun _applyTorque(torque: Float): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.addConstantCentralForce].
    */
+  @GodotApiMember
   public open fun _addConstantCentralForce(force: Vector2): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.addConstantForce].
    */
+  @GodotApiMember
   public open fun _addConstantForce(force: Vector2, position: Vector2): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.addConstantTorque].
    */
+  @GodotApiMember
   public open fun _addConstantTorque(torque: Float): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.setConstantForce].
    */
+  @GodotApiMember
   public open fun _setConstantForce(force: Vector2): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getConstantForce].
    */
+  @GodotApiMember
   public open fun _getConstantForce(): Vector2 {
     throw NotImplementedError("_get_constant_force is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -208,12 +234,14 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.setConstantTorque].
    */
+  @GodotApiMember
   public open fun _setConstantTorque(torque: Float): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getConstantTorque].
    */
+  @GodotApiMember
   public open fun _getConstantTorque(): Float {
     throw NotImplementedError("_get_constant_torque is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -222,6 +250,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.sleeping] and its respective
    * setter.
    */
+  @GodotApiMember
   public open fun _setSleepState(enabled: Boolean): Unit {
   }
 
@@ -229,6 +258,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.sleeping] and its respective
    * getter.
    */
+  @GodotApiMember
   public open fun _isSleeping(): Boolean {
     throw NotImplementedError("_is_sleeping is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -236,6 +266,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactCount].
    */
+  @GodotApiMember
   public open fun _getContactCount(): Int {
     throw NotImplementedError("_get_contact_count is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -243,6 +274,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactLocalPosition].
    */
+  @GodotApiMember
   public open fun _getContactLocalPosition(contactIdx: Int): Vector2 {
     throw NotImplementedError("_get_contact_local_position is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -250,6 +282,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactLocalNormal].
    */
+  @GodotApiMember
   public open fun _getContactLocalNormal(contactIdx: Int): Vector2 {
     throw NotImplementedError("_get_contact_local_normal is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -257,6 +290,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactLocalShape].
    */
+  @GodotApiMember
   public open fun _getContactLocalShape(contactIdx: Int): Int {
     throw NotImplementedError("_get_contact_local_shape is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -264,6 +298,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactLocalVelocityAtPosition].
    */
+  @GodotApiMember
   public open fun _getContactLocalVelocityAtPosition(contactIdx: Int): Vector2 {
     throw NotImplementedError("_get_contact_local_velocity_at_position is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -271,6 +306,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactCollider].
    */
+  @GodotApiMember
   public open fun _getContactCollider(contactIdx: Int): RID {
     throw NotImplementedError("_get_contact_collider is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -278,6 +314,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactColliderPosition].
    */
+  @GodotApiMember
   public open fun _getContactColliderPosition(contactIdx: Int): Vector2 {
     throw NotImplementedError("_get_contact_collider_position is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -285,6 +322,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactColliderId].
    */
+  @GodotApiMember
   public open fun _getContactColliderId(contactIdx: Int): Long {
     throw NotImplementedError("_get_contact_collider_id is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -292,6 +330,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactColliderObject].
    */
+  @GodotApiMember
   public open fun _getContactColliderObject(contactIdx: Int): Object? {
     throw NotImplementedError("_get_contact_collider_object is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -299,6 +338,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactColliderShape].
    */
+  @GodotApiMember
   public open fun _getContactColliderShape(contactIdx: Int): Int {
     throw NotImplementedError("_get_contact_collider_shape is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -306,6 +346,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactColliderVelocityAtPosition].
    */
+  @GodotApiMember
   public open fun _getContactColliderVelocityAtPosition(contactIdx: Int): Vector2 {
     throw NotImplementedError("_get_contact_collider_velocity_at_position is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -313,6 +354,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getContactImpulse].
    */
+  @GodotApiMember
   public open fun _getContactImpulse(contactIdx: Int): Vector2 {
     throw NotImplementedError("_get_contact_impulse is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -321,6 +363,7 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
    * Implement to override the behavior of [PhysicsDirectBodyState2D.step] and its respective
    * getter.
    */
+  @GodotApiMember
   public open fun _getStep(): Float {
     throw NotImplementedError("_get_step is not implemented for PhysicsDirectBodyState2DExtension")
   }
@@ -328,12 +371,14 @@ public open class PhysicsDirectBodyState2DExtension : PhysicsDirectBodyState2D()
   /**
    * Overridable version of [PhysicsDirectBodyState2D.integrateForces].
    */
+  @GodotApiMember
   public open fun _integrateForces(): Unit {
   }
 
   /**
    * Overridable version of [PhysicsDirectBodyState2D.getSpaceState].
    */
+  @GodotApiMember
   public open fun _getSpaceState(): PhysicsDirectSpaceState2D? {
     throw NotImplementedError("_get_space_state is not implemented for PhysicsDirectBodyState2DExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectBodyState3DExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectBodyState3DExtension.kt
index 348ad3a9e8..d7084310a5 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectBodyState3DExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectBodyState3DExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.Basis
 import godot.core.RID
@@ -31,170 +32,216 @@ public open class PhysicsDirectBodyState3DExtension : PhysicsDirectBodyState3D()
     callConstructor(ENGINECLASS_PHYSICSDIRECTBODYSTATE3DEXTENSION, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _getTotalGravity(): Vector3 {
     throw NotImplementedError("_get_total_gravity is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getTotalLinearDamp(): Float {
     throw NotImplementedError("_get_total_linear_damp is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getTotalAngularDamp(): Float {
     throw NotImplementedError("_get_total_angular_damp is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getCenterOfMass(): Vector3 {
     throw NotImplementedError("_get_center_of_mass is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getCenterOfMassLocal(): Vector3 {
     throw NotImplementedError("_get_center_of_mass_local is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getPrincipalInertiaAxes(): Basis {
     throw NotImplementedError("_get_principal_inertia_axes is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getInverseMass(): Float {
     throw NotImplementedError("_get_inverse_mass is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getInverseInertia(): Vector3 {
     throw NotImplementedError("_get_inverse_inertia is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getInverseInertiaTensor(): Basis {
     throw NotImplementedError("_get_inverse_inertia_tensor is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _setLinearVelocity(velocity: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _getLinearVelocity(): Vector3 {
     throw NotImplementedError("_get_linear_velocity is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _setAngularVelocity(velocity: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _getAngularVelocity(): Vector3 {
     throw NotImplementedError("_get_angular_velocity is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _setTransform(transform: Transform3D): Unit {
   }
 
+  @GodotApiMember
   public open fun _getTransform(): Transform3D {
     throw NotImplementedError("_get_transform is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getVelocityAtLocalPosition(localPosition: Vector3): Vector3 {
     throw NotImplementedError("_get_velocity_at_local_position is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _applyCentralImpulse(impulse: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _applyImpulse(impulse: Vector3, position: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _applyTorqueImpulse(impulse: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _applyCentralForce(force: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _applyForce(force: Vector3, position: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _applyTorque(torque: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _addConstantCentralForce(force: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _addConstantForce(force: Vector3, position: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _addConstantTorque(torque: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _setConstantForce(force: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _getConstantForce(): Vector3 {
     throw NotImplementedError("_get_constant_force is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _setConstantTorque(torque: Vector3): Unit {
   }
 
+  @GodotApiMember
   public open fun _getConstantTorque(): Vector3 {
     throw NotImplementedError("_get_constant_torque is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _setSleepState(enabled: Boolean): Unit {
   }
 
+  @GodotApiMember
   public open fun _isSleeping(): Boolean {
     throw NotImplementedError("_is_sleeping is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactCount(): Int {
     throw NotImplementedError("_get_contact_count is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactLocalPosition(contactIdx: Int): Vector3 {
     throw NotImplementedError("_get_contact_local_position is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactLocalNormal(contactIdx: Int): Vector3 {
     throw NotImplementedError("_get_contact_local_normal is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactImpulse(contactIdx: Int): Vector3 {
     throw NotImplementedError("_get_contact_impulse is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactLocalShape(contactIdx: Int): Int {
     throw NotImplementedError("_get_contact_local_shape is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactLocalVelocityAtPosition(contactIdx: Int): Vector3 {
     throw NotImplementedError("_get_contact_local_velocity_at_position is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactCollider(contactIdx: Int): RID {
     throw NotImplementedError("_get_contact_collider is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactColliderPosition(contactIdx: Int): Vector3 {
     throw NotImplementedError("_get_contact_collider_position is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactColliderId(contactIdx: Int): Long {
     throw NotImplementedError("_get_contact_collider_id is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactColliderObject(contactIdx: Int): Object? {
     throw NotImplementedError("_get_contact_collider_object is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactColliderShape(contactIdx: Int): Int {
     throw NotImplementedError("_get_contact_collider_shape is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getContactColliderVelocityAtPosition(contactIdx: Int): Vector3 {
     throw NotImplementedError("_get_contact_collider_velocity_at_position is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _getStep(): Float {
     throw NotImplementedError("_get_step is not implemented for PhysicsDirectBodyState3DExtension")
   }
 
+  @GodotApiMember
   public open fun _integrateForces(): Unit {
   }
 
+  @GodotApiMember
   public open fun _getSpaceState(): PhysicsDirectSpaceState3D? {
     throw NotImplementedError("_get_space_state is not implemented for PhysicsDirectBodyState3DExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectSpaceState3DExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectSpaceState3DExtension.kt
index 2185fdca2b..b6d7cc6bec 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectSpaceState3DExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsDirectSpaceState3DExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.RID
@@ -33,6 +34,7 @@ public open class PhysicsDirectSpaceState3DExtension : PhysicsDirectSpaceState3D
     callConstructor(ENGINECLASS_PHYSICSDIRECTSPACESTATE3DEXTENSION, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _getClosestPointToObjectVolume(`object`: RID, point: Vector3): Vector3 {
     throw NotImplementedError("_get_closest_point_to_object_volume is not implemented for PhysicsDirectSpaceState3DExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsServer3DRenderingServerHandler.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsServer3DRenderingServerHandler.kt
index 0a11160add..04fb19f63b 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsServer3DRenderingServerHandler.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/PhysicsServer3DRenderingServerHandler.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.AABB
@@ -30,6 +31,7 @@ public open class PhysicsServer3DRenderingServerHandler : Object() {
    * specified by [vertexId].
    * **Note:** The [vertex] parameter used to be of type `const void*` prior to Godot 4.2.
    */
+  @GodotApiMember
   public open fun _setVertex(vertexId: Int, vertex: Vector3): Unit {
   }
 
@@ -38,12 +40,14 @@ public open class PhysicsServer3DRenderingServerHandler : Object() {
    * specified by [vertexId].
    * **Note:** The [normal] parameter used to be of type `const void*` prior to Godot 4.2.
    */
+  @GodotApiMember
   public open fun _setNormal(vertexId: Int, normal: Vector3): Unit {
   }
 
   /**
    * Called by the [PhysicsServer3D] to set the bounding box for the [SoftBody3D].
    */
+  @GodotApiMember
   public open fun _setAabb(aabb: AABB): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Popup.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Popup.kt
index 51a7554675..4dda3dac52 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Popup.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Popup.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.Signal0
 import kotlin.Int
@@ -21,6 +22,7 @@ public open class Popup : Window() {
   /**
    * Emitted when the popup is hidden.
    */
+  @GodotApiMember
   public val popupHide: Signal0 by Signal0
 
   public override fun new(scriptIndex: Int): Unit {
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/PopupMenu.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/PopupMenu.kt
index 510fc533df..a30cf2433e 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/PopupMenu.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/PopupMenu.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -61,22 +62,26 @@ public open class PopupMenu : Popup() {
    * **Note:** If [id] is negative (either explicitly or due to overflow), this will return the
    * corresponding index instead.
    */
+  @GodotApiMember
   public val idPressed: Signal1<Long> by Signal1
 
   /**
    * Emitted when the user navigated to an item of some [id] using the [ProjectSettings.input/uiUp]
    * or [ProjectSettings.input/uiDown] input action.
    */
+  @GodotApiMember
   public val idFocused: Signal1<Long> by Signal1
 
   /**
    * Emitted when an item of some [index] is pressed or its accelerator is activated.
    */
+  @GodotApiMember
   public val indexPressed: Signal1<Long> by Signal1
 
   /**
    * Emitted when any item is added, modified or removed.
    */
+  @GodotApiMember
   public val menuChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/PrimitiveMesh.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/PrimitiveMesh.kt
index a547f64078..055d764ee4 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/PrimitiveMesh.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/PrimitiveMesh.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.AABB
@@ -133,6 +134,7 @@ public open class PrimitiveMesh : Mesh() {
    * [Array] where each element is another Array of values required for the mesh (see the
    * [Mesh.ArrayType] constants).
    */
+  @GodotApiMember
   public open fun _createMeshArray(): VariantArray<Any?> {
     throw NotImplementedError("_create_mesh_array is not implemented for PrimitiveMesh")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ProjectSettings.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ProjectSettings.kt
index e67567a0ec..a58055e139 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ProjectSettings.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ProjectSettings.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -53,6 +54,7 @@ public object ProjectSettings : Object() {
   /**
    * Emitted when any setting is changed, up to once per process frame.
    */
+  @GodotApiMember
   @JvmStatic
   public val settingsChanged: Signal0 by Signal0
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Range.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Range.kt
index 835e988f2e..2534388fa5 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Range.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Range.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -38,11 +39,13 @@ public open class Range : Control() {
    * **Note:** Unlike signals such as [signal LineEdit.text_changed], [signal value_changed] is also
    * emitted when [value] is set directly via code.
    */
+  @GodotApiMember
   public val valueChanged: Signal1<Double> by Signal1
 
   /**
    * Emitted when [minValue], [maxValue], [page], or [step] change.
    */
+  @GodotApiMember
   public val changed: Signal0 by Signal0
 
   /**
@@ -168,6 +171,7 @@ public open class Range : Control() {
    * Called when the [Range]'s value is changed (following the same conditions as [signal
    * value_changed]).
    */
+  @GodotApiMember
   public open fun _valueChanged(newValue: Double): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderDataExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderDataExtension.kt
index cda6c97917..d79d75b769 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderDataExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderDataExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.RID
 import kotlin.Int
@@ -25,6 +26,7 @@ public open class RenderDataExtension : RenderData() {
   /**
    * Implement this in GDExtension to return the implementation's [RenderSceneBuffers] object.
    */
+  @GodotApiMember
   public open fun _getRenderSceneBuffers(): RenderSceneBuffers? {
     throw NotImplementedError("_get_render_scene_buffers is not implemented for RenderDataExtension")
   }
@@ -32,6 +34,7 @@ public open class RenderDataExtension : RenderData() {
   /**
    * Implement this in GDExtension to return the implementation's [RenderSceneDataExtension] object.
    */
+  @GodotApiMember
   public open fun _getRenderSceneData(): RenderSceneData? {
     throw NotImplementedError("_get_render_scene_data is not implemented for RenderDataExtension")
   }
@@ -39,6 +42,7 @@ public open class RenderDataExtension : RenderData() {
   /**
    * Implement this in GDExtension to return the [RID] of the implementation's environment object.
    */
+  @GodotApiMember
   public open fun _getEnvironment(): RID {
     throw NotImplementedError("_get_environment is not implemented for RenderDataExtension")
   }
@@ -47,6 +51,7 @@ public open class RenderDataExtension : RenderData() {
    * Implement this in GDExtension to return the [RID] for the implementation's camera attributes
    * object.
    */
+  @GodotApiMember
   public open fun _getCameraAttributes(): RID {
     throw NotImplementedError("_get_camera_attributes is not implemented for RenderDataExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderSceneBuffersExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderSceneBuffersExtension.kt
index 72869b46a2..7ce747278c 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderSceneBuffersExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderSceneBuffersExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import kotlin.Boolean
 import kotlin.Float
@@ -25,24 +26,28 @@ public open class RenderSceneBuffersExtension : RenderSceneBuffers() {
   /**
    * Implement this in GDExtension to handle the (re)sizing of a viewport.
    */
+  @GodotApiMember
   public open fun _configure(config: RenderSceneBuffersConfiguration?): Unit {
   }
 
   /**
    * Implement this in GDExtension to record a new FSR sharpness value.
    */
+  @GodotApiMember
   public open fun _setFsrSharpness(fsrSharpness: Float): Unit {
   }
 
   /**
    * Implement this in GDExtension to change the texture mipmap bias.
    */
+  @GodotApiMember
   public open fun _setTextureMipmapBias(textureMipmapBias: Float): Unit {
   }
 
   /**
    * Implement this in GDExtension to react to the debanding flag changing.
    */
+  @GodotApiMember
   public open fun _setUseDebanding(useDebanding: Boolean): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderSceneDataExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderSceneDataExtension.kt
index 5e53d8a74a..ea4ed858fe 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderSceneDataExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderSceneDataExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.Projection
 import godot.core.RID
@@ -29,6 +30,7 @@ public open class RenderSceneDataExtension : RenderSceneData() {
   /**
    * Implement this in GDExtension to return the camera [Transform3D].
    */
+  @GodotApiMember
   public open fun _getCamTransform(): Transform3D {
     throw NotImplementedError("_get_cam_transform is not implemented for RenderSceneDataExtension")
   }
@@ -36,6 +38,7 @@ public open class RenderSceneDataExtension : RenderSceneData() {
   /**
    * Implement this in GDExtension to return the camera [Projection].
    */
+  @GodotApiMember
   public open fun _getCamProjection(): Projection {
     throw NotImplementedError("_get_cam_projection is not implemented for RenderSceneDataExtension")
   }
@@ -43,6 +46,7 @@ public open class RenderSceneDataExtension : RenderSceneData() {
   /**
    * Implement this in GDExtension to return the view count.
    */
+  @GodotApiMember
   public open fun _getViewCount(): Long {
     throw NotImplementedError("_get_view_count is not implemented for RenderSceneDataExtension")
   }
@@ -50,6 +54,7 @@ public open class RenderSceneDataExtension : RenderSceneData() {
   /**
    * Implement this in GDExtension to return the eye offset for the given [view].
    */
+  @GodotApiMember
   public open fun _getViewEyeOffset(view: Long): Vector3 {
     throw NotImplementedError("_get_view_eye_offset is not implemented for RenderSceneDataExtension")
   }
@@ -57,6 +62,7 @@ public open class RenderSceneDataExtension : RenderSceneData() {
   /**
    * Implement this in GDExtension to return the view [Projection] for the given [view].
    */
+  @GodotApiMember
   public open fun _getViewProjection(view: Long): Projection {
     throw NotImplementedError("_get_view_projection is not implemented for RenderSceneDataExtension")
   }
@@ -65,6 +71,7 @@ public open class RenderSceneDataExtension : RenderSceneData() {
    * Implement this in GDExtension to return the [RID] of the uniform buffer containing the scene
    * data as a UBO.
    */
+  @GodotApiMember
   public open fun _getUniformBuffer(): RID {
     throw NotImplementedError("_get_uniform_buffer is not implemented for RenderSceneDataExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderingServer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderingServer.kt
index 39217a67f0..5d6322fa65 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderingServer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/RenderingServer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.AABB
@@ -175,6 +176,7 @@ public object RenderingServer : Object() {
   /**
    * Emitted at the beginning of the frame, before the RenderingServer updates all the Viewports.
    */
+  @GodotApiMember
   @JvmStatic
   public val framePreDraw: Signal0 by Signal0
 
@@ -182,6 +184,7 @@ public object RenderingServer : Object() {
    * Emitted at the end of the frame, after the RenderingServer has finished updating all the
    * Viewports.
    */
+  @GodotApiMember
   @JvmStatic
   public val framePostDraw: Signal0 by Signal0
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Resource.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Resource.kt
index f01b20a9f2..e60d0486b7 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Resource.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Resource.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.RID
@@ -49,11 +50,13 @@ public open class Resource : RefCounted() {
    * **Note:** This signal is not emitted automatically for properties of custom resources. If
    * necessary, a setter needs to be created to emit the signal.
    */
+  @GodotApiMember
   public val changed: Signal0 by Signal0
 
   /**
    * Emitted by a newly duplicated resource with [resourceLocalToScene] set to `true`.
    */
+  @GodotApiMember
   public val setupLocalToSceneRequested: Signal0 by Signal0
 
   /**
@@ -138,6 +141,7 @@ public open class Resource : RefCounted() {
    *     damage = randi_range(10, 40)
    * [/codeblock]
    */
+  @GodotApiMember
   public open fun _setupLocalToScene(): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ResourceFormatLoader.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ResourceFormatLoader.kt
index 687490e397..2927363229 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ResourceFormatLoader.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ResourceFormatLoader.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.Dictionary
 import godot.core.PackedStringArray
@@ -42,6 +43,7 @@ public open class ResourceFormatLoader : RefCounted() {
   /**
    * Gets the list of extensions for files this loader is able to read.
    */
+  @GodotApiMember
   public open fun _getRecognizedExtensions(): PackedStringArray {
     throw NotImplementedError("_get_recognized_extensions is not implemented for ResourceFormatLoader")
   }
@@ -53,6 +55,7 @@ public open class ResourceFormatLoader : RefCounted() {
    * the ones provided by [_getRecognizedExtensions], and if the type is within the ones provided by
    * [_getResourceType].
    */
+  @GodotApiMember
   public open fun _recognizePath(path: String, type: StringName): Boolean {
     throw NotImplementedError("_recognize_path is not implemented for ResourceFormatLoader")
   }
@@ -62,6 +65,7 @@ public open class ResourceFormatLoader : RefCounted() {
    * **Note:** Custom resource types defined by scripts aren't known by the [ClassDB], so you might
    * just handle `"Resource"` for them.
    */
+  @GodotApiMember
   public open fun _handlesType(type: StringName): Boolean {
     throw NotImplementedError("_handles_type is not implemented for ResourceFormatLoader")
   }
@@ -72,6 +76,7 @@ public open class ResourceFormatLoader : RefCounted() {
    * **Note:** Custom resource types defined by scripts aren't known by the [ClassDB], so you might
    * just return `"Resource"` for them.
    */
+  @GodotApiMember
   public open fun _getResourceType(path: String): String {
     throw NotImplementedError("_get_resource_type is not implemented for ResourceFormatLoader")
   }
@@ -80,10 +85,12 @@ public open class ResourceFormatLoader : RefCounted() {
    * Returns the script class name associated with the [Resource] under the given [path]. If the
    * resource has no script or the script isn't a named class, it should return `""`.
    */
+  @GodotApiMember
   public open fun _getResourceScriptClass(path: String): String {
     throw NotImplementedError("_get_resource_script_class is not implemented for ResourceFormatLoader")
   }
 
+  @GodotApiMember
   public open fun _getResourceUid(path: String): Long {
     throw NotImplementedError("_get_resource_uid is not implemented for ResourceFormatLoader")
   }
@@ -94,6 +101,7 @@ public open class ResourceFormatLoader : RefCounted() {
    * **Note:** Custom resource types defined by scripts aren't known by the [ClassDB], so you might
    * just return `"Resource"` for them.
    */
+  @GodotApiMember
   public open fun _getDependencies(path: String, addTypes: Boolean): PackedStringArray {
     throw NotImplementedError("_get_dependencies is not implemented for ResourceFormatLoader")
   }
@@ -103,14 +111,17 @@ public open class ResourceFormatLoader : RefCounted() {
    * dictionary `{ String => String }` mapping old dependency paths to new paths.
    * Returns [OK] on success, or an [Error] constant in case of failure.
    */
+  @GodotApiMember
   public open fun _renameDependencies(path: String, renames: Dictionary<Any?, Any?>): Error {
     throw NotImplementedError("_rename_dependencies is not implemented for ResourceFormatLoader")
   }
 
+  @GodotApiMember
   public open fun _exists(path: String): Boolean {
     throw NotImplementedError("_exists is not implemented for ResourceFormatLoader")
   }
 
+  @GodotApiMember
   public open fun _getClassesUsed(path: String): PackedStringArray {
     throw NotImplementedError("_get_classes_used is not implemented for ResourceFormatLoader")
   }
@@ -122,6 +133,7 @@ public open class ResourceFormatLoader : RefCounted() {
    * The [cacheMode] property defines whether and how the cache should be used or updated when
    * loading the resource. See [CacheMode] for details.
    */
+  @GodotApiMember
   public open fun _load(
     path: String,
     originalPath: String,
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ResourceFormatSaver.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ResourceFormatSaver.kt
index b6301aa36b..da22851b7b 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ResourceFormatSaver.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ResourceFormatSaver.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.PackedStringArray
 import kotlin.Boolean
@@ -37,6 +38,7 @@ public open class ResourceFormatSaver : RefCounted() {
    * with [ResourceSaver.SaverFlags] constants.
    * Returns [OK] on success, or an [Error] constant in case of failure.
    */
+  @GodotApiMember
   public open fun _save(
     resource: Resource?,
     path: String,
@@ -49,6 +51,7 @@ public open class ResourceFormatSaver : RefCounted() {
    * Sets a new UID for the resource at the given [path]. Returns [OK] on success, or an [Error]
    * constant in case of failure.
    */
+  @GodotApiMember
   public open fun _setUid(path: String, uid: Long): Error {
     throw NotImplementedError("_set_uid is not implemented for ResourceFormatSaver")
   }
@@ -56,6 +59,7 @@ public open class ResourceFormatSaver : RefCounted() {
   /**
    * Returns whether the given resource object can be saved by this saver.
    */
+  @GodotApiMember
   public open fun _recognize(resource: Resource?): Boolean {
     throw NotImplementedError("_recognize is not implemented for ResourceFormatSaver")
   }
@@ -64,6 +68,7 @@ public open class ResourceFormatSaver : RefCounted() {
    * Returns the list of extensions available for saving the resource object, provided it is
    * recognized (see [_recognize]).
    */
+  @GodotApiMember
   public open fun _getRecognizedExtensions(resource: Resource?): PackedStringArray {
     throw NotImplementedError("_get_recognized_extensions is not implemented for ResourceFormatSaver")
   }
@@ -73,6 +78,7 @@ public open class ResourceFormatSaver : RefCounted() {
    * If this method is not implemented, the default behavior returns whether the path's extension is
    * within the ones provided by [_getRecognizedExtensions].
    */
+  @GodotApiMember
   public open fun _recognizePath(resource: Resource?, path: String): Boolean {
     throw NotImplementedError("_recognize_path is not implemented for ResourceFormatSaver")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RichTextEffect.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RichTextEffect.kt
index d219a34c47..64896db66f 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/RichTextEffect.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/RichTextEffect.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import kotlin.Boolean
 import kotlin.Int
@@ -43,6 +44,7 @@ public open class RichTextEffect : Resource() {
    * character could be transformed successfully. If the method returns `false`, it will skip
    * transformation to avoid displaying broken text.
    */
+  @GodotApiMember
   public open fun _processCustomFx(charFx: CharFXTransform?): Boolean {
     throw NotImplementedError("_process_custom_fx is not implemented for RichTextEffect")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RichTextLabel.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RichTextLabel.kt
index b92c41adb0..94583e3f6a 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/RichTextLabel.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/RichTextLabel.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -84,21 +85,25 @@ public open class RichTextLabel : Control() {
    *     OS.shell_open(str(meta))
    * ```
    */
+  @GodotApiMember
   public val metaClicked: Signal1<Any> by Signal1
 
   /**
    * Triggers when the mouse enters a meta tag.
    */
+  @GodotApiMember
   public val metaHoverStarted: Signal1<Any> by Signal1
 
   /**
    * Triggers when the mouse exits a meta tag.
    */
+  @GodotApiMember
   public val metaHoverEnded: Signal1<Any> by Signal1
 
   /**
    * Triggered when the document is fully loaded.
    */
+  @GodotApiMember
   public val finished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RigidBody2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RigidBody2D.kt
index 9ef20fc359..1d15bade8b 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/RigidBody2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/RigidBody2D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.RID
@@ -68,6 +69,7 @@ public open class RigidBody2D : PhysicsBody2D() {
    * Get the [CollisionShape2D] node with
    * `self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))`.
    */
+  @GodotApiMember
   public val bodyShapeEntered: Signal4<RID, Node, Long, Long> by Signal4
 
   /**
@@ -85,6 +87,7 @@ public open class RigidBody2D : PhysicsBody2D() {
    * Get the [CollisionShape2D] node with
    * `self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))`.
    */
+  @GodotApiMember
   public val bodyShapeExited: Signal4<RID, Node, Long, Long> by Signal4
 
   /**
@@ -93,6 +96,7 @@ public open class RigidBody2D : PhysicsBody2D() {
    * the collisions. [TileMap]s are detected if the [TileSet] has Collision [Shape2D]s.
    * [body] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
    */
+  @GodotApiMember
   public val bodyEntered: Signal1<Node> by Signal1
 
   /**
@@ -101,6 +105,7 @@ public open class RigidBody2D : PhysicsBody2D() {
    * the collisions. [TileMap]s are detected if the [TileSet] has Collision [Shape2D]s.
    * [body] the [Node], if it exists in the tree, of the other [PhysicsBody2D] or [TileMap].
    */
+  @GodotApiMember
   public val bodyExited: Signal1<Node> by Signal1
 
   /**
@@ -109,6 +114,7 @@ public open class RigidBody2D : PhysicsBody2D() {
    * sleeping state is changed by the physics engine or `emit_signal("sleeping_state_changed")` is
    * used.
    */
+  @GodotApiMember
   public val sleepingStateChanged: Signal0 by Signal0
 
   /**
@@ -525,6 +531,7 @@ public open class RigidBody2D : PhysicsBody2D() {
    * [customIntegrator] property allows you to disable the standard force integration and do fully
    * custom force integration for a body.
    */
+  @GodotApiMember
   public open fun _integrateForces(state: PhysicsDirectBodyState2D?): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RigidBody3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RigidBody3D.kt
index 0e94d53c59..a24334e751 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/RigidBody3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/RigidBody3D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Basis
@@ -70,6 +71,7 @@ public open class RigidBody3D : PhysicsBody3D() {
    * Get the [CollisionShape3D] node with
    * `self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))`.
    */
+  @GodotApiMember
   public val bodyShapeEntered: Signal4<RID, Node, Long, Long> by Signal4
 
   /**
@@ -87,6 +89,7 @@ public open class RigidBody3D : PhysicsBody3D() {
    * Get the [CollisionShape3D] node with
    * `self.shape_owner_get_owner(self.shape_find_owner(local_shape_index))`.
    */
+  @GodotApiMember
   public val bodyShapeExited: Signal4<RID, Node, Long, Long> by Signal4
 
   /**
@@ -95,6 +98,7 @@ public open class RigidBody3D : PhysicsBody3D() {
    * the collisions. [GridMap]s are detected if the [MeshLibrary] has Collision [Shape3D]s.
    * [body] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
    */
+  @GodotApiMember
   public val bodyEntered: Signal1<Node> by Signal1
 
   /**
@@ -103,6 +107,7 @@ public open class RigidBody3D : PhysicsBody3D() {
    * the collisions. [GridMap]s are detected if the [MeshLibrary] has Collision [Shape3D]s.
    * [body] the [Node], if it exists in the tree, of the other [PhysicsBody3D] or [GridMap].
    */
+  @GodotApiMember
   public val bodyExited: Signal1<Node> by Signal1
 
   /**
@@ -111,6 +116,7 @@ public open class RigidBody3D : PhysicsBody3D() {
    * sleeping state is changed by the physics engine or `emit_signal("sleeping_state_changed")` is
    * used.
    */
+  @GodotApiMember
   public val sleepingStateChanged: Signal0 by Signal0
 
   /**
@@ -632,6 +638,7 @@ public open class RigidBody3D : PhysicsBody3D() {
    * [customIntegrator] property allows you to disable the standard force integration and do fully
    * custom force integration for a body.
    */
+  @GodotApiMember
   public open fun _integrateForces(state: PhysicsDirectBodyState3D?): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneMultiplayer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneMultiplayer.kt
index 41eb121eb0..fec8632fed 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneMultiplayer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneMultiplayer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Callable
@@ -56,18 +57,21 @@ public open class SceneMultiplayer : MultiplayerAPI() {
    * [getAuthenticatingPeers]), and only authentication data will be sent or received. See [sendAuth]
    * for sending authentication data.
    */
+  @GodotApiMember
   public val peerAuthenticating: Signal1<Long> by Signal1
 
   /**
    * Emitted when this MultiplayerAPI's [MultiplayerAPI.multiplayerPeer] disconnects from a peer for
    * which authentication had not yet completed. See [signal peer_authenticating].
    */
+  @GodotApiMember
   public val peerAuthenticationFailed: Signal1<Long> by Signal1
 
   /**
    * Emitted when this MultiplayerAPI's [MultiplayerAPI.multiplayerPeer] receives a [packet] with
    * custom data (see [sendBytes]). ID is the peer ID of the peer that sent the packet.
    */
+  @GodotApiMember
   public val peerPacket: Signal2<Long, PackedByteArray> by Signal2
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneTree.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneTree.kt
index 21ebb09102..1bd0f4afd6 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneTree.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneTree.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.NodePath
@@ -51,43 +52,51 @@ public open class SceneTree : MainLoop() {
   /**
    * Emitted any time the tree's hierarchy changes (nodes being moved, renamed, etc.).
    */
+  @GodotApiMember
   public val treeChanged: Signal0 by Signal0
 
   /**
    * Emitted when the [Node.processMode] of any node inside the tree is changed. Only emitted in the
    * editor, to update the visibility of disabled nodes.
    */
+  @GodotApiMember
   public val treeProcessModeChanged: Signal0 by Signal0
 
   /**
    * Emitted when the [node] enters this tree.
    */
+  @GodotApiMember
   public val nodeAdded: Signal1<Node> by Signal1
 
   /**
    * Emitted when the [node] exits this tree.
    */
+  @GodotApiMember
   public val nodeRemoved: Signal1<Node> by Signal1
 
   /**
    * Emitted when the [node]'s [Node.name] is changed.
    */
+  @GodotApiMember
   public val nodeRenamed: Signal1<Node> by Signal1
 
   /**
    * Emitted when the [node]'s [Node.updateConfigurationWarnings] is called. Only emitted in the
    * editor.
    */
+  @GodotApiMember
   public val nodeConfigurationWarningChanged: Signal1<Node> by Signal1
 
   /**
    * Emitted immediately before [Node.Process] is called on every node in this tree.
    */
+  @GodotApiMember
   public val processFrame: Signal0 by Signal0
 
   /**
    * Emitted immediately before [Node.PhysicsProcess] is called on every node in this tree.
    */
+  @GodotApiMember
   public val physicsFrame: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneTreeTimer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneTreeTimer.kt
index 30f4e5be70..91ddefbe59 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneTreeTimer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/SceneTreeTimer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -53,6 +54,7 @@ public open class SceneTreeTimer internal constructor() : RefCounted() {
   /**
    * Emitted when the timer reaches 0.
    */
+  @GodotApiMember
   public val timeout: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ScriptExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ScriptExtension.kt
index cbe74c8e2b..825ef2ee53 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ScriptExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ScriptExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.Dictionary
 import godot.core.StringName
@@ -24,61 +25,76 @@ public open class ScriptExtension : Script() {
     callConstructor(ENGINECLASS_SCRIPTEXTENSION, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _editorCanReloadFromFile(): Boolean {
     throw NotImplementedError("_editor_can_reload_from_file is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _canInstantiate(): Boolean {
     throw NotImplementedError("_can_instantiate is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getBaseScript(): Script? {
     throw NotImplementedError("_get_base_script is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getGlobalName(): StringName {
     throw NotImplementedError("_get_global_name is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _inheritsScript(script: Script?): Boolean {
     throw NotImplementedError("_inherits_script is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getInstanceBaseType(): StringName {
     throw NotImplementedError("_get_instance_base_type is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _instanceHas(`object`: Object?): Boolean {
     throw NotImplementedError("_instance_has is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _hasSourceCode(): Boolean {
     throw NotImplementedError("_has_source_code is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getSourceCode(): String {
     throw NotImplementedError("_get_source_code is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _setSourceCode(code: String): Unit {
   }
 
+  @GodotApiMember
   public open fun _reload(keepState: Boolean): Error {
     throw NotImplementedError("_reload is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getDocumentation(): VariantArray<Dictionary<Any?, Any?>> {
     throw NotImplementedError("_get_documentation is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getClassIconPath(): String {
     throw NotImplementedError("_get_class_icon_path is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _hasMethod(method: StringName): Boolean {
     throw NotImplementedError("_has_method is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _hasStaticMethod(method: StringName): Boolean {
     throw NotImplementedError("_has_static_method is not implemented for ScriptExtension")
   }
@@ -87,18 +103,22 @@ public open class ScriptExtension : Script() {
    * Return the expected argument count for the given [method], or `null` if it can't be determined
    * (which will then fall back to the default behavior).
    */
+  @GodotApiMember
   public open fun _getScriptMethodArgumentCount(method: StringName): Any? {
     throw NotImplementedError("_get_script_method_argument_count is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getMethodInfo(method: StringName): Dictionary<Any?, Any?> {
     throw NotImplementedError("_get_method_info is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _isTool(): Boolean {
     throw NotImplementedError("_is_tool is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _isValid(): Boolean {
     throw NotImplementedError("_is_valid is not implemented for ScriptExtension")
   }
@@ -107,57 +127,71 @@ public open class ScriptExtension : Script() {
    * Returns `true` if the script is an abstract script. An abstract script does not have a
    * constructor and cannot be instantiated.
    */
+  @GodotApiMember
   public open fun _isAbstract(): Boolean {
     throw NotImplementedError("_is_abstract is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getLanguage(): ScriptLanguage? {
     throw NotImplementedError("_get_language is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _hasScriptSignal(signal: StringName): Boolean {
     throw NotImplementedError("_has_script_signal is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getScriptSignalList(): VariantArray<Dictionary<Any?, Any?>> {
     throw NotImplementedError("_get_script_signal_list is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _hasPropertyDefaultValue(`property`: StringName): Boolean {
     throw NotImplementedError("_has_property_default_value is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getPropertyDefaultValue(`property`: StringName): Any? {
     throw NotImplementedError("_get_property_default_value is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _updateExports(): Unit {
   }
 
+  @GodotApiMember
   public open fun _getScriptMethodList(): VariantArray<Dictionary<Any?, Any?>> {
     throw NotImplementedError("_get_script_method_list is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getScriptPropertyList(): VariantArray<Dictionary<Any?, Any?>> {
     throw NotImplementedError("_get_script_property_list is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getMemberLine(member: StringName): Int {
     throw NotImplementedError("_get_member_line is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getConstants(): Dictionary<Any?, Any?> {
     throw NotImplementedError("_get_constants is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getMembers(): VariantArray<StringName> {
     throw NotImplementedError("_get_members is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _isPlaceholderFallbackEnabled(): Boolean {
     throw NotImplementedError("_is_placeholder_fallback_enabled is not implemented for ScriptExtension")
   }
 
+  @GodotApiMember
   public open fun _getRpcConfig(): Any? {
     throw NotImplementedError("_get_rpc_config is not implemented for ScriptExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ScriptLanguageExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ScriptLanguageExtension.kt
index b1eafb2113..0cec3ad601 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ScriptLanguageExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ScriptLanguageExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.Dictionary
 import godot.core.PackedStringArray
@@ -26,44 +27,55 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
     callConstructor(ENGINECLASS_SCRIPTLANGUAGEEXTENSION, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _getName(): String {
     throw NotImplementedError("_get_name is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _init(): Unit {
   }
 
+  @GodotApiMember
   public open fun _getType(): String {
     throw NotImplementedError("_get_type is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _getExtension(): String {
     throw NotImplementedError("_get_extension is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _finish(): Unit {
   }
 
+  @GodotApiMember
   public open fun _getReservedWords(): PackedStringArray {
     throw NotImplementedError("_get_reserved_words is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _isControlFlowKeyword(keyword: String): Boolean {
     throw NotImplementedError("_is_control_flow_keyword is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _getCommentDelimiters(): PackedStringArray {
     throw NotImplementedError("_get_comment_delimiters is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _getDocCommentDelimiters(): PackedStringArray {
     throw NotImplementedError("_get_doc_comment_delimiters is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _getStringDelimiters(): PackedStringArray {
     throw NotImplementedError("_get_string_delimiters is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _makeTemplate(
     template: String,
     className: String,
@@ -72,14 +84,17 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
     throw NotImplementedError("_make_template is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _getBuiltInTemplates(`object`: StringName): VariantArray<Dictionary<Any?, Any?>> {
     throw NotImplementedError("_get_built_in_templates is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _isUsingTemplates(): Boolean {
     throw NotImplementedError("_is_using_templates is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _validate(
     script: String,
     path: String,
@@ -91,26 +106,32 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
     throw NotImplementedError("_validate is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _validatePath(path: String): String {
     throw NotImplementedError("_validate_path is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _createScript(): Object? {
     throw NotImplementedError("_create_script is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _hasNamedClasses(): Boolean {
     throw NotImplementedError("_has_named_classes is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _supportsBuiltinMode(): Boolean {
     throw NotImplementedError("_supports_builtin_mode is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _supportsDocumentation(): Boolean {
     throw NotImplementedError("_supports_documentation is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _canInheritFromFile(): Boolean {
     throw NotImplementedError("_can_inherit_from_file is not implemented for ScriptLanguageExtension")
   }
@@ -119,10 +140,12 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
    * Returns the line where the function is defined in the code, or `-1` if the function is not
    * present.
    */
+  @GodotApiMember
   public open fun _findFunction(function: String, code: String): Int {
     throw NotImplementedError("_find_function is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _makeFunction(
     className: String,
     functionName: String,
@@ -131,10 +154,12 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
     throw NotImplementedError("_make_function is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _canMakeFunction(): Boolean {
     throw NotImplementedError("_can_make_function is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _openInExternalEditor(
     script: Script?,
     line: Int,
@@ -143,14 +168,17 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
     throw NotImplementedError("_open_in_external_editor is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _overridesExternalEditor(): Boolean {
     throw NotImplementedError("_overrides_external_editor is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _preferredFileNameCasing(): ScriptLanguage.ScriptNameCasing {
     throw NotImplementedError("_preferred_file_name_casing is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _completeCode(
     code: String,
     path: String,
@@ -159,6 +187,7 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
     throw NotImplementedError("_complete_code is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _lookupCode(
     code: String,
     symbol: String,
@@ -168,6 +197,7 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
     throw NotImplementedError("_lookup_code is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _autoIndentCode(
     code: String,
     fromLine: Int,
@@ -176,33 +206,42 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
     throw NotImplementedError("_auto_indent_code is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _addGlobalConstant(name: StringName, `value`: Any?): Unit {
   }
 
+  @GodotApiMember
   public open fun _addNamedGlobalConstant(name: StringName, `value`: Any?): Unit {
   }
 
+  @GodotApiMember
   public open fun _removeNamedGlobalConstant(name: StringName): Unit {
   }
 
+  @GodotApiMember
   public open fun _threadEnter(): Unit {
   }
 
+  @GodotApiMember
   public open fun _threadExit(): Unit {
   }
 
+  @GodotApiMember
   public open fun _debugGetError(): String {
     throw NotImplementedError("_debug_get_error is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _debugGetStackLevelCount(): Int {
     throw NotImplementedError("_debug_get_stack_level_count is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _debugGetStackLevelLine(level: Int): Int {
     throw NotImplementedError("_debug_get_stack_level_line is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _debugGetStackLevelFunction(level: Int): String {
     throw NotImplementedError("_debug_get_stack_level_function is not implemented for ScriptLanguageExtension")
   }
@@ -210,10 +249,12 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
   /**
    * Returns the source associated with a given debug stack position.
    */
+  @GodotApiMember
   public open fun _debugGetStackLevelSource(level: Int): String {
     throw NotImplementedError("_debug_get_stack_level_source is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _debugGetStackLevelLocals(
     level: Int,
     maxSubitems: Int,
@@ -222,6 +263,7 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
     throw NotImplementedError("_debug_get_stack_level_locals is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _debugGetStackLevelMembers(
     level: Int,
     maxSubitems: Int,
@@ -230,10 +272,12 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
     throw NotImplementedError("_debug_get_stack_level_members is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _debugGetGlobals(maxSubitems: Int, maxDepth: Int): Dictionary<Any?, Any?> {
     throw NotImplementedError("_debug_get_globals is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _debugParseStackLevelExpression(
     level: Int,
     expression: String,
@@ -243,48 +287,61 @@ public open class ScriptLanguageExtension : ScriptLanguage() {
     throw NotImplementedError("_debug_parse_stack_level_expression is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _debugGetCurrentStackInfo(): VariantArray<Dictionary<Any?, Any?>> {
     throw NotImplementedError("_debug_get_current_stack_info is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _reloadAllScripts(): Unit {
   }
 
+  @GodotApiMember
   public open fun _reloadToolScript(script: Script?, softReload: Boolean): Unit {
   }
 
+  @GodotApiMember
   public open fun _getRecognizedExtensions(): PackedStringArray {
     throw NotImplementedError("_get_recognized_extensions is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _getPublicFunctions(): VariantArray<Dictionary<Any?, Any?>> {
     throw NotImplementedError("_get_public_functions is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _getPublicConstants(): Dictionary<Any?, Any?> {
     throw NotImplementedError("_get_public_constants is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _getPublicAnnotations(): VariantArray<Dictionary<Any?, Any?>> {
     throw NotImplementedError("_get_public_annotations is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _profilingStart(): Unit {
   }
 
+  @GodotApiMember
   public open fun _profilingStop(): Unit {
   }
 
+  @GodotApiMember
   public open fun _profilingSetSaveNativeCalls(enable: Boolean): Unit {
   }
 
+  @GodotApiMember
   public open fun _frame(): Unit {
   }
 
+  @GodotApiMember
   public open fun _handlesGlobalClassType(type: String): Boolean {
     throw NotImplementedError("_handles_global_class_type is not implemented for ScriptLanguageExtension")
   }
 
+  @GodotApiMember
   public open fun _getGlobalClassName(path: String): Dictionary<Any?, Any?> {
     throw NotImplementedError("_get_global_class_name is not implemented for ScriptLanguageExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ScrollBar.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ScrollBar.kt
index c28d31ac7f..62380f79ed 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ScrollBar.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ScrollBar.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -29,6 +30,7 @@ public open class ScrollBar internal constructor() : Range() {
   /**
    * Emitted when the scrollbar is being scrolled.
    */
+  @GodotApiMember
   public val scrolling: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ScrollContainer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ScrollContainer.kt
index 7b6fdae542..af9498a138 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ScrollContainer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ScrollContainer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -41,6 +42,7 @@ public open class ScrollContainer : Container() {
    * **Note:** This signal is only emitted on Android or iOS, or on desktop/web platforms when
    * [ProjectSettings.inputDevices/pointing/emulateTouchFromMouse] is enabled.
    */
+  @GodotApiMember
   public val scrollStarted: Signal0 by Signal0
 
   /**
@@ -50,6 +52,7 @@ public open class ScrollContainer : Container() {
    * **Note:** This signal is only emitted on Android or iOS, or on desktop/web platforms when
    * [ProjectSettings.inputDevices/pointing/emulateTouchFromMouse] is enabled.
    */
+  @GodotApiMember
   public val scrollEnded: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Skeleton2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Skeleton2D.kt
index 3eb9e57ed1..c7e2513068 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Skeleton2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Skeleton2D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.RID
@@ -40,6 +41,7 @@ public open class Skeleton2D : Node2D() {
    * Emitted when the [Bone2D] setup attached to this skeletons changes. This is primarily used
    * internally within the skeleton.
    */
+  @GodotApiMember
   public val boneSetupChanged: Signal0 by Signal0
 
   public override fun new(scriptIndex: Int): Unit {
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Skeleton3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Skeleton3D.kt
index f27158b657..459c16e131 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Skeleton3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Skeleton3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedInt32Array
@@ -58,6 +59,7 @@ public open class Skeleton3D : Node3D() {
    * **Note:** During the update process, this signal is not fired, so modification by
    * [SkeletonModifier3D] is not detected.
    */
+  @GodotApiMember
   public val poseUpdated: Signal0 by Signal0
 
   /**
@@ -67,19 +69,23 @@ public open class Skeleton3D : Node3D() {
    * completion of the processing of each [SkeletonModifier3D], use [signal
    * SkeletonModifier3D.modification_processed].
    */
+  @GodotApiMember
   public val skeletonUpdated: Signal0 by Signal0
 
   /**
    * Emitted when the bone at [boneIdx] is toggled with [setBoneEnabled]. Use [isBoneEnabled] to
    * check the new value.
    */
+  @GodotApiMember
   public val boneEnabledChanged: Signal1<Long> by Signal1
 
+  @GodotApiMember
   public val boneListChanged: Signal0 by Signal0
 
   /**
    * Emitted when the value of [showRestOnly] changes.
    */
+  @GodotApiMember
   public val showRestOnlyChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonModification2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonModification2D.kt
index 7dfcfef1c8..fcf5907b04 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonModification2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonModification2D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.TypeManager
@@ -64,12 +65,14 @@ public open class SkeletonModification2D : Resource() {
    * Executes the given modification. This is where the modification performs whatever function it
    * is designed to do.
    */
+  @GodotApiMember
   public open fun _execute(delta: Double): Unit {
   }
 
   /**
    * Called when the modification is setup. This is where the modification performs initialization.
    */
+  @GodotApiMember
   public open fun _setupModification(modificationStack: SkeletonModificationStack2D?): Unit {
   }
 
@@ -79,6 +82,7 @@ public open class SkeletonModification2D : Resource() {
    * **Note:** You will need to use the Skeleton2D from [SkeletonModificationStack2D.getSkeleton]
    * and it's draw functions, as the [SkeletonModification2D] resource cannot draw on its own.
    */
+  @GodotApiMember
   public open fun _drawEditorGizmo(): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonModifier3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonModifier3D.kt
index f3ff938757..249fca0034 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonModifier3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonModifier3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -36,6 +37,7 @@ public open class SkeletonModifier3D : Node3D() {
    * **Note:** If you want to get the modified bone pose by the modifier, you must use
    * [Skeleton3D.getBonePose] or [Skeleton3D.getBoneGlobalPose] at the moment this signal is fired.
    */
+  @GodotApiMember
   public val modificationProcessed: Signal0 by Signal0
 
   /**
@@ -72,6 +74,7 @@ public open class SkeletonModifier3D : Node3D() {
    * [_processModification] must not apply [influence] to bone poses because the [Skeleton3D]
    * automatically applies influence to all bone poses set by the modifier.
    */
+  @GodotApiMember
   public open fun _processModification(): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonProfile.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonProfile.kt
index 2b83019981..4baef0f9f6 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonProfile.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/SkeletonProfile.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -43,6 +44,7 @@ public open class SkeletonProfile : Resource() {
    * **Note:** This signal is not connected directly to editor to simplify the reference, instead it
    * is passed on to editor through the [BoneMap].
    */
+  @GodotApiMember
   public val profileUpdated: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Slider.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Slider.kt
index ce9305ce5f..12375d72b7 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Slider.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Slider.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -32,12 +33,14 @@ public open class Slider internal constructor() : Range() {
    * Emitted when dragging is started. This is emitted before the corresponding [signal
    * Range.value_changed] signal.
    */
+  @GodotApiMember
   public val dragStarted: Signal0 by Signal0
 
   /**
    * Emitted when dragging stops. If [valueChanged] is true, [Range.value] is different from the
    * value when you started the dragging.
    */
+  @GodotApiMember
   public val dragEnded: Signal1<Boolean> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/SplitContainer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/SplitContainer.kt
index 23ee4d7c59..10b46c5f76 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/SplitContainer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/SplitContainer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal1
@@ -31,6 +32,7 @@ public open class SplitContainer : Container() {
   /**
    * Emitted when the dragger is dragged by user.
    */
+  @GodotApiMember
   public val dragged: Signal1<Long> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Sprite2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Sprite2D.kt
index 27a19b4a5f..47f8be0732 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Sprite2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Sprite2D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Rect2
@@ -39,11 +40,13 @@ public open class Sprite2D : Node2D() {
   /**
    * Emitted when the [frame] changes.
    */
+  @GodotApiMember
   public val frameChanged: Signal0 by Signal0
 
   /**
    * Emitted when the [texture] changes.
    */
+  @GodotApiMember
   public val textureChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Sprite3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Sprite3D.kt
index 32b4f6e331..5c2a52cdf3 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Sprite3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Sprite3D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Rect2
@@ -38,11 +39,13 @@ public open class Sprite3D : SpriteBase3D() {
   /**
    * Emitted when the [frame] changes.
    */
+  @GodotApiMember
   public val frameChanged: Signal0 by Signal0
 
   /**
    * Emitted when the [texture] changes.
    */
+  @GodotApiMember
   public val textureChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/StatusIndicator.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/StatusIndicator.kt
index b656e62abd..5391d50acf 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/StatusIndicator.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/StatusIndicator.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.NodePath
@@ -33,6 +34,7 @@ public open class StatusIndicator : Node() {
   /**
    * Emitted when the status indicator is pressed.
    */
+  @GodotApiMember
   public val pressed: Signal2<Long, Vector2i> by Signal2
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/StreamPeerExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/StreamPeerExtension.kt
index 2993418402..c44a761f9f 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/StreamPeerExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/StreamPeerExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import kotlin.Int
 import kotlin.NotImplementedError
@@ -18,6 +19,7 @@ public open class StreamPeerExtension : StreamPeer() {
     callConstructor(ENGINECLASS_STREAMPEEREXTENSION, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _getAvailableBytes(): Int {
     throw NotImplementedError("_get_available_bytes is not implemented for StreamPeerExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/StyleBox.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/StyleBox.kt
index a4c2d5c628..c6ef23a31c 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/StyleBox.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/StyleBox.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.RID
@@ -102,9 +103,11 @@ public open class StyleBox : Resource() {
     callConstructor(ENGINECLASS_STYLEBOX, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _draw(toCanvasItem: RID, rect: Rect2): Unit {
   }
 
+  @GodotApiMember
   public open fun _getDrawRect(rect: Rect2): Rect2 {
     throw NotImplementedError("_get_draw_rect is not implemented for StyleBox")
   }
@@ -115,10 +118,12 @@ public open class StyleBox : Resource() {
    * This method can be overridden to add another size restriction. A combination of the default
    * behavior and the output of this method will be used, to account for both sizes.
    */
+  @GodotApiMember
   public open fun _getMinimumSize(): Vector2 {
     throw NotImplementedError("_get_minimum_size is not implemented for StyleBox")
   }
 
+  @GodotApiMember
   public open fun _testMask(point: Vector2, rect: Rect2): Boolean {
     throw NotImplementedError("_test_mask is not implemented for StyleBox")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/SubViewportContainer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/SubViewportContainer.kt
index 5f79fd135b..22b052ca13 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/SubViewportContainer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/SubViewportContainer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.TypeManager
@@ -68,6 +69,7 @@ public open class SubViewportContainer : Container() {
    * to [SubViewport] children. Propagation doesn't happen if it returns `false`. If the function is
    * not implemented, all events are propagated to SubViewports.
    */
+  @GodotApiMember
   public open fun _propagateInputEvent(event: InputEvent?): Boolean {
     throw NotImplementedError("_propagate_input_event is not implemented for SubViewportContainer")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/SyntaxHighlighter.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/SyntaxHighlighter.kt
index a13fa32480..3bc542cee3 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/SyntaxHighlighter.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/SyntaxHighlighter.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -36,6 +37,7 @@ public open class SyntaxHighlighter : Resource() {
    * Virtual method which can be overridden to return syntax highlighting data.
    * See [getLineSyntaxHighlighting] for more details.
    */
+  @GodotApiMember
   public open fun _getLineSyntaxHighlighting(line: Int): Dictionary<Any?, Any?> {
     throw NotImplementedError("_get_line_syntax_highlighting is not implemented for SyntaxHighlighter")
   }
@@ -43,12 +45,14 @@ public open class SyntaxHighlighter : Resource() {
   /**
    * Virtual method which can be overridden to clear any local caches.
    */
+  @GodotApiMember
   public open fun _clearHighlightingCache(): Unit {
   }
 
   /**
    * Virtual method which can be overridden to update any local caches.
    */
+  @GodotApiMember
   public open fun _updateCache(): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/TabBar.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/TabBar.kt
index 3cde210fdb..77cd0de3a6 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/TabBar.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/TabBar.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Rect2
@@ -41,21 +42,25 @@ public open class TabBar : Control() {
    * Emitted when a tab is selected via click, directional input, or script, even if it is the
    * current tab.
    */
+  @GodotApiMember
   public val tabSelected: Signal1<Long> by Signal1
 
   /**
    * Emitted when switching to another tab.
    */
+  @GodotApiMember
   public val tabChanged: Signal1<Long> by Signal1
 
   /**
    * Emitted when a tab is clicked, even if it is the current tab.
    */
+  @GodotApiMember
   public val tabClicked: Signal1<Long> by Signal1
 
   /**
    * Emitted when a tab is right-clicked. [selectWithRmb] must be enabled.
    */
+  @GodotApiMember
   public val tabRmbClicked: Signal1<Long> by Signal1
 
   /**
@@ -72,21 +77,25 @@ public open class TabBar : Control() {
    * GetNode<TabBar>("TabBar").TabClosePressed += GetNode<TabBar>("TabBar").RemoveTab;
    * ```
    */
+  @GodotApiMember
   public val tabClosePressed: Signal1<Long> by Signal1
 
   /**
    * Emitted when a tab's right button is pressed. See [setTabButtonIcon].
    */
+  @GodotApiMember
   public val tabButtonPressed: Signal1<Long> by Signal1
 
   /**
    * Emitted when a tab is hovered by the mouse.
    */
+  @GodotApiMember
   public val tabHovered: Signal1<Long> by Signal1
 
   /**
    * Emitted when the active tab is rearranged via mouse drag. See [dragToRearrangeEnabled].
    */
+  @GodotApiMember
   public val activeTabRearranged: Signal1<Long> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/TabContainer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/TabContainer.kt
index 0222cccc06..3cb206d90d 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/TabContainer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/TabContainer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -40,37 +41,44 @@ public open class TabContainer : Container() {
   /**
    * Emitted when the active tab is rearranged via mouse drag. See [dragToRearrangeEnabled].
    */
+  @GodotApiMember
   public val activeTabRearranged: Signal1<Long> by Signal1
 
   /**
    * Emitted when switching to another tab.
    */
+  @GodotApiMember
   public val tabChanged: Signal1<Long> by Signal1
 
   /**
    * Emitted when a tab is clicked, even if it is the current tab.
    */
+  @GodotApiMember
   public val tabClicked: Signal1<Long> by Signal1
 
   /**
    * Emitted when a tab is hovered by the mouse.
    */
+  @GodotApiMember
   public val tabHovered: Signal1<Long> by Signal1
 
   /**
    * Emitted when a tab is selected via click, directional input, or script, even if it is the
    * current tab.
    */
+  @GodotApiMember
   public val tabSelected: Signal1<Long> by Signal1
 
   /**
    * Emitted when the user clicks on the button icon on this tab.
    */
+  @GodotApiMember
   public val tabButtonPressed: Signal1<Long> by Signal1
 
   /**
    * Emitted when the [TabContainer]'s [Popup] button is clicked. See [setPopup] for details.
    */
+  @GodotApiMember
   public val prePopupPressed: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/TextEdit.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/TextEdit.kt
index fa24525d5a..3a39ebcca5 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/TextEdit.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/TextEdit.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Callable
@@ -61,11 +62,13 @@ public open class TextEdit : Control() {
   /**
    * Emitted when [clear] is called or [text] is set.
    */
+  @GodotApiMember
   public val textSet: Signal0 by Signal0
 
   /**
    * Emitted when the text changes.
    */
+  @GodotApiMember
   public val textChanged: Signal0 by Signal0
 
   /**
@@ -73,26 +76,31 @@ public open class TextEdit : Control() {
    * When text is added [fromLine] will be less than [toLine]. On a remove [toLine] will be less
    * than [fromLine].
    */
+  @GodotApiMember
   public val linesEditedFrom: Signal2<Long, Long> by Signal2
 
   /**
    * Emitted when any caret changes position.
    */
+  @GodotApiMember
   public val caretChanged: Signal0 by Signal0
 
   /**
    * Emitted when a gutter is clicked.
    */
+  @GodotApiMember
   public val gutterClicked: Signal2<Long, Long> by Signal2
 
   /**
    * Emitted when a gutter is added.
    */
+  @GodotApiMember
   public val gutterAdded: Signal0 by Signal0
 
   /**
    * Emitted when a gutter is removed.
    */
+  @GodotApiMember
   public val gutterRemoved: Signal0 by Signal0
 
   /**
@@ -576,30 +584,35 @@ public open class TextEdit : Control() {
    * Override this method to define what happens when the user types in the provided key
    * [unicodeChar].
    */
+  @GodotApiMember
   public open fun _handleUnicodeInput(unicodeChar: Int, caretIndex: Int): Unit {
   }
 
   /**
    * Override this method to define what happens when the user presses the backspace key.
    */
+  @GodotApiMember
   public open fun _backspace(caretIndex: Int): Unit {
   }
 
   /**
    * Override this method to define what happens when the user performs a cut operation.
    */
+  @GodotApiMember
   public open fun _cut(caretIndex: Int): Unit {
   }
 
   /**
    * Override this method to define what happens when the user performs a copy operation.
    */
+  @GodotApiMember
   public open fun _copy(caretIndex: Int): Unit {
   }
 
   /**
    * Override this method to define what happens when the user performs a paste operation.
    */
+  @GodotApiMember
   public open fun _paste(caretIndex: Int): Unit {
   }
 
@@ -608,6 +621,7 @@ public open class TextEdit : Control() {
    * middle mouse button.
    * **Note:** This method is only implemented on Linux.
    */
+  @GodotApiMember
   public open fun _pastePrimaryClipboard(caretIndex: Int): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/TextServerExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/TextServerExtension.kt
index afb768af66..0e40594f13 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/TextServerExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/TextServerExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.Color
 import godot.core.Dictionary
@@ -44,6 +45,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns `true` if the server supports a feature.
    */
+  @GodotApiMember
   public open fun _hasFeature(feature: TextServer.Feature): Boolean {
     throw NotImplementedError("_has_feature is not implemented for TextServerExtension")
   }
@@ -52,6 +54,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns the name of the server interface.
    */
+  @GodotApiMember
   public open fun _getName(): String {
     throw NotImplementedError("_get_name is not implemented for TextServerExtension")
   }
@@ -60,6 +63,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns text server features, see [TextServer.Feature].
    */
+  @GodotApiMember
   public open fun _getFeatures(): Long {
     throw NotImplementedError("_get_features is not implemented for TextServerExtension")
   }
@@ -68,6 +72,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Frees an object created by this [TextServer].
    */
+  @GodotApiMember
   public open fun _freeRid(rid: RID): Unit {
   }
 
@@ -75,6 +80,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns `true` if [rid] is valid resource owned by this text server.
    */
+  @GodotApiMember
   public open fun _has(rid: RID): Boolean {
     throw NotImplementedError("_has is not implemented for TextServerExtension")
   }
@@ -83,6 +89,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Loads optional TextServer database (e.g. ICU break iterators and dictionaries).
    */
+  @GodotApiMember
   public open fun _loadSupportData(filename: String): Boolean {
     throw NotImplementedError("_load_support_data is not implemented for TextServerExtension")
   }
@@ -91,6 +98,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns default TextServer database (e.g. ICU break iterators and dictionaries) filename.
    */
+  @GodotApiMember
   public open fun _getSupportDataFilename(): String {
     throw NotImplementedError("_get_support_data_filename is not implemented for TextServerExtension")
   }
@@ -99,6 +107,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns TextServer database (e.g. ICU break iterators and dictionaries) description.
    */
+  @GodotApiMember
   public open fun _getSupportDataInfo(): String {
     throw NotImplementedError("_get_support_data_info is not implemented for TextServerExtension")
   }
@@ -107,6 +116,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Saves optional TextServer database (e.g. ICU break iterators and dictionaries) to the file.
    */
+  @GodotApiMember
   public open fun _saveSupportData(filename: String): Boolean {
     throw NotImplementedError("_save_support_data is not implemented for TextServerExtension")
   }
@@ -115,6 +125,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns `true` if locale is right-to-left.
    */
+  @GodotApiMember
   public open fun _isLocaleRightToLeft(locale: String): Boolean {
     throw NotImplementedError("_is_locale_right_to_left is not implemented for TextServerExtension")
   }
@@ -123,6 +134,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Converts readable feature, variation, script, or language name to OpenType tag.
    */
+  @GodotApiMember
   public open fun _nameToTag(name: String): Long {
     throw NotImplementedError("_name_to_tag is not implemented for TextServerExtension")
   }
@@ -131,6 +143,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Converts OpenType tag to readable feature, variation, script, or language name.
    */
+  @GodotApiMember
   public open fun _tagToName(tag: Long): String {
     throw NotImplementedError("_tag_to_name is not implemented for TextServerExtension")
   }
@@ -139,6 +152,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Creates a new, empty font cache entry resource.
    */
+  @GodotApiMember
   public open fun _createFont(): RID {
     throw NotImplementedError("_create_font is not implemented for TextServerExtension")
   }
@@ -147,6 +161,7 @@ public open class TextServerExtension : TextServer() {
    * Optional, implement if font supports extra spacing or baseline offset.
    * Creates a new variation existing font which is reusing the same glyph cache and font data.
    */
+  @GodotApiMember
   public open fun _createFontLinkedVariation(fontRid: RID): RID {
     throw NotImplementedError("_create_font_linked_variation is not implemented for TextServerExtension")
   }
@@ -155,6 +170,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets font source data, e.g contents of the dynamic font source file.
    */
+  @GodotApiMember
   public open fun _fontSetData(fontRid: RID, `data`: PackedByteArray): Unit {
   }
 
@@ -162,6 +178,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets an active face index in the TrueType / OpenType collection.
    */
+  @GodotApiMember
   public open fun _fontSetFaceIndex(fontRid: RID, faceIndex: Long): Unit {
   }
 
@@ -169,6 +186,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns an active face index in the TrueType / OpenType collection.
    */
+  @GodotApiMember
   public open fun _fontGetFaceIndex(fontRid: RID): Long {
     throw NotImplementedError("_font_get_face_index is not implemented for TextServerExtension")
   }
@@ -177,6 +195,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns number of faces in the TrueType / OpenType collection.
    */
+  @GodotApiMember
   public open fun _fontGetFaceCount(fontRid: RID): Long {
     throw NotImplementedError("_font_get_face_count is not implemented for TextServerExtension")
   }
@@ -185,6 +204,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets the font style flags, see [TextServer.FontStyle].
    */
+  @GodotApiMember
   public open fun _fontSetStyle(fontRid: RID, style: TextServer.FontStyle): Unit {
   }
 
@@ -192,6 +212,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns font style flags, see [TextServer.FontStyle].
    */
+  @GodotApiMember
   public open fun _fontGetStyle(fontRid: RID): TextServer.FontStyle {
     throw NotImplementedError("_font_get_style is not implemented for TextServerExtension")
   }
@@ -200,6 +221,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets the font family name.
    */
+  @GodotApiMember
   public open fun _fontSetName(fontRid: RID, name: String): Unit {
   }
 
@@ -207,6 +229,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns font family name.
    */
+  @GodotApiMember
   public open fun _fontGetName(fontRid: RID): String {
     throw NotImplementedError("_font_get_name is not implemented for TextServerExtension")
   }
@@ -216,6 +239,7 @@ public open class TextServerExtension : TextServer() {
    * Returns [Dictionary] with OpenType font name strings (localized font names, version,
    * description, license information, sample text, etc.).
    */
+  @GodotApiMember
   public open fun _fontGetOtNameStrings(fontRid: RID): Dictionary<Any?, Any?> {
     throw NotImplementedError("_font_get_ot_name_strings is not implemented for TextServerExtension")
   }
@@ -224,6 +248,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets the font style name.
    */
+  @GodotApiMember
   public open fun _fontSetStyleName(fontRid: RID, nameStyle: String): Unit {
   }
 
@@ -231,6 +256,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns font style name.
    */
+  @GodotApiMember
   public open fun _fontGetStyleName(fontRid: RID): String {
     throw NotImplementedError("_font_get_style_name is not implemented for TextServerExtension")
   }
@@ -240,6 +266,7 @@ public open class TextServerExtension : TextServer() {
    * Sets weight (boldness) of the font. A value in the `100...999` range, normal font weight is
    * `400`, bold font weight is `700`.
    */
+  @GodotApiMember
   public open fun _fontSetWeight(fontRid: RID, weight: Long): Unit {
   }
 
@@ -248,6 +275,7 @@ public open class TextServerExtension : TextServer() {
    * Returns weight (boldness) of the font. A value in the `100...999` range, normal font weight is
    * `400`, bold font weight is `700`.
    */
+  @GodotApiMember
   public open fun _fontGetWeight(fontRid: RID): Long {
     throw NotImplementedError("_font_get_weight is not implemented for TextServerExtension")
   }
@@ -257,6 +285,7 @@ public open class TextServerExtension : TextServer() {
    * Sets font stretch amount, compared to a normal width. A percentage value between `50&#37;` and
    * `200&#37;`.
    */
+  @GodotApiMember
   public open fun _fontSetStretch(fontRid: RID, stretch: Long): Unit {
   }
 
@@ -265,6 +294,7 @@ public open class TextServerExtension : TextServer() {
    * Returns font stretch amount, compared to a normal width. A percentage value between `50&#37;`
    * and `200&#37;`.
    */
+  @GodotApiMember
   public open fun _fontGetStretch(fontRid: RID): Long {
     throw NotImplementedError("_font_get_stretch is not implemented for TextServerExtension")
   }
@@ -273,6 +303,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets font anti-aliasing mode.
    */
+  @GodotApiMember
   public open fun _fontSetAntialiasing(fontRid: RID, antialiasing: TextServer.FontAntialiasing):
       Unit {
   }
@@ -281,6 +312,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns font anti-aliasing mode.
    */
+  @GodotApiMember
   public open fun _fontGetAntialiasing(fontRid: RID): TextServer.FontAntialiasing {
     throw NotImplementedError("_font_get_antialiasing is not implemented for TextServerExtension")
   }
@@ -289,6 +321,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * If set to `true`, embedded font bitmap loading is disabled.
    */
+  @GodotApiMember
   public open fun _fontSetDisableEmbeddedBitmaps(fontRid: RID, disableEmbeddedBitmaps: Boolean):
       Unit {
   }
@@ -297,6 +330,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns whether the font's embedded bitmap loading is disabled.
    */
+  @GodotApiMember
   public open fun _fontGetDisableEmbeddedBitmaps(fontRid: RID): Boolean {
     throw NotImplementedError("_font_get_disable_embedded_bitmaps is not implemented for TextServerExtension")
   }
@@ -305,6 +339,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * If set to `true` font texture mipmap generation is enabled.
    */
+  @GodotApiMember
   public open fun _fontSetGenerateMipmaps(fontRid: RID, generateMipmaps: Boolean): Unit {
   }
 
@@ -312,6 +347,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns `true` if font texture mipmap generation is enabled.
    */
+  @GodotApiMember
   public open fun _fontGetGenerateMipmaps(fontRid: RID): Boolean {
     throw NotImplementedError("_font_get_generate_mipmaps is not implemented for TextServerExtension")
   }
@@ -325,6 +361,7 @@ public open class TextServerExtension : TextServer() {
    * available with MSDF. The lack of font hinting may result in less crisp and less readable fonts at
    * small sizes.
    */
+  @GodotApiMember
   public open fun _fontSetMultichannelSignedDistanceField(fontRid: RID, msdf: Boolean): Unit {
   }
 
@@ -333,6 +370,7 @@ public open class TextServerExtension : TextServer() {
    * Returns `true` if glyphs of all sizes are rendered using single multichannel signed distance
    * field generated from the dynamic font vector data.
    */
+  @GodotApiMember
   public open fun _fontIsMultichannelSignedDistanceField(fontRid: RID): Boolean {
     throw NotImplementedError("_font_is_multichannel_signed_distance_field is not implemented for TextServerExtension")
   }
@@ -342,6 +380,7 @@ public open class TextServerExtension : TextServer() {
    * Sets the width of the range around the shape between the minimum and maximum representable
    * signed distance.
    */
+  @GodotApiMember
   public open fun _fontSetMsdfPixelRange(fontRid: RID, msdfPixelRange: Long): Unit {
   }
 
@@ -350,6 +389,7 @@ public open class TextServerExtension : TextServer() {
    * Returns the width of the range around the shape between the minimum and maximum representable
    * signed distance.
    */
+  @GodotApiMember
   public open fun _fontGetMsdfPixelRange(fontRid: RID): Long {
     throw NotImplementedError("_font_get_msdf_pixel_range is not implemented for TextServerExtension")
   }
@@ -358,6 +398,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets source font size used to generate MSDF textures.
    */
+  @GodotApiMember
   public open fun _fontSetMsdfSize(fontRid: RID, msdfSize: Long): Unit {
   }
 
@@ -365,6 +406,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns source font size used to generate MSDF textures.
    */
+  @GodotApiMember
   public open fun _fontGetMsdfSize(fontRid: RID): Long {
     throw NotImplementedError("_font_get_msdf_size is not implemented for TextServerExtension")
   }
@@ -374,6 +416,7 @@ public open class TextServerExtension : TextServer() {
    * Sets bitmap font fixed size. If set to value greater than zero, same cache entry will be used
    * for all font sizes.
    */
+  @GodotApiMember
   public open fun _fontSetFixedSize(fontRid: RID, fixedSize: Long): Unit {
   }
 
@@ -381,6 +424,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns bitmap font fixed size.
    */
+  @GodotApiMember
   public open fun _fontGetFixedSize(fontRid: RID): Long {
     throw NotImplementedError("_font_get_fixed_size is not implemented for TextServerExtension")
   }
@@ -389,6 +433,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets bitmap font scaling mode. This property is used only if `fixed_size` is greater than zero.
    */
+  @GodotApiMember
   public open fun _fontSetFixedSizeScaleMode(fontRid: RID,
       fixedSizeScaleMode: TextServer.FixedSizeScaleMode): Unit {
   }
@@ -397,6 +442,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns bitmap font scaling mode.
    */
+  @GodotApiMember
   public open fun _fontGetFixedSizeScaleMode(fontRid: RID): TextServer.FixedSizeScaleMode {
     throw NotImplementedError("_font_get_fixed_size_scale_mode is not implemented for TextServerExtension")
   }
@@ -405,6 +451,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * If set to `true`, system fonts can be automatically used as fallbacks.
    */
+  @GodotApiMember
   public open fun _fontSetAllowSystemFallback(fontRid: RID, allowSystemFallback: Boolean): Unit {
   }
 
@@ -412,6 +459,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns `true` if system fonts can be automatically used as fallbacks.
    */
+  @GodotApiMember
   public open fun _fontIsAllowSystemFallback(fontRid: RID): Boolean {
     throw NotImplementedError("_font_is_allow_system_fallback is not implemented for TextServerExtension")
   }
@@ -420,6 +468,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * If set to `true` auto-hinting is preferred over font built-in hinting.
    */
+  @GodotApiMember
   public open fun _fontSetForceAutohinter(fontRid: RID, forceAutohinter: Boolean): Unit {
   }
 
@@ -427,6 +476,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns `true` if auto-hinting is supported and preferred over font built-in hinting.
    */
+  @GodotApiMember
   public open fun _fontIsForceAutohinter(fontRid: RID): Boolean {
     throw NotImplementedError("_font_is_force_autohinter is not implemented for TextServerExtension")
   }
@@ -435,6 +485,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets font hinting mode. Used by dynamic fonts only.
    */
+  @GodotApiMember
   public open fun _fontSetHinting(fontRid: RID, hinting: TextServer.Hinting): Unit {
   }
 
@@ -442,6 +493,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns the font hinting mode. Used by dynamic fonts only.
    */
+  @GodotApiMember
   public open fun _fontGetHinting(fontRid: RID): TextServer.Hinting {
     throw NotImplementedError("_font_get_hinting is not implemented for TextServerExtension")
   }
@@ -450,6 +502,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets font subpixel glyph positioning mode.
    */
+  @GodotApiMember
   public open fun _fontSetSubpixelPositioning(fontRid: RID,
       subpixelPositioning: TextServer.SubpixelPositioning): Unit {
   }
@@ -458,6 +511,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns font subpixel glyph positioning mode.
    */
+  @GodotApiMember
   public open fun _fontGetSubpixelPositioning(fontRid: RID): TextServer.SubpixelPositioning {
     throw NotImplementedError("_font_get_subpixel_positioning is not implemented for TextServerExtension")
   }
@@ -466,6 +520,7 @@ public open class TextServerExtension : TextServer() {
    * Sets font embolden strength. If [strength] is not equal to zero, emboldens the font outlines.
    * Negative values reduce the outline thickness.
    */
+  @GodotApiMember
   public open fun _fontSetEmbolden(fontRid: RID, strength: Double): Unit {
   }
 
@@ -473,6 +528,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns font embolden strength.
    */
+  @GodotApiMember
   public open fun _fontGetEmbolden(fontRid: RID): Double {
     throw NotImplementedError("_font_get_embolden is not implemented for TextServerExtension")
   }
@@ -482,6 +538,7 @@ public open class TextServerExtension : TextServer() {
    * Sets the spacing for [spacing] (see [TextServer.SpacingType]) to [value] in pixels (not
    * relative to the font size).
    */
+  @GodotApiMember
   public open fun _fontSetSpacing(
     fontRid: RID,
     spacing: TextServer.SpacingType,
@@ -494,6 +551,7 @@ public open class TextServerExtension : TextServer() {
    * Returns the spacing for [spacing] (see [TextServer.SpacingType]) in pixels (not relative to the
    * font size).
    */
+  @GodotApiMember
   public open fun _fontGetSpacing(fontRid: RID, spacing: TextServer.SpacingType): Long {
     throw NotImplementedError("_font_get_spacing is not implemented for TextServerExtension")
   }
@@ -502,6 +560,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets extra baseline offset (as a fraction of font height).
    */
+  @GodotApiMember
   public open fun _fontSetBaselineOffset(fontRid: RID, baselineOffset: Double): Unit {
   }
 
@@ -509,6 +568,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns extra baseline offset (as a fraction of font height).
    */
+  @GodotApiMember
   public open fun _fontGetBaselineOffset(fontRid: RID): Double {
     throw NotImplementedError("_font_get_baseline_offset is not implemented for TextServerExtension")
   }
@@ -518,6 +578,7 @@ public open class TextServerExtension : TextServer() {
    * Sets 2D transform, applied to the font outlines, can be used for slanting, flipping, and
    * rotating glyphs.
    */
+  @GodotApiMember
   public open fun _fontSetTransform(fontRid: RID, transform: Transform2D): Unit {
   }
 
@@ -525,6 +586,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns 2D transform applied to the font outlines.
    */
+  @GodotApiMember
   public open fun _fontGetTransform(fontRid: RID): Transform2D {
     throw NotImplementedError("_font_get_transform is not implemented for TextServerExtension")
   }
@@ -533,6 +595,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets variation coordinates for the specified font cache entry.
    */
+  @GodotApiMember
   public open fun _fontSetVariationCoordinates(fontRid: RID,
       variationCoordinates: Dictionary<Any?, Any?>): Unit {
   }
@@ -541,6 +604,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns variation coordinates for the specified font cache entry.
    */
+  @GodotApiMember
   public open fun _fontGetVariationCoordinates(fontRid: RID): Dictionary<Any?, Any?> {
     throw NotImplementedError("_font_get_variation_coordinates is not implemented for TextServerExtension")
   }
@@ -550,6 +614,7 @@ public open class TextServerExtension : TextServer() {
    * Sets font oversampling factor, if set to `0.0` global oversampling factor is used instead. Used
    * by dynamic fonts only.
    */
+  @GodotApiMember
   public open fun _fontSetOversampling(fontRid: RID, oversampling: Double): Unit {
   }
 
@@ -558,6 +623,7 @@ public open class TextServerExtension : TextServer() {
    * Returns font oversampling factor, if set to `0.0` global oversampling factor is used instead.
    * Used by dynamic fonts only.
    */
+  @GodotApiMember
   public open fun _fontGetOversampling(fontRid: RID): Double {
     throw NotImplementedError("_font_get_oversampling is not implemented for TextServerExtension")
   }
@@ -567,6 +633,7 @@ public open class TextServerExtension : TextServer() {
    * Returns list of the font sizes in the cache. Each size is [Vector2i] with font size and outline
    * size.
    */
+  @GodotApiMember
   public open fun _fontGetSizeCacheList(fontRid: RID): VariantArray<Vector2i> {
     throw NotImplementedError("_font_get_size_cache_list is not implemented for TextServerExtension")
   }
@@ -575,6 +642,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Removes all font sizes from the cache entry.
    */
+  @GodotApiMember
   public open fun _fontClearSizeCache(fontRid: RID): Unit {
   }
 
@@ -582,6 +650,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Removes specified font size from the cache entry.
    */
+  @GodotApiMember
   public open fun _fontRemoveSizeCache(fontRid: RID, size: Vector2i): Unit {
   }
 
@@ -589,6 +658,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets the font ascent (number of pixels above the baseline).
    */
+  @GodotApiMember
   public open fun _fontSetAscent(
     fontRid: RID,
     size: Long,
@@ -600,6 +670,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns the font ascent (number of pixels above the baseline).
    */
+  @GodotApiMember
   public open fun _fontGetAscent(fontRid: RID, size: Long): Double {
     throw NotImplementedError("_font_get_ascent is not implemented for TextServerExtension")
   }
@@ -608,6 +679,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets the font descent (number of pixels below the baseline).
    */
+  @GodotApiMember
   public open fun _fontSetDescent(
     fontRid: RID,
     size: Long,
@@ -619,6 +691,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns the font descent (number of pixels below the baseline).
    */
+  @GodotApiMember
   public open fun _fontGetDescent(fontRid: RID, size: Long): Double {
     throw NotImplementedError("_font_get_descent is not implemented for TextServerExtension")
   }
@@ -627,6 +700,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets pixel offset of the underline below the baseline.
    */
+  @GodotApiMember
   public open fun _fontSetUnderlinePosition(
     fontRid: RID,
     size: Long,
@@ -638,6 +712,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns pixel offset of the underline below the baseline.
    */
+  @GodotApiMember
   public open fun _fontGetUnderlinePosition(fontRid: RID, size: Long): Double {
     throw NotImplementedError("_font_get_underline_position is not implemented for TextServerExtension")
   }
@@ -646,6 +721,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets thickness of the underline in pixels.
    */
+  @GodotApiMember
   public open fun _fontSetUnderlineThickness(
     fontRid: RID,
     size: Long,
@@ -657,6 +733,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns thickness of the underline in pixels.
    */
+  @GodotApiMember
   public open fun _fontGetUnderlineThickness(fontRid: RID, size: Long): Double {
     throw NotImplementedError("_font_get_underline_thickness is not implemented for TextServerExtension")
   }
@@ -665,6 +742,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets scaling factor of the color bitmap font.
    */
+  @GodotApiMember
   public open fun _fontSetScale(
     fontRid: RID,
     size: Long,
@@ -676,6 +754,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns scaling factor of the color bitmap font.
    */
+  @GodotApiMember
   public open fun _fontGetScale(fontRid: RID, size: Long): Double {
     throw NotImplementedError("_font_get_scale is not implemented for TextServerExtension")
   }
@@ -684,6 +763,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns number of textures used by font cache entry.
    */
+  @GodotApiMember
   public open fun _fontGetTextureCount(fontRid: RID, size: Vector2i): Long {
     throw NotImplementedError("_font_get_texture_count is not implemented for TextServerExtension")
   }
@@ -692,6 +772,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Removes all textures from font cache entry.
    */
+  @GodotApiMember
   public open fun _fontClearTextures(fontRid: RID, size: Vector2i): Unit {
   }
 
@@ -699,6 +780,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Removes specified texture from the cache entry.
    */
+  @GodotApiMember
   public open fun _fontRemoveTexture(
     fontRid: RID,
     size: Vector2i,
@@ -710,6 +792,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets font cache texture image data.
    */
+  @GodotApiMember
   public open fun _fontSetTextureImage(
     fontRid: RID,
     size: Vector2i,
@@ -722,6 +805,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns font cache texture image data.
    */
+  @GodotApiMember
   public open fun _fontGetTextureImage(
     fontRid: RID,
     size: Vector2i,
@@ -734,6 +818,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets array containing glyph packing data.
    */
+  @GodotApiMember
   public open fun _fontSetTextureOffsets(
     fontRid: RID,
     size: Vector2i,
@@ -746,6 +831,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns array containing glyph packing data.
    */
+  @GodotApiMember
   public open fun _fontGetTextureOffsets(
     fontRid: RID,
     size: Vector2i,
@@ -758,6 +844,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns list of rendered glyphs in the cache entry.
    */
+  @GodotApiMember
   public open fun _fontGetGlyphList(fontRid: RID, size: Vector2i): PackedInt32Array {
     throw NotImplementedError("_font_get_glyph_list is not implemented for TextServerExtension")
   }
@@ -766,6 +853,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Removes all rendered glyph information from the cache entry.
    */
+  @GodotApiMember
   public open fun _fontClearGlyphs(fontRid: RID, size: Vector2i): Unit {
   }
 
@@ -773,6 +861,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Removes specified rendered glyph information from the cache entry.
    */
+  @GodotApiMember
   public open fun _fontRemoveGlyph(
     fontRid: RID,
     size: Vector2i,
@@ -784,6 +873,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns glyph advance (offset of the next glyph).
    */
+  @GodotApiMember
   public open fun _fontGetGlyphAdvance(
     fontRid: RID,
     size: Long,
@@ -796,6 +886,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets glyph advance (offset of the next glyph).
    */
+  @GodotApiMember
   public open fun _fontSetGlyphAdvance(
     fontRid: RID,
     size: Long,
@@ -808,6 +899,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns glyph offset from the baseline.
    */
+  @GodotApiMember
   public open fun _fontGetGlyphOffset(
     fontRid: RID,
     size: Vector2i,
@@ -820,6 +912,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets glyph offset from the baseline.
    */
+  @GodotApiMember
   public open fun _fontSetGlyphOffset(
     fontRid: RID,
     size: Vector2i,
@@ -832,6 +925,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns size of the glyph.
    */
+  @GodotApiMember
   public open fun _fontGetGlyphSize(
     fontRid: RID,
     size: Vector2i,
@@ -844,6 +938,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets size of the glyph.
    */
+  @GodotApiMember
   public open fun _fontSetGlyphSize(
     fontRid: RID,
     size: Vector2i,
@@ -856,6 +951,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns rectangle in the cache texture containing the glyph.
    */
+  @GodotApiMember
   public open fun _fontGetGlyphUvRect(
     fontRid: RID,
     size: Vector2i,
@@ -868,6 +964,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets rectangle in the cache texture containing the glyph.
    */
+  @GodotApiMember
   public open fun _fontSetGlyphUvRect(
     fontRid: RID,
     size: Vector2i,
@@ -880,6 +977,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns index of the cache texture containing the glyph.
    */
+  @GodotApiMember
   public open fun _fontGetGlyphTextureIdx(
     fontRid: RID,
     size: Vector2i,
@@ -892,6 +990,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets index of the cache texture containing the glyph.
    */
+  @GodotApiMember
   public open fun _fontSetGlyphTextureIdx(
     fontRid: RID,
     size: Vector2i,
@@ -904,6 +1003,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns resource ID of the cache texture containing the glyph.
    */
+  @GodotApiMember
   public open fun _fontGetGlyphTextureRid(
     fontRid: RID,
     size: Vector2i,
@@ -916,6 +1016,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns size of the cache texture containing the glyph.
    */
+  @GodotApiMember
   public open fun _fontGetGlyphTextureSize(
     fontRid: RID,
     size: Vector2i,
@@ -928,6 +1029,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns outline contours of the glyph.
    */
+  @GodotApiMember
   public open fun _fontGetGlyphContours(
     fontRid: RID,
     size: Long,
@@ -940,6 +1042,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns list of the kerning overrides.
    */
+  @GodotApiMember
   public open fun _fontGetKerningList(fontRid: RID, size: Long): VariantArray<Vector2i> {
     throw NotImplementedError("_font_get_kerning_list is not implemented for TextServerExtension")
   }
@@ -948,6 +1051,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Removes all kerning overrides.
    */
+  @GodotApiMember
   public open fun _fontClearKerningMap(fontRid: RID, size: Long): Unit {
   }
 
@@ -955,6 +1059,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Removes kerning override for the pair of glyphs.
    */
+  @GodotApiMember
   public open fun _fontRemoveKerning(
     fontRid: RID,
     size: Long,
@@ -966,6 +1071,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets kerning for the pair of glyphs.
    */
+  @GodotApiMember
   public open fun _fontSetKerning(
     fontRid: RID,
     size: Long,
@@ -978,6 +1084,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns kerning for the pair of glyphs.
    */
+  @GodotApiMember
   public open fun _fontGetKerning(
     fontRid: RID,
     size: Long,
@@ -990,6 +1097,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns the glyph index of a [char], optionally modified by the [variationSelector].
    */
+  @GodotApiMember
   public open fun _fontGetGlyphIndex(
     fontRid: RID,
     size: Long,
@@ -1003,6 +1111,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns character code associated with [glyphIndex], or `0` if [glyphIndex] is invalid.
    */
+  @GodotApiMember
   public open fun _fontGetCharFromGlyphIndex(
     fontRid: RID,
     size: Long,
@@ -1015,6 +1124,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns `true` if a Unicode [char] is available in the font.
    */
+  @GodotApiMember
   public open fun _fontHasChar(fontRid: RID, char: Long): Boolean {
     throw NotImplementedError("_font_has_char is not implemented for TextServerExtension")
   }
@@ -1023,6 +1133,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns a string containing all the characters available in the font.
    */
+  @GodotApiMember
   public open fun _fontGetSupportedChars(fontRid: RID): String {
     throw NotImplementedError("_font_get_supported_chars is not implemented for TextServerExtension")
   }
@@ -1031,6 +1142,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Renders the range of characters to the font cache texture.
    */
+  @GodotApiMember
   public open fun _fontRenderRange(
     fontRid: RID,
     size: Vector2i,
@@ -1043,6 +1155,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Renders specified glyph to the font cache texture.
    */
+  @GodotApiMember
   public open fun _fontRenderGlyph(
     fontRid: RID,
     size: Vector2i,
@@ -1054,6 +1167,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Draws single glyph into a canvas item at the position, using [fontRid] at the size [size].
    */
+  @GodotApiMember
   public open fun _fontDrawGlyph(
     fontRid: RID,
     canvas: RID,
@@ -1069,6 +1183,7 @@ public open class TextServerExtension : TextServer() {
    * Draws single glyph outline of size [outlineSize] into a canvas item at the position, using
    * [fontRid] at the size [size].
    */
+  @GodotApiMember
   public open fun _fontDrawGlyphOutline(
     fontRid: RID,
     canvas: RID,
@@ -1085,6 +1200,7 @@ public open class TextServerExtension : TextServer() {
    * Returns `true`, if font supports given language
    * ([url=https://en.wikipedia.org/wiki/ISO_639-1]ISO 639[/url] code).
    */
+  @GodotApiMember
   public open fun _fontIsLanguageSupported(fontRid: RID, language: String): Boolean {
     throw NotImplementedError("_font_is_language_supported is not implemented for TextServerExtension")
   }
@@ -1093,6 +1209,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Adds override for [_fontIsLanguageSupported].
    */
+  @GodotApiMember
   public open fun _fontSetLanguageSupportOverride(
     fontRid: RID,
     language: String,
@@ -1104,6 +1221,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns `true` if support override is enabled for the [language].
    */
+  @GodotApiMember
   public open fun _fontGetLanguageSupportOverride(fontRid: RID, language: String): Boolean {
     throw NotImplementedError("_font_get_language_support_override is not implemented for TextServerExtension")
   }
@@ -1112,6 +1230,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Remove language support override.
    */
+  @GodotApiMember
   public open fun _fontRemoveLanguageSupportOverride(fontRid: RID, language: String): Unit {
   }
 
@@ -1119,6 +1238,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns list of language support overrides.
    */
+  @GodotApiMember
   public open fun _fontGetLanguageSupportOverrides(fontRid: RID): PackedStringArray {
     throw NotImplementedError("_font_get_language_support_overrides is not implemented for TextServerExtension")
   }
@@ -1127,6 +1247,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns `true`, if font supports given script (ISO 15924 code).
    */
+  @GodotApiMember
   public open fun _fontIsScriptSupported(fontRid: RID, script: String): Boolean {
     throw NotImplementedError("_font_is_script_supported is not implemented for TextServerExtension")
   }
@@ -1135,6 +1256,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Adds override for [_fontIsScriptSupported].
    */
+  @GodotApiMember
   public open fun _fontSetScriptSupportOverride(
     fontRid: RID,
     script: String,
@@ -1146,6 +1268,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns `true` if support override is enabled for the [script].
    */
+  @GodotApiMember
   public open fun _fontGetScriptSupportOverride(fontRid: RID, script: String): Boolean {
     throw NotImplementedError("_font_get_script_support_override is not implemented for TextServerExtension")
   }
@@ -1154,6 +1277,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Removes script support override.
    */
+  @GodotApiMember
   public open fun _fontRemoveScriptSupportOverride(fontRid: RID, script: String): Unit {
   }
 
@@ -1161,6 +1285,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns list of script support overrides.
    */
+  @GodotApiMember
   public open fun _fontGetScriptSupportOverrides(fontRid: RID): PackedStringArray {
     throw NotImplementedError("_font_get_script_support_overrides is not implemented for TextServerExtension")
   }
@@ -1169,6 +1294,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets font OpenType feature set override.
    */
+  @GodotApiMember
   public open fun _fontSetOpentypeFeatureOverrides(fontRid: RID, overrides: Dictionary<Any?, Any?>):
       Unit {
   }
@@ -1177,6 +1303,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns font OpenType feature set override.
    */
+  @GodotApiMember
   public open fun _fontGetOpentypeFeatureOverrides(fontRid: RID): Dictionary<Any?, Any?> {
     throw NotImplementedError("_font_get_opentype_feature_overrides is not implemented for TextServerExtension")
   }
@@ -1185,6 +1312,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns the dictionary of the supported OpenType features.
    */
+  @GodotApiMember
   public open fun _fontSupportedFeatureList(fontRid: RID): Dictionary<Any?, Any?> {
     throw NotImplementedError("_font_supported_feature_list is not implemented for TextServerExtension")
   }
@@ -1193,6 +1321,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns the dictionary of the supported OpenType variation coordinates.
    */
+  @GodotApiMember
   public open fun _fontSupportedVariationList(fontRid: RID): Dictionary<Any?, Any?> {
     throw NotImplementedError("_font_supported_variation_list is not implemented for TextServerExtension")
   }
@@ -1201,6 +1330,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns the font oversampling factor, shared by all fonts in the TextServer.
    */
+  @GodotApiMember
   public open fun _fontGetGlobalOversampling(): Double {
     throw NotImplementedError("_font_get_global_oversampling is not implemented for TextServerExtension")
   }
@@ -1209,6 +1339,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets oversampling factor, shared by all font in the TextServer.
    */
+  @GodotApiMember
   public open fun _fontSetGlobalOversampling(oversampling: Double): Unit {
   }
 
@@ -1217,6 +1348,7 @@ public open class TextServerExtension : TextServer() {
    * Returns size of the replacement character (box with character hexadecimal code that is drawn in
    * place of invalid characters).
    */
+  @GodotApiMember
   public open fun _getHexCodeBoxSize(size: Long, index: Long): Vector2 {
     throw NotImplementedError("_get_hex_code_box_size is not implemented for TextServerExtension")
   }
@@ -1225,6 +1357,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Draws box displaying character hexadecimal code.
    */
+  @GodotApiMember
   public open fun _drawHexCodeBox(
     canvas: RID,
     size: Long,
@@ -1238,6 +1371,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Creates a new buffer for complex text layout, with the given [direction] and [orientation].
    */
+  @GodotApiMember
   public open fun _createShapedText(direction: TextServer.Direction,
       orientation: TextServer.Orientation): RID {
     throw NotImplementedError("_create_shaped_text is not implemented for TextServerExtension")
@@ -1247,6 +1381,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Clears text buffer (removes text and inline objects).
    */
+  @GodotApiMember
   public open fun _shapedTextClear(shaped: RID): Unit {
   }
 
@@ -1255,6 +1390,7 @@ public open class TextServerExtension : TextServer() {
    * Sets desired text direction. If set to [TextServer.DIRECTION_AUTO], direction will be detected
    * based on the buffer contents and current locale.
    */
+  @GodotApiMember
   public open fun _shapedTextSetDirection(shaped: RID, direction: TextServer.Direction): Unit {
   }
 
@@ -1262,6 +1398,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns direction of the text.
    */
+  @GodotApiMember
   public open fun _shapedTextGetDirection(shaped: RID): TextServer.Direction {
     throw NotImplementedError("_shaped_text_get_direction is not implemented for TextServerExtension")
   }
@@ -1270,6 +1407,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns direction of the text, inferred by the BiDi algorithm.
    */
+  @GodotApiMember
   public open fun _shapedTextGetInferredDirection(shaped: RID): TextServer.Direction {
     throw NotImplementedError("_shaped_text_get_inferred_direction is not implemented for TextServerExtension")
   }
@@ -1278,6 +1416,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Overrides BiDi for the structured text.
    */
+  @GodotApiMember
   public open fun _shapedTextSetBidiOverride(shaped: RID, `override`: VariantArray<Any?>): Unit {
   }
 
@@ -1286,6 +1425,7 @@ public open class TextServerExtension : TextServer() {
    * Sets custom punctuation character list, used for word breaking. If set to empty string, server
    * defaults are used.
    */
+  @GodotApiMember
   public open fun _shapedTextSetCustomPunctuation(shaped: RID, punct: String): Unit {
   }
 
@@ -1294,6 +1434,7 @@ public open class TextServerExtension : TextServer() {
    * Returns custom punctuation character list, used for word breaking. If set to empty string,
    * server defaults are used.
    */
+  @GodotApiMember
   public open fun _shapedTextGetCustomPunctuation(shaped: RID): String {
     throw NotImplementedError("_shaped_text_get_custom_punctuation is not implemented for TextServerExtension")
   }
@@ -1302,6 +1443,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets ellipsis character used for text clipping.
    */
+  @GodotApiMember
   public open fun _shapedTextSetCustomEllipsis(shaped: RID, char: Long): Unit {
   }
 
@@ -1309,6 +1451,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns ellipsis character used for text clipping.
    */
+  @GodotApiMember
   public open fun _shapedTextGetCustomEllipsis(shaped: RID): Long {
     throw NotImplementedError("_shaped_text_get_custom_ellipsis is not implemented for TextServerExtension")
   }
@@ -1317,6 +1460,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets desired text orientation.
    */
+  @GodotApiMember
   public open fun _shapedTextSetOrientation(shaped: RID, orientation: TextServer.Orientation):
       Unit {
   }
@@ -1325,6 +1469,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns text orientation.
    */
+  @GodotApiMember
   public open fun _shapedTextGetOrientation(shaped: RID): TextServer.Orientation {
     throw NotImplementedError("_shaped_text_get_orientation is not implemented for TextServerExtension")
   }
@@ -1334,6 +1479,7 @@ public open class TextServerExtension : TextServer() {
    * If set to `true` text buffer will display invalid characters as hexadecimal codes, otherwise
    * nothing is displayed.
    */
+  @GodotApiMember
   public open fun _shapedTextSetPreserveInvalid(shaped: RID, enabled: Boolean): Unit {
   }
 
@@ -1342,6 +1488,7 @@ public open class TextServerExtension : TextServer() {
    * Returns `true` if text buffer is configured to display hexadecimal codes in place of invalid
    * characters.
    */
+  @GodotApiMember
   public open fun _shapedTextGetPreserveInvalid(shaped: RID): Boolean {
     throw NotImplementedError("_shaped_text_get_preserve_invalid is not implemented for TextServerExtension")
   }
@@ -1350,6 +1497,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * If set to `true` text buffer will display control characters.
    */
+  @GodotApiMember
   public open fun _shapedTextSetPreserveControl(shaped: RID, enabled: Boolean): Unit {
   }
 
@@ -1357,6 +1505,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns `true` if text buffer is configured to display control characters.
    */
+  @GodotApiMember
   public open fun _shapedTextGetPreserveControl(shaped: RID): Boolean {
     throw NotImplementedError("_shaped_text_get_preserve_control is not implemented for TextServerExtension")
   }
@@ -1365,6 +1514,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Sets extra spacing added between glyphs or lines in pixels.
    */
+  @GodotApiMember
   public open fun _shapedTextSetSpacing(
     shaped: RID,
     spacing: TextServer.SpacingType,
@@ -1376,6 +1526,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns extra spacing added between glyphs or lines in pixels.
    */
+  @GodotApiMember
   public open fun _shapedTextGetSpacing(shaped: RID, spacing: TextServer.SpacingType): Long {
     throw NotImplementedError("_shaped_text_get_spacing is not implemented for TextServerExtension")
   }
@@ -1384,6 +1535,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Adds text span and font to draw it to the text buffer.
    */
+  @GodotApiMember
   public open fun _shapedTextAddString(
     shaped: RID,
     text: String,
@@ -1401,6 +1553,7 @@ public open class TextServerExtension : TextServer() {
    * Adds inline object to the text buffer, [key] must be unique. In the text, object is represented
    * as [length] object replacement characters.
    */
+  @GodotApiMember
   public open fun _shapedTextAddObject(
     shaped: RID,
     key: Any?,
@@ -1416,6 +1569,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Sets new size and alignment of embedded object.
    */
+  @GodotApiMember
   public open fun _shapedTextResizeObject(
     shaped: RID,
     key: Any?,
@@ -1430,6 +1584,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns number of text spans added using [_shapedTextAddString] or [_shapedTextAddObject].
    */
+  @GodotApiMember
   public open fun _shapedGetSpanCount(shaped: RID): Long {
     throw NotImplementedError("_shaped_get_span_count is not implemented for TextServerExtension")
   }
@@ -1438,6 +1593,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns text span metadata.
    */
+  @GodotApiMember
   public open fun _shapedGetSpanMeta(shaped: RID, index: Long): Any? {
     throw NotImplementedError("_shaped_get_span_meta is not implemented for TextServerExtension")
   }
@@ -1446,6 +1602,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Changes text span font, font size, and OpenType features, without changing the text.
    */
+  @GodotApiMember
   public open fun _shapedSetSpanUpdateFont(
     shaped: RID,
     index: Long,
@@ -1460,6 +1617,7 @@ public open class TextServerExtension : TextServer() {
    * Returns text buffer for the substring of the text in the [shaped] text buffer (including inline
    * objects).
    */
+  @GodotApiMember
   public open fun _shapedTextSubstr(
     shaped: RID,
     start: Long,
@@ -1472,6 +1630,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns the parent buffer from which the substring originates.
    */
+  @GodotApiMember
   public open fun _shapedTextGetParent(shaped: RID): RID {
     throw NotImplementedError("_shaped_text_get_parent is not implemented for TextServerExtension")
   }
@@ -1480,6 +1639,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Adjusts text width to fit to specified width, returns new text width.
    */
+  @GodotApiMember
   public open fun _shapedTextFitToWidth(
     shaped: RID,
     width: Double,
@@ -1492,6 +1652,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Aligns shaped text to the given tab-stops.
    */
+  @GodotApiMember
   public open fun _shapedTextTabAlign(shaped: RID, tabStops: PackedFloat32Array): Double {
     throw NotImplementedError("_shaped_text_tab_align is not implemented for TextServerExtension")
   }
@@ -1500,6 +1661,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Shapes buffer if it's not shaped. Returns `true` if the string is shaped successfully.
    */
+  @GodotApiMember
   public open fun _shapedTextShape(shaped: RID): Boolean {
     throw NotImplementedError("_shaped_text_shape is not implemented for TextServerExtension")
   }
@@ -1509,6 +1671,7 @@ public open class TextServerExtension : TextServer() {
    * Updates break points in the shaped text. This method is called by default implementation of
    * text breaking functions.
    */
+  @GodotApiMember
   public open fun _shapedTextUpdateBreaks(shaped: RID): Boolean {
     throw NotImplementedError("_shaped_text_update_breaks is not implemented for TextServerExtension")
   }
@@ -1518,6 +1681,7 @@ public open class TextServerExtension : TextServer() {
    * Updates justification points in the shaped text. This method is called by default
    * implementation of text justification functions.
    */
+  @GodotApiMember
   public open fun _shapedTextUpdateJustificationOps(shaped: RID): Boolean {
     throw NotImplementedError("_shaped_text_update_justification_ops is not implemented for TextServerExtension")
   }
@@ -1526,6 +1690,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns `true` if buffer is successfully shaped.
    */
+  @GodotApiMember
   public open fun _shapedTextIsReady(shaped: RID): Boolean {
     throw NotImplementedError("_shaped_text_is_ready is not implemented for TextServerExtension")
   }
@@ -1534,6 +1699,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns number of glyphs in the buffer.
    */
+  @GodotApiMember
   public open fun _shapedTextGetGlyphCount(shaped: RID): Long {
     throw NotImplementedError("_shaped_text_get_glyph_count is not implemented for TextServerExtension")
   }
@@ -1542,6 +1708,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns substring buffer character range in the parent buffer.
    */
+  @GodotApiMember
   public open fun _shapedTextGetRange(shaped: RID): Vector2i {
     throw NotImplementedError("_shaped_text_get_range is not implemented for TextServerExtension")
   }
@@ -1550,6 +1717,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Breaks text to the lines and columns. Returns character ranges for each segment.
    */
+  @GodotApiMember
   public open fun _shapedTextGetLineBreaksAdv(
     shaped: RID,
     width: PackedFloat32Array,
@@ -1564,6 +1732,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Breaks text to the lines and returns character ranges for each line.
    */
+  @GodotApiMember
   public open fun _shapedTextGetLineBreaks(
     shaped: RID,
     width: Double,
@@ -1578,6 +1747,7 @@ public open class TextServerExtension : TextServer() {
    * Breaks text into words and returns array of character ranges. Use [graphemeFlags] to set what
    * characters are used for breaking (see [TextServer.GraphemeFlag]).
    */
+  @GodotApiMember
   public open fun _shapedTextGetWordBreaks(
     shaped: RID,
     graphemeFlags: TextServer.GraphemeFlag,
@@ -1590,6 +1760,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns the position of the overrun trim.
    */
+  @GodotApiMember
   public open fun _shapedTextGetTrimPos(shaped: RID): Long {
     throw NotImplementedError("_shaped_text_get_trim_pos is not implemented for TextServerExtension")
   }
@@ -1598,6 +1769,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns position of the ellipsis.
    */
+  @GodotApiMember
   public open fun _shapedTextGetEllipsisPos(shaped: RID): Long {
     throw NotImplementedError("_shaped_text_get_ellipsis_pos is not implemented for TextServerExtension")
   }
@@ -1606,6 +1778,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns number of glyphs in the ellipsis.
    */
+  @GodotApiMember
   public open fun _shapedTextGetEllipsisGlyphCount(shaped: RID): Long {
     throw NotImplementedError("_shaped_text_get_ellipsis_glyph_count is not implemented for TextServerExtension")
   }
@@ -1614,6 +1787,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Trims text if it exceeds the given width.
    */
+  @GodotApiMember
   public open fun _shapedTextOverrunTrimToWidth(
     shaped: RID,
     width: Double,
@@ -1625,6 +1799,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns array of inline objects.
    */
+  @GodotApiMember
   public open fun _shapedTextGetObjects(shaped: RID): VariantArray<Any?> {
     throw NotImplementedError("_shaped_text_get_objects is not implemented for TextServerExtension")
   }
@@ -1633,6 +1808,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns bounding rectangle of the inline object.
    */
+  @GodotApiMember
   public open fun _shapedTextGetObjectRect(shaped: RID, key: Any?): Rect2 {
     throw NotImplementedError("_shaped_text_get_object_rect is not implemented for TextServerExtension")
   }
@@ -1641,6 +1817,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns the character range of the inline object.
    */
+  @GodotApiMember
   public open fun _shapedTextGetObjectRange(shaped: RID, key: Any?): Vector2i {
     throw NotImplementedError("_shaped_text_get_object_range is not implemented for TextServerExtension")
   }
@@ -1649,6 +1826,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns the glyph index of the inline object.
    */
+  @GodotApiMember
   public open fun _shapedTextGetObjectGlyph(shaped: RID, key: Any?): Long {
     throw NotImplementedError("_shaped_text_get_object_glyph is not implemented for TextServerExtension")
   }
@@ -1657,6 +1835,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns size of the text.
    */
+  @GodotApiMember
   public open fun _shapedTextGetSize(shaped: RID): Vector2 {
     throw NotImplementedError("_shaped_text_get_size is not implemented for TextServerExtension")
   }
@@ -1666,6 +1845,7 @@ public open class TextServerExtension : TextServer() {
    * Returns the text ascent (number of pixels above the baseline for horizontal layout or to the
    * left of baseline for vertical).
    */
+  @GodotApiMember
   public open fun _shapedTextGetAscent(shaped: RID): Double {
     throw NotImplementedError("_shaped_text_get_ascent is not implemented for TextServerExtension")
   }
@@ -1675,6 +1855,7 @@ public open class TextServerExtension : TextServer() {
    * Returns the text descent (number of pixels below the baseline for horizontal layout or to the
    * right of baseline for vertical).
    */
+  @GodotApiMember
   public open fun _shapedTextGetDescent(shaped: RID): Double {
     throw NotImplementedError("_shaped_text_get_descent is not implemented for TextServerExtension")
   }
@@ -1683,6 +1864,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns width (for horizontal layout) or height (for vertical) of the text.
    */
+  @GodotApiMember
   public open fun _shapedTextGetWidth(shaped: RID): Double {
     throw NotImplementedError("_shaped_text_get_width is not implemented for TextServerExtension")
   }
@@ -1691,6 +1873,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns pixel offset of the underline below the baseline.
    */
+  @GodotApiMember
   public open fun _shapedTextGetUnderlinePosition(shaped: RID): Double {
     throw NotImplementedError("_shaped_text_get_underline_position is not implemented for TextServerExtension")
   }
@@ -1699,6 +1882,7 @@ public open class TextServerExtension : TextServer() {
    * **Required.**
    * Returns thickness of the underline.
    */
+  @GodotApiMember
   public open fun _shapedTextGetUnderlineThickness(shaped: RID): Double {
     throw NotImplementedError("_shaped_text_get_underline_thickness is not implemented for TextServerExtension")
   }
@@ -1707,6 +1891,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns dominant direction of in the range of text.
    */
+  @GodotApiMember
   public open fun _shapedTextGetDominantDirectionInRange(
     shaped: RID,
     start: Long,
@@ -1719,6 +1904,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns selection rectangles for the specified character range.
    */
+  @GodotApiMember
   public open fun _shapedTextGetSelection(
     shaped: RID,
     start: Long,
@@ -1731,6 +1917,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns grapheme index at the specified pixel offset at the baseline, or `-1` if none is found.
    */
+  @GodotApiMember
   public open fun _shapedTextHitTestGrapheme(shaped: RID, coord: Double): Long {
     throw NotImplementedError("_shaped_text_hit_test_grapheme is not implemented for TextServerExtension")
   }
@@ -1740,6 +1927,7 @@ public open class TextServerExtension : TextServer() {
    * Returns caret character offset at the specified pixel offset at the baseline. This function
    * always returns a valid position.
    */
+  @GodotApiMember
   public open fun _shapedTextHitTestPosition(shaped: RID, coord: Double): Long {
     throw NotImplementedError("_shaped_text_hit_test_position is not implemented for TextServerExtension")
   }
@@ -1750,6 +1938,7 @@ public open class TextServerExtension : TextServer() {
    * leftmost point of the baseline (for horizontal layout) or topmost point of the baseline (for
    * vertical layout).
    */
+  @GodotApiMember
   public open fun _shapedTextDraw(
     shaped: RID,
     canvas: RID,
@@ -1766,6 +1955,7 @@ public open class TextServerExtension : TextServer() {
    * specifies the leftmost point of the baseline (for horizontal layout) or topmost point of the
    * baseline (for vertical layout).
    */
+  @GodotApiMember
   public open fun _shapedTextDrawOutline(
     shaped: RID,
     canvas: RID,
@@ -1781,6 +1971,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns composite character's bounds as offsets from the start of the line.
    */
+  @GodotApiMember
   public open fun _shapedTextGetGraphemeBounds(shaped: RID, pos: Long): Vector2 {
     throw NotImplementedError("_shaped_text_get_grapheme_bounds is not implemented for TextServerExtension")
   }
@@ -1789,6 +1980,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns grapheme end position closest to the [pos].
    */
+  @GodotApiMember
   public open fun _shapedTextNextGraphemePos(shaped: RID, pos: Long): Long {
     throw NotImplementedError("_shaped_text_next_grapheme_pos is not implemented for TextServerExtension")
   }
@@ -1797,6 +1989,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns grapheme start position closest to the [pos].
    */
+  @GodotApiMember
   public open fun _shapedTextPrevGraphemePos(shaped: RID, pos: Long): Long {
     throw NotImplementedError("_shaped_text_prev_grapheme_pos is not implemented for TextServerExtension")
   }
@@ -1805,6 +1998,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns array of the composite character boundaries.
    */
+  @GodotApiMember
   public open fun _shapedTextGetCharacterBreaks(shaped: RID): PackedInt32Array {
     throw NotImplementedError("_shaped_text_get_character_breaks is not implemented for TextServerExtension")
   }
@@ -1813,6 +2007,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns composite character end position closest to the [pos].
    */
+  @GodotApiMember
   public open fun _shapedTextNextCharacterPos(shaped: RID, pos: Long): Long {
     throw NotImplementedError("_shaped_text_next_character_pos is not implemented for TextServerExtension")
   }
@@ -1821,6 +2016,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns composite character start position closest to the [pos].
    */
+  @GodotApiMember
   public open fun _shapedTextPrevCharacterPos(shaped: RID, pos: Long): Long {
     throw NotImplementedError("_shaped_text_prev_character_pos is not implemented for TextServerExtension")
   }
@@ -1829,6 +2025,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns composite character position closest to the [pos].
    */
+  @GodotApiMember
   public open fun _shapedTextClosestCharacterPos(shaped: RID, pos: Long): Long {
     throw NotImplementedError("_shaped_text_closest_character_pos is not implemented for TextServerExtension")
   }
@@ -1837,6 +2034,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Converts a number from the Western Arabic (0..9) to the numeral systems used in [language].
    */
+  @GodotApiMember
   public open fun _formatNumber(number: String, language: String): String {
     throw NotImplementedError("_format_number is not implemented for TextServerExtension")
   }
@@ -1845,6 +2043,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Converts [number] from the numeral systems used in [language] to Western Arabic (0..9).
    */
+  @GodotApiMember
   public open fun _parseNumber(number: String, language: String): String {
     throw NotImplementedError("_parse_number is not implemented for TextServerExtension")
   }
@@ -1853,6 +2052,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns percent sign used in the [language].
    */
+  @GodotApiMember
   public open fun _percentSign(language: String): String {
     throw NotImplementedError("_percent_sign is not implemented for TextServerExtension")
   }
@@ -1861,6 +2061,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Strips diacritics from the string.
    */
+  @GodotApiMember
   public open fun _stripDiacritics(string: String): String {
     throw NotImplementedError("_strip_diacritics is not implemented for TextServerExtension")
   }
@@ -1869,10 +2070,12 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns `true` if [string] is a valid identifier.
    */
+  @GodotApiMember
   public open fun _isValidIdentifier(string: String): Boolean {
     throw NotImplementedError("_is_valid_identifier is not implemented for TextServerExtension")
   }
 
+  @GodotApiMember
   public open fun _isValidLetter(unicode: Long): Boolean {
     throw NotImplementedError("_is_valid_letter is not implemented for TextServerExtension")
   }
@@ -1882,6 +2085,7 @@ public open class TextServerExtension : TextServer() {
    * Returns an array of the word break boundaries. Elements in the returned array are the offsets
    * of the start and end of words. Therefore the length of the array is always even.
    */
+  @GodotApiMember
   public open fun _stringGetWordBreaks(
     string: String,
     language: String,
@@ -1894,6 +2098,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns array of the composite character boundaries.
    */
+  @GodotApiMember
   public open fun _stringGetCharacterBreaks(string: String, language: String): PackedInt32Array {
     throw NotImplementedError("_string_get_character_breaks is not implemented for TextServerExtension")
   }
@@ -1903,6 +2108,7 @@ public open class TextServerExtension : TextServer() {
    * Returns index of the first string in [dict] which is visually confusable with the [string], or
    * `-1` if none is found.
    */
+  @GodotApiMember
   public open fun _isConfusable(string: String, dict: PackedStringArray): Long {
     throw NotImplementedError("_is_confusable is not implemented for TextServerExtension")
   }
@@ -1911,6 +2117,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns `true` if [string] is likely to be an attempt at confusing the reader.
    */
+  @GodotApiMember
   public open fun _spoofCheck(string: String): Boolean {
     throw NotImplementedError("_spoof_check is not implemented for TextServerExtension")
   }
@@ -1919,6 +2126,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns the string converted to uppercase.
    */
+  @GodotApiMember
   public open fun _stringToUpper(string: String, language: String): String {
     throw NotImplementedError("_string_to_upper is not implemented for TextServerExtension")
   }
@@ -1927,6 +2135,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns the string converted to lowercase.
    */
+  @GodotApiMember
   public open fun _stringToLower(string: String, language: String): String {
     throw NotImplementedError("_string_to_lower is not implemented for TextServerExtension")
   }
@@ -1935,6 +2144,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * Returns the string converted to title case.
    */
+  @GodotApiMember
   public open fun _stringToTitle(string: String, language: String): String {
     throw NotImplementedError("_string_to_title is not implemented for TextServerExtension")
   }
@@ -1944,6 +2154,7 @@ public open class TextServerExtension : TextServer() {
    * Default implementation of the BiDi algorithm override function. See
    * [TextServer.StructuredTextParser] for more info.
    */
+  @GodotApiMember
   public open fun _parseStructuredText(
     parserType: TextServer.StructuredTextParser,
     args: VariantArray<Any?>,
@@ -1956,6 +2167,7 @@ public open class TextServerExtension : TextServer() {
    * **Optional.**
    * This method is called before text server is unregistered.
    */
+  @GodotApiMember
   public open fun _cleanup(): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/TextServerManager.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/TextServerManager.kt
index 06ab155c04..d668909b5d 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/TextServerManager.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/TextServerManager.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -37,12 +38,14 @@ public object TextServerManager : Object() {
   /**
    * Emitted when a new interface has been added.
    */
+  @GodotApiMember
   @JvmStatic
   public val interfaceAdded: Signal1<StringName> by Signal1
 
   /**
    * Emitted when an interface is removed.
    */
+  @GodotApiMember
   @JvmStatic
   public val interfaceRemoved: Signal1<StringName> by Signal1
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Texture2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Texture2D.kt
index 30062e3727..8d58eefa0d 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Texture2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Texture2D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -47,6 +48,7 @@ public open class Texture2D : Texture() {
   /**
    * Called when the [Texture2D]'s width is queried.
    */
+  @GodotApiMember
   public open fun _getWidth(): Int {
     throw NotImplementedError("_get_width is not implemented for Texture2D")
   }
@@ -54,6 +56,7 @@ public open class Texture2D : Texture() {
   /**
    * Called when the [Texture2D]'s height is queried.
    */
+  @GodotApiMember
   public open fun _getHeight(): Int {
     throw NotImplementedError("_get_height is not implemented for Texture2D")
   }
@@ -62,6 +65,7 @@ public open class Texture2D : Texture() {
    * Called when a pixel's opaque state in the [Texture2D] is queried at the specified `(x, y)`
    * position.
    */
+  @GodotApiMember
   public open fun _isPixelOpaque(x: Int, y: Int): Boolean {
     throw NotImplementedError("_is_pixel_opaque is not implemented for Texture2D")
   }
@@ -69,6 +73,7 @@ public open class Texture2D : Texture() {
   /**
    * Called when the presence of an alpha channel in the [Texture2D] is queried.
    */
+  @GodotApiMember
   public open fun _hasAlpha(): Boolean {
     throw NotImplementedError("_has_alpha is not implemented for Texture2D")
   }
@@ -80,6 +85,7 @@ public open class Texture2D : Texture() {
    * row-major order (resulting in 90-degree clockwise rotation).
    * **Note:** This is only used in 2D rendering, not 3D.
    */
+  @GodotApiMember
   public open fun _draw(
     toCanvasItem: RID,
     pos: Vector2,
@@ -95,6 +101,7 @@ public open class Texture2D : Texture() {
    * 90-degree clockwise rotation).
    * **Note:** This is only used in 2D rendering, not 3D.
    */
+  @GodotApiMember
   public open fun _drawRect(
     toCanvasItem: RID,
     rect: Rect2,
@@ -111,6 +118,7 @@ public open class Texture2D : Texture() {
    * instead of row-major order (resulting in 90-degree clockwise rotation).
    * **Note:** This is only used in 2D rendering, not 3D.
    */
+  @GodotApiMember
   public open fun _drawRectRegion(
     toCanvasItem: RID,
     rect: Rect2,
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Texture3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Texture3D.kt
index 5f51da82da..d8f5aca2ad 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Texture3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Texture3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.TypeManager
@@ -39,6 +40,7 @@ public open class Texture3D : Texture() {
   /**
    * Called when the [Texture3D]'s format is queried.
    */
+  @GodotApiMember
   public open fun _getFormat(): Image.Format {
     throw NotImplementedError("_get_format is not implemented for Texture3D")
   }
@@ -46,6 +48,7 @@ public open class Texture3D : Texture() {
   /**
    * Called when the [Texture3D]'s width is queried.
    */
+  @GodotApiMember
   public open fun _getWidth(): Int {
     throw NotImplementedError("_get_width is not implemented for Texture3D")
   }
@@ -53,6 +56,7 @@ public open class Texture3D : Texture() {
   /**
    * Called when the [Texture3D]'s height is queried.
    */
+  @GodotApiMember
   public open fun _getHeight(): Int {
     throw NotImplementedError("_get_height is not implemented for Texture3D")
   }
@@ -60,6 +64,7 @@ public open class Texture3D : Texture() {
   /**
    * Called when the [Texture3D]'s depth is queried.
    */
+  @GodotApiMember
   public open fun _getDepth(): Int {
     throw NotImplementedError("_get_depth is not implemented for Texture3D")
   }
@@ -67,6 +72,7 @@ public open class Texture3D : Texture() {
   /**
    * Called when the presence of mipmaps in the [Texture3D] is queried.
    */
+  @GodotApiMember
   public open fun _hasMipmaps(): Boolean {
     throw NotImplementedError("_has_mipmaps is not implemented for Texture3D")
   }
@@ -74,6 +80,7 @@ public open class Texture3D : Texture() {
   /**
    * Called when the [Texture3D]'s data is queried.
    */
+  @GodotApiMember
   public open fun _getData(): VariantArray<Image> {
     throw NotImplementedError("_get_data is not implemented for Texture3D")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/TextureLayered.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/TextureLayered.kt
index ab78908aff..77c73e2ac2 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/TextureLayered.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/TextureLayered.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.TypeManager
@@ -38,6 +39,7 @@ public open class TextureLayered : Texture() {
   /**
    * Called when the [TextureLayered]'s format is queried.
    */
+  @GodotApiMember
   public open fun _getFormat(): Image.Format {
     throw NotImplementedError("_get_format is not implemented for TextureLayered")
   }
@@ -45,6 +47,7 @@ public open class TextureLayered : Texture() {
   /**
    * Called when the layers' type in the [TextureLayered] is queried.
    */
+  @GodotApiMember
   public open fun _getLayeredType(): Long {
     throw NotImplementedError("_get_layered_type is not implemented for TextureLayered")
   }
@@ -52,6 +55,7 @@ public open class TextureLayered : Texture() {
   /**
    * Called when the [TextureLayered]'s width queried.
    */
+  @GodotApiMember
   public open fun _getWidth(): Int {
     throw NotImplementedError("_get_width is not implemented for TextureLayered")
   }
@@ -59,6 +63,7 @@ public open class TextureLayered : Texture() {
   /**
    * Called when the [TextureLayered]'s height is queried.
    */
+  @GodotApiMember
   public open fun _getHeight(): Int {
     throw NotImplementedError("_get_height is not implemented for TextureLayered")
   }
@@ -66,6 +71,7 @@ public open class TextureLayered : Texture() {
   /**
    * Called when the number of layers in the [TextureLayered] is queried.
    */
+  @GodotApiMember
   public open fun _getLayers(): Int {
     throw NotImplementedError("_get_layers is not implemented for TextureLayered")
   }
@@ -73,6 +79,7 @@ public open class TextureLayered : Texture() {
   /**
    * Called when the presence of mipmaps in the [TextureLayered] is queried.
    */
+  @GodotApiMember
   public open fun _hasMipmaps(): Boolean {
     throw NotImplementedError("_has_mipmaps is not implemented for TextureLayered")
   }
@@ -80,6 +87,7 @@ public open class TextureLayered : Texture() {
   /**
    * Called when the data for a layer in the [TextureLayered] is queried.
    */
+  @GodotApiMember
   public open fun _getLayerData(layerIndex: Int): Image? {
     throw NotImplementedError("_get_layer_data is not implemented for TextureLayered")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/ThemeDB.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/ThemeDB.kt
index bbbd42f0c4..f80d8fabf6 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/ThemeDB.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/ThemeDB.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -35,6 +36,7 @@ public object ThemeDB : Object() {
    * Emitted when one of the fallback values had been changed. Use it to refresh the look of
    * controls that may rely on the fallback theme items.
    */
+  @GodotApiMember
   @JvmStatic
   public val fallbackChanged: Signal0 by Signal0
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/TileData.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/TileData.kt
index bd76c1dd4c..a1c3a46947 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/TileData.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/TileData.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -49,6 +50,7 @@ public open class TileData : Object() {
   /**
    * Emitted when any of the properties are changed.
    */
+  @GodotApiMember
   public val changed: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/TileMap.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/TileMap.kt
index 3fa028a38b..624ac5dfd1 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/TileMap.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/TileMap.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -52,6 +53,7 @@ public open class TileMap : Node2D() {
   /**
    * Emitted when the [TileSet] of this TileMap changes.
    */
+  @GodotApiMember
   public val changed: Signal0 by Signal0
 
   /**
@@ -134,6 +136,7 @@ public open class TileMap : Node2D() {
    * **Note:** If the result of this function should changed, use [notifyRuntimeTileDataUpdate] to
    * notify the TileMap it needs an update.
    */
+  @GodotApiMember
   public open fun _useTileDataRuntimeUpdate(layer: Int, coords: Vector2i): Boolean {
     throw NotImplementedError("_use_tile_data_runtime_update is not implemented for TileMap")
   }
@@ -148,6 +151,7 @@ public open class TileMap : Node2D() {
    * **Note:** If the properties of [tileData] object should change over time, use
    * [notifyRuntimeTileDataUpdate] to notify the TileMap it needs an update.
    */
+  @GodotApiMember
   public open fun _tileDataRuntimeUpdate(
     layer: Int,
     coords: Vector2i,
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/TileMapLayer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/TileMapLayer.kt
index 9cab5dfd01..558afd6617 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/TileMapLayer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/TileMapLayer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedByteArray
@@ -55,6 +56,7 @@ public open class TileMapLayer : Node2D() {
    * executing complex processing in a connected function, and consider delaying it to the end of the
    * frame instead (i.e. calling [Object.callDeferred]).
    */
+  @GodotApiMember
   public val changed: Signal0 by Signal0
 
   /**
@@ -203,6 +205,7 @@ public open class TileMapLayer : Node2D() {
    * **Note:** If the result of this function should change, use [notifyRuntimeTileDataUpdate] to
    * notify the [TileMapLayer] it needs an update.
    */
+  @GodotApiMember
   public open fun _useTileDataRuntimeUpdate(coords: Vector2i): Boolean {
     throw NotImplementedError("_use_tile_data_runtime_update is not implemented for TileMapLayer")
   }
@@ -217,6 +220,7 @@ public open class TileMapLayer : Node2D() {
    * **Note:** If the properties of [tileData] object should change over time, use
    * [notifyRuntimeTileDataUpdate] to notify the [TileMapLayer] it needs an update.
    */
+  @GodotApiMember
   public open fun _tileDataRuntimeUpdate(coords: Vector2i, tileData: TileData?): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Timer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Timer.kt
index d87a53dffd..175aeb7788 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Timer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Timer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -44,6 +45,7 @@ public open class Timer : Node() {
   /**
    * Emitted when the timer reaches the end.
    */
+  @GodotApiMember
   public val timeout: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/TouchScreenButton.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/TouchScreenButton.kt
index 5bf883f7d8..a2cc95f203 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/TouchScreenButton.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/TouchScreenButton.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -40,11 +41,13 @@ public open class TouchScreenButton : Node2D() {
   /**
    * Emitted when the button is pressed (down).
    */
+  @GodotApiMember
   public val pressed: Signal0 by Signal0
 
   /**
    * Emitted when the button is released (up).
    */
+  @GodotApiMember
   public val released: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Translation.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Translation.kt
index cc00a66251..bd3355c4f7 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Translation.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Translation.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedStringArray
@@ -51,6 +52,7 @@ public open class Translation : Resource() {
   /**
    * Virtual method to override [getPluralMessage].
    */
+  @GodotApiMember
   public open fun _getPluralMessage(
     srcMessage: StringName,
     srcPluralMessage: StringName,
@@ -63,6 +65,7 @@ public open class Translation : Resource() {
   /**
    * Virtual method to override [getMessage].
    */
+  @GodotApiMember
   public open fun _getMessage(srcMessage: StringName, context: StringName): StringName {
     throw NotImplementedError("_get_message is not implemented for Translation")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Tree.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Tree.kt
index f47baca6b1..17ccbaf33f 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Tree.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Tree.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Rect2
@@ -83,47 +84,56 @@ public open class Tree : Control() {
   /**
    * Emitted when an item is selected.
    */
+  @GodotApiMember
   public val itemSelected: Signal0 by Signal0
 
   /**
    * Emitted when a cell is selected.
    */
+  @GodotApiMember
   public val cellSelected: Signal0 by Signal0
 
   /**
    * Emitted instead of [signal item_selected] if [selectMode] is set to [SELECT_MULTI].
    */
+  @GodotApiMember
   public val multiSelected: Signal3<TreeItem, Long, Boolean> by Signal3
 
   /**
    * Emitted when an item is selected with a mouse button.
    */
+  @GodotApiMember
   public val itemMouseSelected: Signal2<Vector2, Long> by Signal2
 
   /**
    * Emitted when a mouse button is clicked in the empty space of the tree.
    */
+  @GodotApiMember
   public val emptyClicked: Signal2<Vector2, Long> by Signal2
 
   /**
    * Emitted when an item is edited.
    */
+  @GodotApiMember
   public val itemEdited: Signal0 by Signal0
 
   /**
    * Emitted when an item with [TreeItem.CELL_MODE_CUSTOM] is clicked with a mouse button.
    */
+  @GodotApiMember
   public val customItemClicked: Signal1<Long> by Signal1
 
   /**
    * Emitted when an item's icon is double-clicked. For a signal that emits when any part of the
    * item is double-clicked, see [signal item_activated].
    */
+  @GodotApiMember
   public val itemIconDoubleClicked: Signal0 by Signal0
 
   /**
    * Emitted when an item is collapsed by a click on the folding arrow.
    */
+  @GodotApiMember
   public val itemCollapsed: Signal1<TreeItem> by Signal1
 
   /**
@@ -132,33 +142,39 @@ public open class Tree : Control() {
    * will be processed is as follows: the item that invoked the method, children of that item, and
    * finally parents of that item.
    */
+  @GodotApiMember
   public val checkPropagatedToItem: Signal2<TreeItem, Long> by Signal2
 
   /**
    * Emitted when a button on the tree was pressed (see [TreeItem.addButton]).
    */
+  @GodotApiMember
   public val buttonClicked: Signal4<TreeItem, Long, Long, Long> by Signal4
 
   /**
    * Emitted when a cell with the [TreeItem.CELL_MODE_CUSTOM] is clicked to be edited.
    */
+  @GodotApiMember
   public val customPopupEdited: Signal1<Boolean> by Signal1
 
   /**
    * Emitted when an item is double-clicked, or selected with a `ui_accept` input event (e.g. using
    * [kbd]Enter[/kbd] or [kbd]Space[/kbd] on the keyboard).
    */
+  @GodotApiMember
   public val itemActivated: Signal0 by Signal0
 
   /**
    * Emitted when a column's title is clicked with either [MOUSE_BUTTON_LEFT] or
    * [MOUSE_BUTTON_RIGHT].
    */
+  @GodotApiMember
   public val columnTitleClicked: Signal2<Long, Long> by Signal2
 
   /**
    * Emitted when a left mouse button click does not select any item.
    */
+  @GodotApiMember
   public val nothingSelected: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Tween.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Tween.kt
index 4cc63de6da..9ea157ffda 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Tween.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Tween.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Callable
@@ -167,18 +168,21 @@ public open class Tween : RefCounted() {
    * Emitted when one step of the [Tween] is complete, providing the step index. One step is either
    * a single [Tweener] or a group of [Tweener]s running in parallel.
    */
+  @GodotApiMember
   public val stepFinished: Signal1<Long> by Signal1
 
   /**
    * Emitted when a full loop is complete (see [setLoops]), providing the loop index. This signal is
    * not emitted after the final loop, use [signal finished] instead for this case.
    */
+  @GodotApiMember
   public val loopFinished: Signal1<Long> by Signal1
 
   /**
    * Emitted when the [Tween] has finished all tweening. Never emitted when the [Tween] is set to
    * infinite looping (see [setLoops]).
    */
+  @GodotApiMember
   public val finished: Signal0 by Signal0
 
   public override fun new(scriptIndex: Int): Unit {
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Tweener.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Tweener.kt
index 8367a47cf4..4b875df748 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Tweener.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Tweener.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.Signal0
 import kotlin.Int
@@ -22,6 +23,7 @@ public open class Tweener internal constructor() : RefCounted() {
   /**
    * Emitted when the [Tweener] has just finished its job.
    */
+  @GodotApiMember
   public val finished: Signal0 by Signal0
 
   public override fun new(scriptIndex: Int): Unit {
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/UndoRedo.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/UndoRedo.kt
index 95fd593d75..f9c146abae 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/UndoRedo.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/UndoRedo.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Callable
@@ -135,6 +136,7 @@ public open class UndoRedo : Object() {
   /**
    * Called when [undo] or [redo] was called.
    */
+  @GodotApiMember
   public val versionChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStream.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStream.kt
index d92973b3c8..10098bf0b8 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStream.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStream.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.TypeManager
@@ -46,6 +47,7 @@ public open class VideoStream : Resource() {
    * Called when the video starts playing, to initialize and return a subclass of
    * [VideoStreamPlayback].
    */
+  @GodotApiMember
   public open fun _instantiatePlayback(): VideoStreamPlayback? {
     throw NotImplementedError("_instantiate_playback is not implemented for VideoStream")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStreamPlayback.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStreamPlayback.kt
index 614a1a7eaa..987c260560 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStreamPlayback.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStreamPlayback.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedFloat32Array
@@ -36,6 +37,7 @@ public open class VideoStreamPlayback : Resource() {
    * Stops playback. May be called multiple times before [_play], or in response to
    * [VideoStreamPlayer.stop]. [_isPlaying] should return false once stopped.
    */
+  @GodotApiMember
   public open fun _stop(): Unit {
   }
 
@@ -44,12 +46,14 @@ public open class VideoStreamPlayback : Resource() {
    * manual playback may also invoke [_stop] multiple times before this method is called. [_isPlaying]
    * should return true once playing.
    */
+  @GodotApiMember
   public open fun _play(): Unit {
   }
 
   /**
    * Returns the playback state, as determined by calls to [_play] and [_stop].
    */
+  @GodotApiMember
   public open fun _isPlaying(): Boolean {
     throw NotImplementedError("_is_playing is not implemented for VideoStreamPlayback")
   }
@@ -58,12 +62,14 @@ public open class VideoStreamPlayback : Resource() {
    * Set the paused status of video playback. [_isPaused] must return [paused]. Called in response
    * to the [VideoStreamPlayer.paused] setter.
    */
+  @GodotApiMember
   public open fun _setPaused(paused: Boolean): Unit {
   }
 
   /**
    * Returns the paused status, as set by [_setPaused].
    */
+  @GodotApiMember
   public open fun _isPaused(): Boolean {
     throw NotImplementedError("_is_paused is not implemented for VideoStreamPlayback")
   }
@@ -71,6 +77,7 @@ public open class VideoStreamPlayback : Resource() {
   /**
    * Returns the video duration in seconds, if known, or 0 if unknown.
    */
+  @GodotApiMember
   public open fun _getLength(): Double {
     throw NotImplementedError("_get_length is not implemented for VideoStreamPlayback")
   }
@@ -79,6 +86,7 @@ public open class VideoStreamPlayback : Resource() {
    * Return the current playback timestamp. Called in response to the
    * [VideoStreamPlayer.streamPosition] getter.
    */
+  @GodotApiMember
   public open fun _getPlaybackPosition(): Double {
     throw NotImplementedError("_get_playback_position is not implemented for VideoStreamPlayback")
   }
@@ -86,6 +94,7 @@ public open class VideoStreamPlayback : Resource() {
   /**
    * Seeks to [time] seconds. Called in response to the [VideoStreamPlayer.streamPosition] setter.
    */
+  @GodotApiMember
   public open fun _seek(time: Double): Unit {
   }
 
@@ -93,12 +102,14 @@ public open class VideoStreamPlayback : Resource() {
    * Select the audio track [idx]. Called when playback starts, and in response to the
    * [VideoStreamPlayer.audioTrack] setter.
    */
+  @GodotApiMember
   public open fun _setAudioTrack(idx: Int): Unit {
   }
 
   /**
    * Allocates a [Texture2D] in which decoded video frames will be drawn.
    */
+  @GodotApiMember
   public open fun _getTexture(): Texture2D? {
     throw NotImplementedError("_get_texture is not implemented for VideoStreamPlayback")
   }
@@ -107,12 +118,14 @@ public open class VideoStreamPlayback : Resource() {
    * Ticks video playback for [delta] seconds. Called every frame as long as [_isPaused] and
    * [_isPlaying] return true.
    */
+  @GodotApiMember
   public open fun _update(delta: Double): Unit {
   }
 
   /**
    * Returns the number of audio channels.
    */
+  @GodotApiMember
   public open fun _getChannels(): Int {
     throw NotImplementedError("_get_channels is not implemented for VideoStreamPlayback")
   }
@@ -120,6 +133,7 @@ public open class VideoStreamPlayback : Resource() {
   /**
    * Returns the audio sample rate used for mixing.
    */
+  @GodotApiMember
   public open fun _getMixRate(): Int {
     throw NotImplementedError("_get_mix_rate is not implemented for VideoStreamPlayback")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStreamPlayer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStreamPlayer.kt
index 5c57bf84b7..cf66c19e66 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStreamPlayer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/VideoStreamPlayer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -41,6 +42,7 @@ public open class VideoStreamPlayer : Control() {
   /**
    * Emitted when playback is finished.
    */
+  @GodotApiMember
   public val finished: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Viewport.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Viewport.kt
index 232234526b..b8fbd6187a 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Viewport.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Viewport.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.RID
@@ -60,12 +61,14 @@ public open class Viewport internal constructor() : Node() {
    * Emitted when the size of the viewport is changed, whether by resizing of window, or some other
    * means.
    */
+  @GodotApiMember
   public val sizeChanged: Signal0 by Signal0
 
   /**
    * Emitted when a Control node grabs keyboard focus.
    * **Note:** A Control node losing focus doesn't cause this signal to be emitted.
    */
+  @GodotApiMember
   public val guiFocusChanged: Signal1<Control> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/VisibleOnScreenNotifier2D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/VisibleOnScreenNotifier2D.kt
index ba3a8ead7e..8fff799500 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/VisibleOnScreenNotifier2D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/VisibleOnScreenNotifier2D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Rect2
@@ -37,11 +38,13 @@ public open class VisibleOnScreenNotifier2D : Node2D() {
   /**
    * Emitted when the VisibleOnScreenNotifier2D enters the screen.
    */
+  @GodotApiMember
   public val screenEntered: Signal0 by Signal0
 
   /**
    * Emitted when the VisibleOnScreenNotifier2D exits the screen.
    */
+  @GodotApiMember
   public val screenExited: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/VisibleOnScreenNotifier3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/VisibleOnScreenNotifier3D.kt
index fd63a9c630..3507c9ac19 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/VisibleOnScreenNotifier3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/VisibleOnScreenNotifier3D.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.AABB
@@ -38,11 +39,13 @@ public open class VisibleOnScreenNotifier3D : VisualInstance3D() {
   /**
    * Emitted when the [VisibleOnScreenNotifier3D] enters the screen.
    */
+  @GodotApiMember
   public val screenEntered: Signal0 by Signal0
 
   /**
    * Emitted when the [VisibleOnScreenNotifier3D] exits the screen.
    */
+  @GodotApiMember
   public val screenExited: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualInstance3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualInstance3D.kt
index 95d875be65..4f450c0595 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualInstance3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualInstance3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.AABB
@@ -93,6 +94,7 @@ public open class VisualInstance3D : Node3D() {
     callConstructor(ENGINECLASS_VISUALINSTANCE3D, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _getAabb(): AABB {
     throw NotImplementedError("_get_aabb is not implemented for VisualInstance3D")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualShaderNodeCustom.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualShaderNodeCustom.kt
index 39de8b8cda..ce1529e81f 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualShaderNodeCustom.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualShaderNodeCustom.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.PackedStringArray
@@ -46,6 +47,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Defining this method is **optional**, but recommended. If not overridden, the node will be
    * named as "Unnamed".
    */
+  @GodotApiMember
   public open fun _getName(): String {
     throw NotImplementedError("_get_name is not implemented for VisualShaderNodeCustom")
   }
@@ -55,6 +57,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Shader Editor's members dialog.
    * Defining this method is **optional**.
    */
+  @GodotApiMember
   public open fun _getDescription(): String {
     throw NotImplementedError("_get_description is not implemented for VisualShaderNodeCustom")
   }
@@ -65,6 +68,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Defining this method is **optional**. If not overridden, the node will be filed under the
    * "Addons" category.
    */
+  @GodotApiMember
   public open fun _getCategory(): String {
     throw NotImplementedError("_get_category is not implemented for VisualShaderNodeCustom")
   }
@@ -74,6 +78,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Shader Editor's members dialog.
    * Defining this method is **optional**. If not overridden, no return icon is shown.
    */
+  @GodotApiMember
   public open fun _getReturnIconType(): VisualShaderNode.PortType {
     throw NotImplementedError("_get_return_icon_type is not implemented for VisualShaderNodeCustom")
   }
@@ -82,6 +87,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Override this method to define the number of input ports of the associated custom node.
    * Defining this method is **required**. If not overridden, the node has no input ports.
    */
+  @GodotApiMember
   public open fun _getInputPortCount(): Int {
     throw NotImplementedError("_get_input_port_count is not implemented for VisualShaderNodeCustom")
   }
@@ -92,6 +98,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Defining this method is **optional**, but recommended. If not overridden, input ports will
    * return the [VisualShaderNode.PORT_TYPE_SCALAR] type.
    */
+  @GodotApiMember
   public open fun _getInputPortType(port: Int): VisualShaderNode.PortType {
     throw NotImplementedError("_get_input_port_type is not implemented for VisualShaderNodeCustom")
   }
@@ -103,6 +110,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Defining this method is **optional**, but recommended. If not overridden, input ports are named
    * as `"in" + str(port)`.
    */
+  @GodotApiMember
   public open fun _getInputPortName(port: Int): String {
     throw NotImplementedError("_get_input_port_name is not implemented for VisualShaderNodeCustom")
   }
@@ -113,6 +121,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Defining this method is **required**. If not overridden, the node has no default values for
    * their input ports.
    */
+  @GodotApiMember
   public open fun _getInputPortDefaultValue(port: Int): Any? {
     throw NotImplementedError("_get_input_port_default_value is not implemented for VisualShaderNodeCustom")
   }
@@ -124,6 +133,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Defining this method is **optional**. If not overridden, the connection will be created to the
    * first valid port.
    */
+  @GodotApiMember
   public open fun _getDefaultInputPort(type: VisualShaderNode.PortType): Int {
     throw NotImplementedError("_get_default_input_port is not implemented for VisualShaderNodeCustom")
   }
@@ -132,6 +142,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Override this method to define the number of output ports of the associated custom node.
    * Defining this method is **required**. If not overridden, the node has no output ports.
    */
+  @GodotApiMember
   public open fun _getOutputPortCount(): Int {
     throw NotImplementedError("_get_output_port_count is not implemented for VisualShaderNodeCustom")
   }
@@ -142,6 +153,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Defining this method is **optional**, but recommended. If not overridden, output ports will
    * return the [VisualShaderNode.PORT_TYPE_SCALAR] type.
    */
+  @GodotApiMember
   public open fun _getOutputPortType(port: Int): VisualShaderNode.PortType {
     throw NotImplementedError("_get_output_port_type is not implemented for VisualShaderNodeCustom")
   }
@@ -153,6 +165,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Defining this method is **optional**, but recommended. If not overridden, output ports are
    * named as `"out" + str(port)`.
    */
+  @GodotApiMember
   public open fun _getOutputPortName(port: Int): String {
     throw NotImplementedError("_get_output_port_name is not implemented for VisualShaderNodeCustom")
   }
@@ -161,6 +174,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Override this method to define the number of the properties.
    * Defining this method is **optional**.
    */
+  @GodotApiMember
   public open fun _getPropertyCount(): Int {
     throw NotImplementedError("_get_property_count is not implemented for VisualShaderNodeCustom")
   }
@@ -169,6 +183,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Override this method to define the names of the property of the associated custom node.
    * Defining this method is **optional**.
    */
+  @GodotApiMember
   public open fun _getPropertyName(index: Int): String {
     throw NotImplementedError("_get_property_name is not implemented for VisualShaderNodeCustom")
   }
@@ -177,6 +192,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Override this method to define the default index of the property of the associated custom node.
    * Defining this method is **optional**.
    */
+  @GodotApiMember
   public open fun _getPropertyDefaultIndex(index: Int): Int {
     throw NotImplementedError("_get_property_default_index is not implemented for VisualShaderNodeCustom")
   }
@@ -186,6 +202,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * custom node.
    * Defining this method is **optional**.
    */
+  @GodotApiMember
   public open fun _getPropertyOptions(index: Int): PackedStringArray {
     throw NotImplementedError("_get_property_options is not implemented for VisualShaderNodeCustom")
   }
@@ -202,6 +219,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * [type] (see [VisualShader.Type]).
    * Defining this method is **required**.
    */
+  @GodotApiMember
   public open fun _getCode(
     inputVars: VariantArray<String>,
     outputVars: VariantArray<String>,
@@ -221,6 +239,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * [type] (see [VisualShader.Type]).
    * Defining this method is **optional**.
    */
+  @GodotApiMember
   public open fun _getFuncCode(mode: Shader.Mode, type: VisualShader.Type): String {
     throw NotImplementedError("_get_func_code is not implemented for VisualShaderNodeCustom")
   }
@@ -235,6 +254,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * You can customize the generated code based on the shader [mode] (see [Shader.Mode]).
    * Defining this method is **optional**.
    */
+  @GodotApiMember
   public open fun _getGlobalCode(mode: Shader.Mode): String {
     throw NotImplementedError("_get_global_code is not implemented for VisualShaderNodeCustom")
   }
@@ -243,6 +263,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * Override this method to enable high-end mark in the Visual Shader Editor's members dialog.
    * Defining this method is **optional**. If not overridden, it's `false`.
    */
+  @GodotApiMember
   public open fun _isHighend(): Boolean {
     throw NotImplementedError("_is_highend is not implemented for VisualShaderNodeCustom")
   }
@@ -252,6 +273,7 @@ public open class VisualShaderNodeCustom : VisualShaderNode() {
    * [mode] (see [Shader.Mode]) and/or [type] (see [VisualShader.Type]).
    * Defining this method is **optional**. If not overridden, it's `true`.
    */
+  @GodotApiMember
   public open fun _isAvailable(mode: Shader.Mode, type: VisualShader.Type): Boolean {
     throw NotImplementedError("_is_available is not implemented for VisualShaderNodeCustom")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualShaderNodeInput.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualShaderNodeInput.kt
index b49b66af8d..884ff646fa 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualShaderNodeInput.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/VisualShaderNodeInput.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -28,6 +29,7 @@ public open class VisualShaderNodeInput : VisualShaderNode() {
   /**
    * Emitted when input is changed via [inputName].
    */
+  @GodotApiMember
   public val inputTypeChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCDataChannelExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCDataChannelExtension.kt
index 07b1d937f1..4bf0c56afb 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCDataChannelExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCDataChannelExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import kotlin.Boolean
 import kotlin.Int
@@ -20,64 +21,80 @@ public open class WebRTCDataChannelExtension : WebRTCDataChannel() {
     callConstructor(ENGINECLASS_WEBRTCDATACHANNELEXTENSION, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _getAvailablePacketCount(): Int {
     throw NotImplementedError("_get_available_packet_count is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _getMaxPacketSize(): Int {
     throw NotImplementedError("_get_max_packet_size is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _poll(): Error {
     throw NotImplementedError("_poll is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _close(): Unit {
   }
 
+  @GodotApiMember
   public open fun _setWriteMode(pWriteMode: WebRTCDataChannel.WriteMode): Unit {
   }
 
+  @GodotApiMember
   public open fun _getWriteMode(): WebRTCDataChannel.WriteMode {
     throw NotImplementedError("_get_write_mode is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _wasStringPacket(): Boolean {
     throw NotImplementedError("_was_string_packet is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _getReadyState(): WebRTCDataChannel.ChannelState {
     throw NotImplementedError("_get_ready_state is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _getLabel(): String {
     throw NotImplementedError("_get_label is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _isOrdered(): Boolean {
     throw NotImplementedError("_is_ordered is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _getId(): Int {
     throw NotImplementedError("_get_id is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _getMaxPacketLifeTime(): Int {
     throw NotImplementedError("_get_max_packet_life_time is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _getMaxRetransmits(): Int {
     throw NotImplementedError("_get_max_retransmits is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _getProtocol(): String {
     throw NotImplementedError("_get_protocol is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _isNegotiated(): Boolean {
     throw NotImplementedError("_is_negotiated is not implemented for WebRTCDataChannelExtension")
   }
 
+  @GodotApiMember
   public open fun _getBufferedAmount(): Int {
     throw NotImplementedError("_get_buffered_amount is not implemented for WebRTCDataChannelExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCPeerConnection.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCPeerConnection.kt
index 0c4f70c440..cea79589bb 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCPeerConnection.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCPeerConnection.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -48,12 +49,14 @@ public open class WebRTCPeerConnection : RefCounted() {
    * an answer). The parameters are meant to be passed to [setLocalDescription] on this object, and
    * sent to the remote peer over the signaling server.
    */
+  @GodotApiMember
   public val sessionDescriptionCreated: Signal2<String, String> by Signal2
 
   /**
    * Emitted when a new ICE candidate has been created. The three parameters are meant to be passed
    * to the remote peer over the signaling server.
    */
+  @GodotApiMember
   public val iceCandidateCreated: Signal3<String, Long, String> by Signal3
 
   /**
@@ -62,6 +65,7 @@ public open class WebRTCPeerConnection : RefCounted() {
    * The object will be an instance of [WebRTCDataChannel]. You must keep a reference of it or it
    * will be closed automatically. See [createDataChannel].
    */
+  @GodotApiMember
   public val dataChannelReceived: Signal1<WebRTCDataChannel> by Signal1
 
   public override fun new(scriptIndex: Int): Unit {
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCPeerConnectionExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCPeerConnectionExtension.kt
index e8990bc5e2..1d98f0a050 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCPeerConnectionExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/WebRTCPeerConnectionExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.core.Dictionary
 import kotlin.Any
@@ -21,39 +22,48 @@ public open class WebRTCPeerConnectionExtension : WebRTCPeerConnection() {
     callConstructor(ENGINECLASS_WEBRTCPEERCONNECTIONEXTENSION, scriptIndex)
   }
 
+  @GodotApiMember
   public open fun _getConnectionState(): WebRTCPeerConnection.ConnectionState {
     throw NotImplementedError("_get_connection_state is not implemented for WebRTCPeerConnectionExtension")
   }
 
+  @GodotApiMember
   public open fun _getGatheringState(): WebRTCPeerConnection.GatheringState {
     throw NotImplementedError("_get_gathering_state is not implemented for WebRTCPeerConnectionExtension")
   }
 
+  @GodotApiMember
   public open fun _getSignalingState(): WebRTCPeerConnection.SignalingState {
     throw NotImplementedError("_get_signaling_state is not implemented for WebRTCPeerConnectionExtension")
   }
 
+  @GodotApiMember
   public open fun _initialize(pConfig: Dictionary<Any?, Any?>): Error {
     throw NotImplementedError("_initialize is not implemented for WebRTCPeerConnectionExtension")
   }
 
+  @GodotApiMember
   public open fun _createDataChannel(pLabel: String, pConfig: Dictionary<Any?, Any?>):
       WebRTCDataChannel? {
     throw NotImplementedError("_create_data_channel is not implemented for WebRTCPeerConnectionExtension")
   }
 
+  @GodotApiMember
   public open fun _createOffer(): Error {
     throw NotImplementedError("_create_offer is not implemented for WebRTCPeerConnectionExtension")
   }
 
+  @GodotApiMember
   public open fun _setRemoteDescription(pType: String, pSdp: String): Error {
     throw NotImplementedError("_set_remote_description is not implemented for WebRTCPeerConnectionExtension")
   }
 
+  @GodotApiMember
   public open fun _setLocalDescription(pType: String, pSdp: String): Error {
     throw NotImplementedError("_set_local_description is not implemented for WebRTCPeerConnectionExtension")
   }
 
+  @GodotApiMember
   public open fun _addIceCandidate(
     pSdpMidName: String,
     pSdpMlineIndex: Int,
@@ -62,10 +72,12 @@ public open class WebRTCPeerConnectionExtension : WebRTCPeerConnection() {
     throw NotImplementedError("_add_ice_candidate is not implemented for WebRTCPeerConnectionExtension")
   }
 
+  @GodotApiMember
   public open fun _poll(): Error {
     throw NotImplementedError("_poll is not implemented for WebRTCPeerConnectionExtension")
   }
 
+  @GodotApiMember
   public open fun _close(): Unit {
   }
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/WebXRInterface.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/WebXRInterface.kt
index de6398628a..2bf9d9536b 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/WebXRInterface.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/WebXRInterface.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal0
@@ -139,6 +140,7 @@ public open class WebXRInterface internal constructor() : XRInterface() {
   /**
    * Emitted by [isSessionSupported] to indicate if the given [sessionMode] is supported or not.
    */
+  @GodotApiMember
   public val sessionSupported: Signal2<String, Boolean> by Signal2
 
   /**
@@ -146,6 +148,7 @@ public open class WebXRInterface internal constructor() : XRInterface() {
    * At this point, it's safe to do `get_viewport().use_xr = true` to instruct Godot to start
    * rendering to the XR device.
    */
+  @GodotApiMember
   public val sessionStarted: Signal0 by Signal0
 
   /**
@@ -154,6 +157,7 @@ public open class WebXRInterface internal constructor() : XRInterface() {
    * At this point, you should do `get_viewport().use_xr = false` to instruct Godot to resume
    * rendering to the screen.
    */
+  @GodotApiMember
   public val sessionEnded: Signal0 by Signal0
 
   /**
@@ -161,6 +165,7 @@ public open class WebXRInterface internal constructor() : XRInterface() {
    * [message] may optionally contain an error message from WebXR, or an empty string if no message
    * is available.
    */
+  @GodotApiMember
   public val sessionFailed: Signal1<String> by Signal1
 
   /**
@@ -168,6 +173,7 @@ public open class WebXRInterface internal constructor() : XRInterface() {
    * Use [getInputSourceTracker] and [getInputSourceTargetRayMode] to get more information about the
    * input source.
    */
+  @GodotApiMember
   public val selectstart: Signal1<Long> by Signal1
 
   /**
@@ -175,6 +181,7 @@ public open class WebXRInterface internal constructor() : XRInterface() {
    * Use [getInputSourceTracker] and [getInputSourceTargetRayMode] to get more information about the
    * input source.
    */
+  @GodotApiMember
   public val select: Signal1<Long> by Signal1
 
   /**
@@ -182,6 +189,7 @@ public open class WebXRInterface internal constructor() : XRInterface() {
    * Use [getInputSourceTracker] and [getInputSourceTargetRayMode] to get more information about the
    * input source.
    */
+  @GodotApiMember
   public val selectend: Signal1<Long> by Signal1
 
   /**
@@ -189,6 +197,7 @@ public open class WebXRInterface internal constructor() : XRInterface() {
    * Use [getInputSourceTracker] and [getInputSourceTargetRayMode] to get more information about the
    * input source.
    */
+  @GodotApiMember
   public val squeezestart: Signal1<Long> by Signal1
 
   /**
@@ -196,6 +205,7 @@ public open class WebXRInterface internal constructor() : XRInterface() {
    * Use [getInputSourceTracker] and [getInputSourceTargetRayMode] to get more information about the
    * input source.
    */
+  @GodotApiMember
   public val squeeze: Signal1<Long> by Signal1
 
   /**
@@ -203,11 +213,13 @@ public open class WebXRInterface internal constructor() : XRInterface() {
    * Use [getInputSourceTracker] and [getInputSourceTargetRayMode] to get more information about the
    * input source.
    */
+  @GodotApiMember
   public val squeezeend: Signal1<Long> by Signal1
 
   /**
    * Emitted when [visibilityState] has changed.
    */
+  @GodotApiMember
   public val visibilityStateChanged: Signal0 by Signal0
 
   /**
@@ -218,11 +230,13 @@ public open class WebXRInterface internal constructor() : XRInterface() {
    * See [url=https://developer.mozilla.org/en-US/docs/Web/API/XRReferenceSpace/reset_event]WebXR's
    * XRReferenceSpace reset event[/url] for more information.
    */
+  @GodotApiMember
   public val referenceSpaceReset: Signal0 by Signal0
 
   /**
    * Emitted after the display's refresh rate has changed.
    */
+  @GodotApiMember
   public val displayRefreshRateChanged: Signal0 by Signal0
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/Window.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/Window.kt
index 4ed3d810f1..889e4667f5 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/Window.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/Window.kt
@@ -8,6 +8,7 @@ package godot
 
 import godot.`annotation`.CoreTypeHelper
 import godot.`annotation`.CoreTypeLocalCopy
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Color
@@ -58,6 +59,7 @@ public open class Window : Viewport() {
    * Emitted when the [Window] is currently focused and receives any input, passing the received
    * event as an argument. The event's position, if present, is in the embedder's coordinate system.
    */
+  @GodotApiMember
   public val windowInput: Signal1<InputEvent> by Signal1
 
   /**
@@ -74,6 +76,7 @@ public open class Window : Viewport() {
    *     print(files)
    * [/codeblock]
    */
+  @GodotApiMember
   public val filesDropped: Signal1<PackedStringArray> by Signal1
 
   /**
@@ -81,6 +84,7 @@ public open class Window : Viewport() {
    * other [Control]s or windows, provided its [Viewport.guiDisableInput] is `false` and regardless if
    * it's currently focused or not.
    */
+  @GodotApiMember
   public val mouseEntered: Signal0 by Signal0
 
   /**
@@ -88,16 +92,19 @@ public open class Window : Viewport() {
    * other [Control]s or windows, provided its [Viewport.guiDisableInput] is `false` and regardless if
    * it's currently focused or not.
    */
+  @GodotApiMember
   public val mouseExited: Signal0 by Signal0
 
   /**
    * Emitted when the [Window] gains focus.
    */
+  @GodotApiMember
   public val focusEntered: Signal0 by Signal0
 
   /**
    * Emitted when the [Window] loses its focus.
    */
+  @GodotApiMember
   public val focusExited: Signal0 by Signal0
 
   /**
@@ -105,27 +112,32 @@ public open class Window : Viewport() {
    * clicks outside the window.
    * This signal can be used to handle window closing, e.g. by connecting it to [hide].
    */
+  @GodotApiMember
   public val closeRequested: Signal0 by Signal0
 
   /**
    * Emitted when a go back request is sent (e.g. pressing the "Back" button on Android), right
    * after [Node.NOTIFICATION_WM_GO_BACK_REQUEST].
    */
+  @GodotApiMember
   public val goBackRequested: Signal0 by Signal0
 
   /**
    * Emitted when [Window] is made visible or disappears.
    */
+  @GodotApiMember
   public val visibilityChanged: Signal0 by Signal0
 
   /**
    * Emitted right after [popup] call, before the [Window] appears or does anything.
    */
+  @GodotApiMember
   public val aboutToPopup: Signal0 by Signal0
 
   /**
    * Emitted when the [NOTIFICATION_THEME_CHANGED] notification is sent.
    */
+  @GodotApiMember
   public val themeChanged: Signal0 by Signal0
 
   /**
@@ -133,12 +145,14 @@ public open class Window : Viewport() {
    * from a Retina display to a lower resolution one).
    * **Note:** Only implemented on macOS.
    */
+  @GodotApiMember
   public val dpiChanged: Signal0 by Signal0
 
   /**
    * Emitted when window title bar decorations are changed, e.g. macOS window enter/exit full screen
    * mode, or extend-to-title flag is changed.
    */
+  @GodotApiMember
   public val titlebarChanged: Signal0 by Signal0
 
   /**
@@ -712,6 +726,7 @@ public open class Window : Viewport() {
    * Virtual method to be implemented by the user. Overrides the value returned by
    * [getContentsMinimumSize].
    */
+  @GodotApiMember
   public open fun _getContentsMinimumSize(): Vector2 {
     throw NotImplementedError("_get_contents_minimum_size is not implemented for Window")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRController3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRController3D.kt
index 3fff21a789..5ca29e8dd1 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRController3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRController3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal1
@@ -47,26 +48,31 @@ public open class XRController3D : XRNode3D() {
   /**
    * Emitted when a button on this controller is pressed.
    */
+  @GodotApiMember
   public val buttonPressed: Signal1<String> by Signal1
 
   /**
    * Emitted when a button on this controller is released.
    */
+  @GodotApiMember
   public val buttonReleased: Signal1<String> by Signal1
 
   /**
    * Emitted when a trigger or similar input on this controller changes value.
    */
+  @GodotApiMember
   public val inputFloatChanged: Signal2<String, Double> by Signal2
 
   /**
    * Emitted when a thumbstick or thumbpad on this controller is moved.
    */
+  @GodotApiMember
   public val inputVector2Changed: Signal2<String, Vector2> by Signal2
 
   /**
    * Emitted when the interaction profile on this controller is changed.
    */
+  @GodotApiMember
   public val profileChanged: Signal1<String> by Signal1
 
   public override fun new(scriptIndex: Int): Unit {
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRInterface.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRInterface.kt
index 144991ac90..8ac4c6fd90 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRInterface.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRInterface.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -54,6 +55,7 @@ public open class XRInterface internal constructor() : RefCounted() {
    * boundary or entering a new play area, the player changing the play area mode, the world scale
    * changing or the player resetting their headset orientation.
    */
+  @GodotApiMember
   public val playAreaChanged: Signal1<Long> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRInterfaceExtension.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRInterfaceExtension.kt
index 56d9101cea..50d406f454 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRInterfaceExtension.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRInterfaceExtension.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -50,6 +51,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Returns the name of this interface.
    */
+  @GodotApiMember
   public open fun _getName(): StringName {
     throw NotImplementedError("_get_name is not implemented for XRInterfaceExtension")
   }
@@ -57,6 +59,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Returns the capabilities of this interface.
    */
+  @GodotApiMember
   public open fun _getCapabilities(): Long {
     throw NotImplementedError("_get_capabilities is not implemented for XRInterfaceExtension")
   }
@@ -64,6 +67,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Returns `true` if this interface has been initialized.
    */
+  @GodotApiMember
   public open fun _isInitialized(): Boolean {
     throw NotImplementedError("_is_initialized is not implemented for XRInterfaceExtension")
   }
@@ -71,6 +75,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Initializes the interface, returns `true` on success.
    */
+  @GodotApiMember
   public open fun _initialize(): Boolean {
     throw NotImplementedError("_initialize is not implemented for XRInterfaceExtension")
   }
@@ -78,12 +83,14 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Uninitialize the interface.
    */
+  @GodotApiMember
   public open fun _uninitialize(): Unit {
   }
 
   /**
    * Returns a [Dictionary] with system information related to this interface.
    */
+  @GodotApiMember
   public open fun _getSystemInfo(): Dictionary<Any?, Any?> {
     throw NotImplementedError("_get_system_info is not implemented for XRInterfaceExtension")
   }
@@ -91,6 +98,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Returns `true` if this interface supports this play area mode.
    */
+  @GodotApiMember
   public open fun _supportsPlayAreaMode(mode: XRInterface.PlayAreaMode): Boolean {
     throw NotImplementedError("_supports_play_area_mode is not implemented for XRInterfaceExtension")
   }
@@ -98,6 +106,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Returns the play area mode that sets up our play area.
    */
+  @GodotApiMember
   public open fun _getPlayAreaMode(): XRInterface.PlayAreaMode {
     throw NotImplementedError("_get_play_area_mode is not implemented for XRInterfaceExtension")
   }
@@ -105,6 +114,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Set the play area mode for this interface.
    */
+  @GodotApiMember
   public open fun _setPlayAreaMode(mode: XRInterface.PlayAreaMode): Boolean {
     throw NotImplementedError("_set_play_area_mode is not implemented for XRInterfaceExtension")
   }
@@ -112,6 +122,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Returns a [PackedVector3Array] that represents the play areas boundaries (if applicable).
    */
+  @GodotApiMember
   public open fun _getPlayArea(): PackedVector3Array {
     throw NotImplementedError("_get_play_area is not implemented for XRInterfaceExtension")
   }
@@ -120,6 +131,7 @@ public open class XRInterfaceExtension : XRInterface() {
    * Returns the size of our render target for this interface, this overrides the size of the
    * [Viewport] marked as the xr viewport.
    */
+  @GodotApiMember
   public open fun _getRenderTargetSize(): Vector2 {
     throw NotImplementedError("_get_render_target_size is not implemented for XRInterfaceExtension")
   }
@@ -127,6 +139,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Returns the number of views this interface requires, 1 for mono, 2 for stereoscopic.
    */
+  @GodotApiMember
   public open fun _getViewCount(): Long {
     throw NotImplementedError("_get_view_count is not implemented for XRInterfaceExtension")
   }
@@ -134,6 +147,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Returns the [Transform3D] that positions the [XRCamera3D] in the world.
    */
+  @GodotApiMember
   public open fun _getCameraTransform(): Transform3D {
     throw NotImplementedError("_get_camera_transform is not implemented for XRInterfaceExtension")
   }
@@ -141,6 +155,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Returns a [Transform3D] for a given view.
    */
+  @GodotApiMember
   public open fun _getTransformForView(view: Long, camTransform: Transform3D): Transform3D {
     throw NotImplementedError("_get_transform_for_view is not implemented for XRInterfaceExtension")
   }
@@ -148,6 +163,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Returns the projection matrix for the given view as a [PackedFloat64Array].
    */
+  @GodotApiMember
   public open fun _getProjectionForView(
     view: Long,
     aspect: Double,
@@ -157,6 +173,7 @@ public open class XRInterfaceExtension : XRInterface() {
     throw NotImplementedError("_get_projection_for_view is not implemented for XRInterfaceExtension")
   }
 
+  @GodotApiMember
   public open fun _getVrsTexture(): RID {
     throw NotImplementedError("_get_vrs_texture is not implemented for XRInterfaceExtension")
   }
@@ -165,6 +182,7 @@ public open class XRInterfaceExtension : XRInterface() {
    * Called if this [XRInterfaceExtension] is active before our physics and game process is called.
    * Most XR interfaces will update its [XRPositionalTracker]s at this point in time.
    */
+  @GodotApiMember
   public open fun _process(): Unit {
   }
 
@@ -172,6 +190,7 @@ public open class XRInterfaceExtension : XRInterface() {
    * Called if this [XRInterfaceExtension] is active before rendering starts. Most XR interfaces
    * will sync tracking at this point in time.
    */
+  @GodotApiMember
   public open fun _preRender(): Unit {
   }
 
@@ -180,6 +199,7 @@ public open class XRInterfaceExtension : XRInterface() {
    * for every active XR [Viewport], returns `true` if that viewport should be rendered. An XR
    * interface may return `false` if the user has taken off their headset and we can pause rendering.
    */
+  @GodotApiMember
   public open fun _preDrawViewport(renderTarget: RID): Boolean {
     throw NotImplementedError("_pre_draw_viewport is not implemented for XRInterfaceExtension")
   }
@@ -187,12 +207,14 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Called after the XR [Viewport] draw logic has completed.
    */
+  @GodotApiMember
   public open fun _postDrawViewport(renderTarget: RID, screenRect: Rect2): Unit {
   }
 
   /**
    * Called if interface is active and queues have been submitted.
    */
+  @GodotApiMember
   public open fun _endFrame(): Unit {
   }
 
@@ -200,6 +222,7 @@ public open class XRInterfaceExtension : XRInterface() {
    * Returns a [PackedStringArray] with tracker names configured by this interface. Note that user
    * configuration can override this list.
    */
+  @GodotApiMember
   public open fun _getSuggestedTrackerNames(): PackedStringArray {
     throw NotImplementedError("_get_suggested_tracker_names is not implemented for XRInterfaceExtension")
   }
@@ -208,6 +231,7 @@ public open class XRInterfaceExtension : XRInterface() {
    * Returns a [PackedStringArray] with pose names configured by this interface. Note that user
    * configuration can override this list.
    */
+  @GodotApiMember
   public open fun _getSuggestedPoseNames(trackerName: StringName): PackedStringArray {
     throw NotImplementedError("_get_suggested_pose_names is not implemented for XRInterfaceExtension")
   }
@@ -215,6 +239,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Returns a [XRInterface.TrackingStatus] specifying the current status of our tracking.
    */
+  @GodotApiMember
   public open fun _getTrackingStatus(): XRInterface.TrackingStatus {
     throw NotImplementedError("_get_tracking_status is not implemented for XRInterfaceExtension")
   }
@@ -222,6 +247,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Triggers a haptic pulse to be emitted on the specified tracker.
    */
+  @GodotApiMember
   public open fun _triggerHapticPulse(
     actionName: String,
     trackerName: StringName,
@@ -235,6 +261,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Return `true` if anchor detection is enabled for this interface.
    */
+  @GodotApiMember
   public open fun _getAnchorDetectionIsEnabled(): Boolean {
     throw NotImplementedError("_get_anchor_detection_is_enabled is not implemented for XRInterfaceExtension")
   }
@@ -242,6 +269,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Enables anchor detection on this interface if supported.
    */
+  @GodotApiMember
   public open fun _setAnchorDetectionIsEnabled(enabled: Boolean): Unit {
   }
 
@@ -249,6 +277,7 @@ public open class XRInterfaceExtension : XRInterface() {
    * Returns the camera feed ID for the [CameraFeed] registered with the [CameraServer] that should
    * be presented as the background on an AR capable device (if applicable).
    */
+  @GodotApiMember
   public open fun _getCameraFeedId(): Int {
     throw NotImplementedError("_get_camera_feed_id is not implemented for XRInterfaceExtension")
   }
@@ -256,6 +285,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Return color texture into which to render (if applicable).
    */
+  @GodotApiMember
   public open fun _getColorTexture(): RID {
     throw NotImplementedError("_get_color_texture is not implemented for XRInterfaceExtension")
   }
@@ -263,6 +293,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Return depth texture into which to render (if applicable).
    */
+  @GodotApiMember
   public open fun _getDepthTexture(): RID {
     throw NotImplementedError("_get_depth_texture is not implemented for XRInterfaceExtension")
   }
@@ -270,6 +301,7 @@ public open class XRInterfaceExtension : XRInterface() {
   /**
    * Return velocity texture into which to render (if applicable).
    */
+  @GodotApiMember
   public open fun _getVelocityTexture(): RID {
     throw NotImplementedError("_get_velocity_texture is not implemented for XRInterfaceExtension")
   }
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRNode3D.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRNode3D.kt
index e60ac9f244..87fa5171fa 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRNode3D.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRNode3D.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal1
@@ -37,6 +38,7 @@ public open class XRNode3D : Node3D() {
    * Emitted when the [tracker] starts or stops receiving updated tracking data for the [pose] being
    * tracked. The [tracking] argument indicates whether the tracker is getting updated tracking data.
    */
+  @GodotApiMember
   public val trackingChanged: Signal1<Boolean> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRPositionalTracker.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRPositionalTracker.kt
index 7b21d1459f..c765f2b56f 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRPositionalTracker.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRPositionalTracker.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Signal1
@@ -49,37 +50,44 @@ public open class XRPositionalTracker : XRTracker() {
   /**
    * Emitted when the state of a pose tracked by this tracker changes.
    */
+  @GodotApiMember
   public val poseChanged: Signal1<XRPose> by Signal1
 
   /**
    * Emitted when a pose tracked by this tracker stops getting updated tracking data.
    */
+  @GodotApiMember
   public val poseLostTracking: Signal1<XRPose> by Signal1
 
   /**
    * Emitted when a button on this tracker is pressed. Note that many XR runtimes allow other inputs
    * to be mapped to buttons.
    */
+  @GodotApiMember
   public val buttonPressed: Signal1<String> by Signal1
 
   /**
    * Emitted when a button on this tracker is released.
    */
+  @GodotApiMember
   public val buttonReleased: Signal1<String> by Signal1
 
   /**
    * Emitted when a trigger or similar input on this tracker changes value.
    */
+  @GodotApiMember
   public val inputFloatChanged: Signal2<String, Double> by Signal2
 
   /**
    * Emitted when a thumbstick or thumbpad on this tracker moves.
    */
+  @GodotApiMember
   public val inputVector2Changed: Signal2<String, Vector2> by Signal2
 
   /**
    * Emitted when the profile of our tracker changes.
    */
+  @GodotApiMember
   public val profileChanged: Signal1<String> by Signal1
 
   /**
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRServer.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRServer.kt
index 441e795884..24fca359e0 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/XRServer.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/XRServer.kt
@@ -6,6 +6,7 @@
 
 package godot
 
+import godot.`annotation`.GodotApiMember
 import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.Dictionary
@@ -46,18 +47,21 @@ public object XRServer : Object() {
   /**
    * Emitted when the reference frame transform changes.
    */
+  @GodotApiMember
   @JvmStatic
   public val referenceFrameChanged: Signal0 by Signal0
 
   /**
    * Emitted when a new interface has been added.
    */
+  @GodotApiMember
   @JvmStatic
   public val interfaceAdded: Signal1<StringName> by Signal1
 
   /**
    * Emitted when an interface is removed.
    */
+  @GodotApiMember
   @JvmStatic
   public val interfaceRemoved: Signal1<StringName> by Signal1
 
@@ -66,6 +70,7 @@ public object XRServer : Object() {
    * you're using [XRAnchor3D]s for an AR solution, it is important to react to this signal to add the
    * appropriate [XRController3D] or [XRAnchor3D] nodes related to this new tracker.
    */
+  @GodotApiMember
   @JvmStatic
   public val trackerAdded: Signal2<StringName, Long> by Signal2
 
@@ -73,6 +78,7 @@ public object XRServer : Object() {
    * Emitted when an existing tracker has been updated. This can happen if the user switches
    * controllers.
    */
+  @GodotApiMember
   @JvmStatic
   public val trackerUpdated: Signal2<StringName, Long> by Signal2
 
@@ -82,6 +88,7 @@ public object XRServer : Object() {
    * active again when a new tracker becomes available (i.e. a new controller is switched on that takes
    * the place of the previous one).
    */
+  @GodotApiMember
   @JvmStatic
   public val trackerRemoved: Signal2<StringName, Long> by Signal2
 
diff --git a/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt b/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt
index 2a49195ade..4a267666d1 100644
--- a/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt
+++ b/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt
@@ -43,6 +43,7 @@ object GodotKotlinJvmTypes {
 
     object Annotations {
         const val godotBaseType = "GodotBaseType"
+        const val godotApiMemeber = "GodotApiMember"
         const val coreTypeHelper = "CoreTypeHelper"
         const val coreTypeLocalCopy = "CoreTypeLocalCopy"
 
@@ -242,6 +243,7 @@ val VARIANT_CASTER_FLOAT = ClassName(variantCasterPackage, "FLOAT")
 val VARIANT_CASTER_ANY = ClassName(variantCasterPackage, "ANY")
 
 val GODOT_BASE_TYPE = ClassName(godotAnnotationPackage, GodotKotlinJvmTypes.Annotations.godotBaseType)
+val GODOT_API_MEMBER = ClassName(godotAnnotationPackage, GodotKotlinJvmTypes.Annotations.godotApiMemeber)
 val CORE_TYPE_HELPER = ClassName(godotAnnotationPackage, GodotKotlinJvmTypes.Annotations.coreTypeHelper)
 val CORE_TYPE_LOCAL_COPY = ClassName(godotAnnotationPackage, GodotKotlinJvmTypes.Annotations.coreTypeLocalCopy)
 

From 0accfcceaf89a6605d6745f987f027a764d731cf Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sat, 12 Oct 2024 21:38:51 +0200
Subject: [PATCH 03/18] Implement new annotation set and update registration
 code

---
 .../godot/tests/library/flattened/Simple.kt   |  11 +-
 .../godot/tests/library/fqname/Simple.kt      |  11 +-
 .../godot/tests/library/fqname/SimpleChild.kt |   4 +-
 .../tests/library/hierarchical/Simple.kt      |  11 +-
 .../tests/.run/Debug EntryGenerator.run.xml   |  28 +-
 .../CopyModificationCheckTestClass.kt         |  10 +-
 .../otherSourceDir/CoreTypePropertyChecks.kt  |   9 +-
 .../otherSourceDir/ScriptInOtherSourceDir.kt  |   8 +-
 .../main/java/godot/tests/JavaTestClass.java  |  32 +--
 .../godot/tests/CoreTypesIdentityTest.kt      |  60 +++--
 .../main/kotlin/godot/tests/FuncRefTest.kt    |  35 ++-
 .../src/main/kotlin/godot/tests/Invocation.kt | 246 +++++++-----------
 .../kotlin/godot/tests/LambdaCallableTest.kt  |  28 +-
 .../godot/tests/MultiArgsConstructorTest.kt   |  29 +--
 .../tests/args/ConstructorArgSizeTest.kt      |  27 +-
 .../godot/tests/args/FunctionArgSizeTest.kt   |  42 ++-
 .../kotlin/godot/tests/binding/BindingA.kt    |   4 +-
 .../kotlin/godot/tests/binding/BindingB.kt    |   4 +-
 .../kotlin/godot/tests/binding/BindingTest.kt |   8 +-
 .../tests/callable/CallableMethodBindTest.kt  |  19 +-
 .../ConstructorRegistrationTest.kt            |   8 +-
 .../kotlin/godot/tests/coretypes/BasisTest.kt |  16 +-
 .../godot/tests/coretypes/StringTest.kt       |  27 +-
 .../godot/tests/coretypes/Vector3Test.kt      |  10 +-
 .../godot/tests/coroutine/CoroutineTest.kt    |  31 +--
 .../godot/tests/exception/ExceptionTest.kt    |   8 +-
 .../FreeformRegistrationFileTestClass.kt      |   8 +-
 .../AbstractClassInheritanceChild.kt          |  13 +-
 .../AbstractClassInheritanceEmptyChild.kt     |   4 +-
 .../AbstractClassInheritanceParent.kt         |  17 +-
 .../inheritance/ClassInheritanceChild.kt      |  15 +-
 .../inheritance/ClassInheritanceParent.kt     |  25 +-
 .../godot/tests/instance/NodeInstance.kt      |   4 +-
 .../godot/tests/instance/ObjectInstance.kt    |   4 +-
 .../tests/instance/RefCountedInstance.kt      |   4 +-
 .../tests/packedarray/PackedArrayTest.kt      |  26 +-
 .../tests/reflection/BaseReflectionTest.kt    |  10 +-
 .../tests/reflection/GH571_ReflectionTest.kt  |   8 +-
 .../TypedVariantArrayRegistration.kt          |   8 +-
 .../kotlin/godot/tests/rpctests/RpcTests.kt   |  12 +-
 .../kotlin/godot/tests/signal/SignalTest.kt   |  26 +-
 .../godot/tests/static/CallStaticTest.kt      |   9 +-
 .../godot/tests/subpackage/OtherScript.kt     |  13 +-
 .../checks/LateinitPropertyCheck.kt           |   3 -
 .../checks/NullablePropertyCheck.kt           |   2 -
 .../checks/PropertyMutablilityCheck.kt        |   2 -
 .../checks/PropertyTypeCheck.kt               |   4 -
 .../ConstructorRegistrationGenerator.kt       |   5 +-
 .../model/GodotMemberAnnotation.kt            |   3 +
 ...Annotation.kt => GodotScriptAnnotation.kt} |   2 +-
 .../model/RegisterConstructorAnnotation.kt    |   3 -
 .../model/RegisterFunctionAnnotation.kt       |   3 -
 .../model/RegisterPropertyAnnotation.kt       |   3 -
 .../model/RegisterSignalAnnotation.kt         |   3 -
 .../processor/GodotKotlinSymbolProcessor.kt   |   2 +-
 .../processor/ext/ksAnnotatedExt.kt           |  33 +++
 .../processor/ext/ksAnnotationExt.kt          |  21 +-
 .../processor/ext/ksClassDeclarationExt.kt    |  50 +++-
 .../processor/ext/ksDeclarationExt.kt         |  20 +-
 .../processor/ext/ksFunctionDeclarationExt.kt |  29 +--
 .../processor/ext/ksTypeReferenceExt.kt       |   8 +-
 .../visitor/RegistrationAnnotationVisitor.kt  |  21 +-
 .../main/kotlin/godot/annotation/Export.kt    |   1 +
 .../kotlin/godot/annotation/GodotApiMember.kt |   2 +-
 .../kotlin/godot/annotation/GodotMember.kt    |  17 ++
 .../kotlin/godot/annotation/GodotScript.kt    |  10 +
 .../kotlin/godot/annotation/RegisterClass.kt  |  10 -
 .../godot/annotation/RegisterConstructor.kt   |   8 -
 .../godot/annotation/RegisterFunction.kt      |  12 -
 .../godot/annotation/RegisterProperty.kt      |  10 -
 .../kotlin/godot/annotation/RegisterSignal.kt |  17 --
 .../src/main/kotlin/godot/annotation/Rpc.kt   |   1 +
 .../src/main/kotlin/godot/annotation/Tool.kt  |   2 +-
 .../annotation/propertyHintAnnotations.kt     |  36 +++
 .../src/main/kotlin/godot/core/KtObject.kt    |   2 +-
 75 files changed, 601 insertions(+), 676 deletions(-)
 create mode 100644 kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/GodotMemberAnnotation.kt
 rename kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/{RegisterClassAnnotation.kt => GodotScriptAnnotation.kt} (79%)
 delete mode 100644 kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterConstructorAnnotation.kt
 delete mode 100644 kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterFunctionAnnotation.kt
 delete mode 100644 kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterPropertyAnnotation.kt
 delete mode 100644 kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterSignalAnnotation.kt
 create mode 100644 kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt
 create mode 100644 kt/godot-library/src/main/kotlin/godot/annotation/GodotMember.kt
 create mode 100644 kt/godot-library/src/main/kotlin/godot/annotation/GodotScript.kt
 delete mode 100644 kt/godot-library/src/main/kotlin/godot/annotation/RegisterClass.kt
 delete mode 100644 kt/godot-library/src/main/kotlin/godot/annotation/RegisterConstructor.kt
 delete mode 100644 kt/godot-library/src/main/kotlin/godot/annotation/RegisterFunction.kt
 delete mode 100644 kt/godot-library/src/main/kotlin/godot/annotation/RegisterProperty.kt
 delete mode 100644 kt/godot-library/src/main/kotlin/godot/annotation/RegisterSignal.kt

diff --git a/harness/flattened-library-tests/src/main/kotlin/godot/tests/library/flattened/Simple.kt b/harness/flattened-library-tests/src/main/kotlin/godot/tests/library/flattened/Simple.kt
index 653d1f3939..f4868950b4 100644
--- a/harness/flattened-library-tests/src/main/kotlin/godot/tests/library/flattened/Simple.kt
+++ b/harness/flattened-library-tests/src/main/kotlin/godot/tests/library/flattened/Simple.kt
@@ -2,16 +2,15 @@ package godot.tests.library.flattened
 
 import godot.Node3D
 import godot.annotation.Export
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class Simple: Node3D() {
 
     @Export
-    @RegisterProperty
     var testProperty = "Hello from flattened-library-test!"
-    @RegisterFunction
+
+    @GodotMember
     fun provideGreeting(): String = testProperty
 }
diff --git a/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/Simple.kt b/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/Simple.kt
index 60402862b1..10240ffffa 100644
--- a/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/Simple.kt
+++ b/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/Simple.kt
@@ -2,16 +2,15 @@ package godot.tests.library.fqname
 
 import godot.Node3D
 import godot.annotation.Export
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 open class Simple: Node3D() {
 
     @Export
-    @RegisterProperty
     var testProperty = "Hello from fqname-library-test!"
-    @RegisterFunction
+
+    @GodotMember
     fun provideGreeting(): String = testProperty
 }
diff --git a/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/SimpleChild.kt b/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/SimpleChild.kt
index 34242e4913..2ed4aab047 100644
--- a/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/SimpleChild.kt
+++ b/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/SimpleChild.kt
@@ -1,7 +1,7 @@
 package godot.tests.library.fqname
 
-import godot.annotation.RegisterClass
+import godot.annotation.GodotScript
 
 
-@RegisterClass
+@GodotScript
 class SimpleChild: Simple() {}
diff --git a/harness/hierarchical-library-tests/src/main/kotlin/godot/tests/library/hierarchical/Simple.kt b/harness/hierarchical-library-tests/src/main/kotlin/godot/tests/library/hierarchical/Simple.kt
index 1bf6462241..2f9760e965 100644
--- a/harness/hierarchical-library-tests/src/main/kotlin/godot/tests/library/hierarchical/Simple.kt
+++ b/harness/hierarchical-library-tests/src/main/kotlin/godot/tests/library/hierarchical/Simple.kt
@@ -2,16 +2,15 @@ package godot.tests.library.hierarchical
 
 import godot.Node3D
 import godot.annotation.Export
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class Simple: Node3D() {
 
     @Export
-    @RegisterProperty
     var testProperty = "Hello from hierarchical-library-test!"
-    @RegisterFunction
+
+    @GodotMember
     fun provideGreeting(): String = testProperty
 }
diff --git a/harness/tests/.run/Debug EntryGenerator.run.xml b/harness/tests/.run/Debug EntryGenerator.run.xml
index 71032a1d75..9aa97ccf15 100644
--- a/harness/tests/.run/Debug EntryGenerator.run.xml	
+++ b/harness/tests/.run/Debug EntryGenerator.run.xml	
@@ -1,15 +1,15 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="Debug EntryGenerator" type="Remote">
-        <option name="USE_SOCKET_TRANSPORT" value="true" />
-        <option name="SERVER_MODE" value="false" />
-        <option name="SHMEM_ADDRESS" />
-        <option name="HOST" value="localhost" />
-        <option name="PORT" value="8765" />
-        <option name="AUTO_RESTART" value="false" />
-        <RunnerSettings RunnerId="Debug">
-            <option name="DEBUG_PORT" value="8765" />
-            <option name="LOCAL" value="false" />
-        </RunnerSettings>
-        <method v="2" />
-    </configuration>
-</component>
+  <configuration default="false" name="Debug EntryGenerator" type="Remote">
+    <option name="USE_SOCKET_TRANSPORT" value="true" />
+    <option name="SERVER_MODE" value="false" />
+    <option name="SHMEM_ADDRESS" />
+    <option name="HOST" value="localhost" />
+    <option name="PORT" value="5005" />
+    <option name="AUTO_RESTART" value="false" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="5005" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/harness/tests/otherSourceDir/CopyModificationCheckTestClass.kt b/harness/tests/otherSourceDir/CopyModificationCheckTestClass.kt
index f1594721a5..70a885c4d3 100644
--- a/harness/tests/otherSourceDir/CopyModificationCheckTestClass.kt
+++ b/harness/tests/otherSourceDir/CopyModificationCheckTestClass.kt
@@ -1,14 +1,14 @@
 import godot.Node3D
 import godot.annotation.Export
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterProperty
-import godot.core.*
+import godot.annotation.GodotScript
+import godot.core.Basis
+import godot.core.Transform3D
+import godot.core.Vector3
 
-@RegisterClass
+@GodotScript
 class CopyModificationCheckTestClass: Node3D() {
 
     @Export
-    @RegisterProperty
     lateinit var node3D: Node3D
 
     class Blubb {
diff --git a/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt b/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt
index 621ba9992f..f7b0ee0609 100644
--- a/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt
+++ b/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt
@@ -1,10 +1,10 @@
 import godot.Node
 import godot.annotation.Export
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterProperty
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.Vector3
 
-@RegisterClass
+@GodotScript
 class CoreTypePropertyChecks: Node() {
     // not allowed cases are commented out so that the compilation runs. Otherwise, our compiler checks trigger a build failure
     // to test out these checks, uncomment the cases
@@ -16,7 +16,6 @@ class CoreTypePropertyChecks: Node() {
 
     // allowed
     @Export
-    @RegisterProperty
     var exportedNormalCoreType: Vector3 = Vector3.ZERO
 
     // not allowed
@@ -24,6 +23,6 @@ class CoreTypePropertyChecks: Node() {
 //    lateinit var lateinitCoreType: Vector3
 
     // allowed
-    @RegisterProperty
+    @GodotMember
     var normalCoreType: Vector3 = Vector3.ZERO
 }
diff --git a/harness/tests/otherSourceDir/ScriptInOtherSourceDir.kt b/harness/tests/otherSourceDir/ScriptInOtherSourceDir.kt
index 6a49ac654a..ce8bc317e1 100644
--- a/harness/tests/otherSourceDir/ScriptInOtherSourceDir.kt
+++ b/harness/tests/otherSourceDir/ScriptInOtherSourceDir.kt
@@ -1,10 +1,10 @@
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class ScriptInOtherSourceDir: Node() {
 
-	@RegisterFunction
+	@GodotMember
 	fun greeting() = "HelloWorld"
 }
diff --git a/harness/tests/src/main/java/godot/tests/JavaTestClass.java b/harness/tests/src/main/java/godot/tests/JavaTestClass.java
index 144b9c5f63..74a9070f32 100644
--- a/harness/tests/src/main/java/godot/tests/JavaTestClass.java
+++ b/harness/tests/src/main/java/godot/tests/JavaTestClass.java
@@ -3,16 +3,17 @@
 import godot.Button;
 import godot.Node;
 import godot.RenderingServer;
-import godot.annotation.*;
+import godot.annotation.EnumTypeHint;
+import godot.annotation.Export;
+import godot.annotation.GodotMember;
+import godot.annotation.GodotScript;
 import godot.core.*;
 import org.jetbrains.annotations.NotNull;
 
-@RegisterClass
+@GodotScript
 public class JavaTestClass extends Node {
-    @RegisterSignal
     public Signal0 testSignal = Signal0.create(this, "test_signal");
 
-    @RegisterSignal
     public Signal2<String, String> testSignal2 = Signal2.create(this, "test_signal_2", "param1", "param2");
 
     // The following should NOT work as we cannot extract parameter names. The compiler checks should catch that and throw a build error
@@ -20,54 +21,45 @@ public class JavaTestClass extends Node {
 //    public Signal testSignal3 = new Signal2<>(this, "name");
 
     @Export
-    @RegisterProperty
     @EnumTypeHint
     public JavaEnum javaEnum = JavaEnum.JAVA_ENUM_1;
 
     @Export
-    @RegisterProperty
     public int exportedInt = 1;
 
     @Export
-    @RegisterProperty
     public long exportedLong = 1L;
 
     @Export
-    @RegisterProperty
     public float exportedFloat = 1f;
 
     @Export
-    @RegisterProperty
     public double exportedDouble = 1.0;
 
     @Export
-    @RegisterProperty
     public boolean exportedBoolean = true;
 
     @Export
-    @RegisterProperty
     public String exportedString = "blubb";
 
     @Export
-    @RegisterProperty
     public byte exportedByte = 1;
 
     @Export
-    @RegisterProperty
     public Button exportedButton;
 
-    @RegisterFunction
+    @GodotMember
     public String greeting() {
         return "Hello from java";
     }
 
-    @RegisterProperty
+    @GodotMember
     public boolean signalEmitted = false;
 
-    @RegisterProperty
+    @GodotMember
     public VariantArray<Integer> variantArray = new VariantArray<>(Integer.class);
 
-    @RegisterProperty
+    @GodotMember
     public Dictionary<Float, String> dictionary = new Dictionary<>(Float.class, String.class);
 
     public LambdaCallable<Void> lambdaCallable = LambdaCallable0.create(
@@ -80,7 +72,7 @@ public String greeting() {
 
     public NativeCallable methodCallable = Callable.create(this, StringNames.asStringName("DummyName"));
 
-    @RegisterFunction
+    @GodotMember
     @Override
     public void _ready() {
         // Check if Singletons have the correct syntax, without Single.INSTANCE
@@ -89,7 +81,7 @@ public void _ready() {
         RenderingServer.getDefaultClearColor();
     }
 
-    @RegisterFunction
+    @GodotMember
     public void connectAndTriggerSignal() {
         connect(
                 StringNames.asStringName("test_signal"),
@@ -110,7 +102,7 @@ public GodotNotification _notification() {
         );
     }
 
-    @RegisterFunction
+    @GodotMember
     public void signalCallback() {
         signalEmitted = true;
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/CoreTypesIdentityTest.kt b/harness/tests/src/main/kotlin/godot/tests/CoreTypesIdentityTest.kt
index 669638f17c..ed22301409 100644
--- a/harness/tests/src/main/kotlin/godot/tests/CoreTypesIdentityTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/CoreTypesIdentityTest.kt
@@ -1,72 +1,80 @@
 package godot.tests
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.core.*
-
-@RegisterClass
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
+import godot.core.AABB
+import godot.core.Basis
+import godot.core.Color
+import godot.core.Plane
+import godot.core.Quaternion
+import godot.core.Rect2
+import godot.core.Transform2D
+import godot.core.Transform3D
+import godot.core.Vector2
+import godot.core.Vector3
+
+@GodotScript
 class CoreTypesIdentityTest : Node() {
 
-    @RegisterProperty
+    @GodotMember
     var aabb = AABB(Vector3(1, 1, 1), Vector3(2, 2, 2))
 
-    @RegisterProperty
+    @GodotMember
     var basis = Basis(Vector3(0, 1, 2), Vector3(3, 4, 5), Vector3(6, 7, 8))
 
-    @RegisterProperty
+    @GodotMember
     var color = Color(0.1, 0.2, 0.3, 0.4)
 
-    @RegisterProperty
+    @GodotMember
     var plane = Plane(1, 2, 3, 4)
 
-    @RegisterProperty
+    @GodotMember
     var quaternion = Quaternion(1, 2, 3, 4)
 
-    @RegisterProperty
+    @GodotMember
     var rect2 = Rect2(1.0, 2.0, 3.0, 4.0)
 
-    @RegisterProperty
+    @GodotMember
     var transform3D =
         Transform3D(Vector3(0, 1, 2), Vector3(3, 4, 5), Vector3(6, 7, 8), Vector3(9, 10, 11))
 
-    @RegisterProperty
+    @GodotMember
     var transform2D = Transform2D(0, 1, 2, 3, 4, 5)
 
-    @RegisterProperty
+    @GodotMember
     var vector2 = Vector2(1, 2)
 
-    @RegisterProperty
+    @GodotMember
     var vector3 = Vector3(1, 2, 3)
 
-    @RegisterFunction
+    @GodotMember
     fun aabb(aabb: AABB) = aabb
 
-    @RegisterFunction
+    @GodotMember
     fun basis(basis: Basis) = basis
 
-    @RegisterFunction
+    @GodotMember
     fun color(color: Color) = color
 
-    @RegisterFunction
+    @GodotMember
     fun plane(plane: Plane) = plane
 
-    @RegisterFunction
+    @GodotMember
     fun quat(quaternion: Quaternion) = quaternion
 
-    @RegisterFunction
+    @GodotMember
     fun rect2(rect2: Rect2) = rect2
 
-    @RegisterFunction
+    @GodotMember
     fun transform(transform3D: Transform3D) = transform3D
 
-    @RegisterFunction
+    @GodotMember
     fun transform2D(transform2D: Transform2D) = transform2D
 
-    @RegisterFunction
+    @GodotMember
     fun vector2(vector2: Vector2) = vector2
 
-    @RegisterFunction
+    @GodotMember
     fun vector3(vector3: Vector3) = vector3
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/FuncRefTest.kt b/harness/tests/src/main/kotlin/godot/tests/FuncRefTest.kt
index 9cd92c7d4d..d26aed53c6 100644
--- a/harness/tests/src/main/kotlin/godot/tests/FuncRefTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/FuncRefTest.kt
@@ -1,75 +1,72 @@
 package godot.tests
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.annotation.RegisterSignal
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.annotation.Rpc
 import godot.core.signal0
 import godot.extensions.call
 import godot.extensions.callDeferred
 
-@RegisterClass
+@GodotScript
 class FuncRefTest : Node() {
 
-    @RegisterSignal
     val test by signal0()
 
-    @RegisterProperty
+    @GodotMember
     var blubb: Boolean = false
 
-    @RegisterProperty
+    @GodotMember
     var callFlag = false
 
-    @RegisterProperty
+    @GodotMember
     var callWithParamFlag = false
 
-    @RegisterProperty
+    @GodotMember
     var signalCallFlag = false
 
-    @RegisterFunction
+    @GodotMember
     override fun _ready() {
         test.connect(this, FuncRefTest::testSignalCallback)
     }
 
     @Rpc
-    @RegisterFunction
+    @GodotMember
     fun testSignalCallback() {
         signalCallFlag = true
     }
 
-    @RegisterFunction
+    @GodotMember
     fun testSignalCall() {
         test.emit()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun withoutParamCallback() {
         callFlag = true
     }
 
-    @RegisterFunction
+    @GodotMember
     fun testCallWithoutParam() {
         call(this::withoutParamCallback)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun testCallDeferredWithoutParam() {
         callDeferred(this::withoutParamCallback)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun withParamCallback(flag: Boolean) {
         callWithParamFlag = flag
     }
 
-    @RegisterFunction
+    @GodotMember
     fun testCallWithParam() {
         call(this::withParamCallback, true)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun testCallDeferredWithParam() {
         callDeferred(this::withParamCallback, true)
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/Invocation.kt b/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
index 7dd7855132..03931f9360 100644
--- a/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
@@ -14,14 +14,13 @@ import godot.annotation.ExpEasing
 import godot.annotation.Export
 import godot.annotation.File
 import godot.annotation.FloatRange
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.annotation.IntFlag
 import godot.annotation.IntRange
 import godot.annotation.LongRange
 import godot.annotation.MultilineText
 import godot.annotation.PlaceHolderText
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
 import godot.core.Color
 import godot.core.Dictionary
 import godot.core.NodePath
@@ -49,21 +48,18 @@ enum class TestEnum {
     ENUM_2
 }
 
-@RegisterClass
+@GodotScript
 class Invocation : Node3D() {
     @Export
-    @RegisterProperty
     lateinit var button: Button
 
     @Export
-    @RegisterProperty
     var enumList = listOf(TestEnum.ENUM_1)
 
-    @RegisterProperty
+    @GodotMember
     var vectorList = PackedVector3Array()
 
     @Export
-    @RegisterProperty
     var enumListMutable = mutableListOf(TestEnum.ENUM_1, TestEnum.ENUM_2)
 
     // Can't export nullable coretypes
@@ -78,62 +74,55 @@ class Invocation : Node3D() {
     //@RegisterProperty
     //var lateinitString: String? = null
 
-    @RegisterProperty
+    @GodotMember
     lateinit var registerObject: OtherScript
 
-    @RegisterProperty
+    @GodotMember
     var registerObjectNullable: OtherScript? = null
 
-    @RegisterProperty
+    @GodotMember
     var registerObjectNullablePreInit: OtherScript? = OtherScript()
         set(value) {
             field?.free()
             field = value
         }
 
-    @RegisterProperty
+    @GodotMember
     var registerObjectNonNullablePreInit: OtherScript = OtherScript()
         set(value) {
             field.free()
             field = value
         }
 
-    @RegisterProperty
+    @GodotMember
     var vector = Vector3()
 
     @Export
-    @RegisterProperty
     var x = 0
 
     @Export
-    @RegisterProperty
     var y = 0.0
 
     @Export
-    @RegisterProperty
     var z = 0.0f
 
     @Export
-    @RegisterProperty
     var customName = "Idonthaveanyidea"
 
     //references in default values are allowed if the property is NOT exported
     private val otherScriptReference = OtherScript()
     private fun provideOtherScriptReference() = otherScriptReference
 
-    @RegisterProperty
+    @GodotMember
     var invocation = provideOtherScriptReference()
 
     @Export
-    @RegisterProperty
     var enumTest = TestEnum.ENUM_1
 
     @Export
-    @RegisterProperty
     var resourceTest = NavigationMesh()
 
     @Export
-    @RegisterProperty
     var jvmId: Int = 0
         get() = hashCode()
         set(value) {
@@ -141,145 +130,114 @@ class Invocation : Node3D() {
         }
 
     @Export
-    @RegisterProperty
     var testArrayAny = VariantArray<Any>()
 
     @Export
-    @RegisterProperty
     var navMeshes = variantArrayOf(NavigationMesh())
 
     @Export
-    @RegisterProperty
     var nullableArray = variantArrayOf(NavigationMesh(), null)
 
     @Export
-    @RegisterProperty
     var anyToAnyDictionary = Dictionary<Any, Any>()
 
     @Export
-    @RegisterProperty
     var navMeshesDictionary = dictionaryOf("AwesomeNavmesh" to NavigationMesh())
 
     @Export
-    @RegisterProperty
     var nullableDictionary = dictionaryOf(
         "notnull" to NavigationMesh(),
         "null" to null
     )
 
     @Export
-    @RegisterProperty
     var color = Color()
 
     @Export
-    @RegisterProperty
     var rid = RID()
 
     @Export
-    @RegisterProperty
     var packedByteArray = PackedByteArray()
 
     @Export
-    @RegisterProperty
     var packedInt32Array = PackedInt32Array()
 
     @Export
-    @RegisterProperty
     var packedFloat64Array = PackedFloat64Array()
 
     @Export
-    @RegisterProperty
     var packedColorArray = PackedColorArray()
 
     @Export
-    @RegisterProperty
     var packedStringArray = PackedStringArray()
 
     @Export
-    @RegisterProperty
     var packedVector2Array = PackedVector2Array()
 
     @Export
-    @RegisterProperty
     var packedVector3Array = PackedVector3Array()
 
     @Export
-    @RegisterProperty
     @IntRange(1, 2)
     var p1 = 1
 
     @Export
-    @RegisterProperty
     @LongRange(1L, 2L)
     var p1_1 = 1L
 
     @Export
-    @RegisterProperty
     @FloatRange(1f, 2f)
     var p2 = 1f
 
     @Export
-    @RegisterProperty
     @DoubleRange(1.0, 2.0)
     var p3 = 1.0
 
     @Export
-    @RegisterProperty
     @DoubleRange(min = 1.0, max = 2.0, step = 0.1, or = Range.OR_GREATER, hideSlider = true, isDegrees = true, suffix = "MyCoolSuffix")
     var p4 = 1.0
 
     @Export
-    @RegisterProperty
     @FloatRange(1f, 2f)
     var p5 = 1f
 
     @Export
-    @RegisterProperty
     @EnumTypeHint
     var p6 = TestEnum.ENUM_1
 
     @Export
-    @RegisterProperty
     @ExpEasing
     var p7 = 1f
 
     @Export
-    @RegisterProperty
     @ExpEasing
     var p8 = 1.0
 
     @Export
-    @RegisterProperty
     @EnumFlag
     var p9 = setOf(TestEnum.ENUM_1)
 
     @Export
-    @RegisterProperty
     @EnumFlag
     var p10 = mutableSetOf(TestEnum.ENUM_1)
 
     @Export
-    @RegisterProperty
     @EnumFlag
     var p11 = mutableSetOf<TestEnum>()
 
     @Export
-    @RegisterProperty
     @IntFlag
     var p12 = 1 or 2 and 3
 
     @Export
-    @RegisterProperty
     @File
     var p13 = "someFile"
 
     @Export
-    @RegisterProperty
     @Dir
     var p14 = "someDir"
 
     @Export
-    @RegisterProperty
     @MultilineText
     var p15 = """
 		some
@@ -288,60 +246,54 @@ class Invocation : Node3D() {
 	""".trimIndent()
 
     @Export
-    @RegisterProperty
     @PlaceHolderText
     var p16 = "some placeholderText"
 
     @Export
-    @RegisterProperty
     @ColorNoAlpha
     var p17 = Color()
 
     @Export
-    @RegisterProperty
     var stringtemplation = "blubb ${17 + 25}"
 
     @Export
-    @RegisterProperty
     var testString = "Two eggs in a boiler. One says: it's hot here, isn't ? The other: oh my god, an egg talking!"
 
     @Export
-    @RegisterProperty
     var asciiString = ""
 
     @Export
-    @RegisterProperty
     var utf8String = ""
 
-    @RegisterFunction
+    @GodotMember
     fun intValue(value: Int) = value
 
-    @RegisterFunction
+    @GodotMember
     fun longValue(value: Long) = value
 
-    @RegisterFunction
+    @GodotMember
     fun floatValue(value: Float) = value
 
-    @RegisterFunction
+    @GodotMember
     fun doubleValue(value: Double) = value
 
-    @RegisterFunction
+    @GodotMember
     fun booleanValue(value: Boolean) = value
 
-    @RegisterFunction
+    @GodotMember
     fun stringValue(value: String) = value
 
-    @RegisterFunction
+    @GodotMember
     fun intAddition(a: Int, b: Int) = a + b
 
-    @RegisterFunction
+    @GodotMember
     fun initNullables() {
         registerObject = OtherScript()
         registerObjectNullable = OtherScript()
         hasInitializedLateInits = true
     }
 
-    @RegisterFunction
+    @GodotMember
     override fun _enterTree() {
         //TODO: uncomment once https://github.com/utopia-rise/godot-kotlin-jvm/issues/86 is fixed
 //        GD.print("Hello", "Hello")
@@ -355,7 +307,7 @@ class Invocation : Node3D() {
         println("CustomName is $customName")
     }
 
-    @RegisterFunction
+    @GodotMember
     override fun _ready() {
         val formerName = name
         println("Name is: $name")
@@ -400,50 +352,50 @@ class Invocation : Node3D() {
         registerObjectNonNullablePreInit.free()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun getRidId() = rid.id
 
-    @RegisterFunction
+    @GodotMember
     fun getNavMeshRid() = resourceTest.getRid()
 
-    @RegisterFunction
+    @GodotMember
     fun appendToAnyDict(key: Any, value: Any) {
         anyToAnyDictionary[key] = value
     }
 
-    @RegisterFunction
+    @GodotMember
     fun removeFromAnyDict(key: Any) {
         anyToAnyDictionary.remove(key)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun getFromAnyDict(key: Any) = anyToAnyDictionary[key]
 
-    @RegisterFunction
+    @GodotMember
     fun anyDictSize() = anyToAnyDictionary.size
 
-    @RegisterFunction
+    @GodotMember
     fun appendToStringNavMeshDict(key: String, value: NavigationMesh) {
         navMeshesDictionary[key] = value
     }
 
-    @RegisterFunction
+    @GodotMember
     fun removeFromStringNavMeshDict(key: String) {
         navMeshesDictionary.remove(key)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun getFromStringNavMeshDict(key: String) = navMeshesDictionary[key]
 
-    @RegisterFunction
+    @GodotMember
     fun stringNavMeshDictSize() = navMeshesDictionary.size
 
-    @RegisterFunction
+    @GodotMember
     fun appendToStringNavMeshNullableDict(key: String, value: NavigationMesh) {
         nullableDictionary[key] = value
     }
 
-    @RegisterFunction
+    @GodotMember
     fun removeFromStringNavMeshNullableDict(key: String) {
         nullableDictionary.remove(key)
     }
@@ -452,150 +404,150 @@ class Invocation : Node3D() {
 //	@RegisterFunction
 //	fun getFromStringNavMeshNullableDict(key: String) = nullableDictionary[key]
 
-    @RegisterFunction
+    @GodotMember
     fun stringNavMeshNullableDictSize() = nullableDictionary.size
 
-    @RegisterFunction
+    @GodotMember
     fun appendNullableStandardNavMesh() = nullableArray.append(NavigationMesh())
 
-    @RegisterFunction
+    @GodotMember
     fun appendNullableNavMesh(navigationMesh: NavigationMesh?) = nullableArray.append(navigationMesh)
 
-    @RegisterFunction
+    @GodotMember
     fun removeNullableNavMesh(navigationMesh: NavigationMesh?) = nullableArray.remove(navigationMesh)
 
-    @RegisterFunction
+    @GodotMember
     fun removeNullableNavMeshWithIndex(index: Int) = nullableArray.removeAt(index)
 
 //	TODO: This will fail to register as we cannot register nullable return type
 //	@RegisterFunction
 //	fun getNullableNavMeshFromArray(index: Int) = nullableArray[index]
 
-    @RegisterFunction
+    @GodotMember
     fun nullableNavMeshesSize() = nullableArray.size
 
-    @RegisterFunction
+    @GodotMember
     fun appendStandardNavMesh() = navMeshes.append(NavigationMesh())
 
-    @RegisterFunction
+    @GodotMember
     fun appendNavMesh(navigationMesh: NavigationMesh) = navMeshes.append(navigationMesh)
 
-    @RegisterFunction
+    @GodotMember
     fun removeNavMesh(navigationMesh: NavigationMesh) = navMeshes.remove(navigationMesh)
 
-    @RegisterFunction
+    @GodotMember
     fun removeNavMeshWithIndex(index: Int) = navMeshes.removeAt(index)
 
-    @RegisterFunction
+    @GodotMember
     fun getNavMeshFromArray(index: Int) = navMeshes[index]
 
-    @RegisterFunction
+    @GodotMember
     fun navMeshesSize() = navMeshes.size
 
-    @RegisterFunction
+    @GodotMember
     fun appendAnyToArray(any: Any) = testArrayAny.append(any)
 
-    @RegisterFunction
+    @GodotMember
     fun removeAnyFromArray(any: Any) = testArrayAny.remove(any)
 
-    @RegisterFunction
+    @GodotMember
     fun getAnyFromArray(index: Int) = testArrayAny[index]
 
-    @RegisterFunction
+    @GodotMember
     fun arrayAnySize() = testArrayAny.size
 
-    @RegisterFunction
+    @GodotMember
     fun countNameshInstance(navigationMesh: NavigationMesh) = navMeshes.count(navigationMesh)
 
-    @RegisterFunction
+    @GodotMember
     fun getNavMeshCount() = navMeshes.count()
 
     //Type cast checks
-    @RegisterFunction
+    @GodotMember
     fun parentIsNode3D() = getParent() is Node3D
 
-    @RegisterFunction
+    @GodotMember
     fun isObjectNode3D(obj: Object) = obj is Node3D
 
-    @RegisterFunction
+    @GodotMember
     fun otherJvmId(invocation: Invocation) = invocation.jvmId
 
-    @RegisterFunction
+    @GodotMember
     fun hasCameraNode() = getNodeOrNull(NodePath("Camera")) != null
 
-    @RegisterFunction
+    @GodotMember
     fun addByteToPackedArray(byte: Byte) = packedByteArray.append(byte)
 
-    @RegisterFunction
+    @GodotMember
     fun addByteArrayToPackedArray(array: PackedByteArray) = packedByteArray.appendArray(array)
 
-    @RegisterFunction
+    @GodotMember
     fun deleteByteFromPackedArray(index: Int) = packedByteArray.removeAt(index)
 
-    @RegisterFunction
+    @GodotMember
     fun getByteFromPackedArray(index: Int) = packedByteArray[index]
 
-    @RegisterFunction
+    @GodotMember
     fun setByteInPackedArray(index: Int, value: Byte) {
         packedByteArray[index] = value
     }
 
-    @RegisterFunction
+    @GodotMember
     fun resizeBytePackedArray(newSize: Int) {
         packedByteArray.resize(newSize)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun addColorToPackedArray(color: Color) = packedColorArray.append(color)
 
-    @RegisterFunction
+    @GodotMember
     fun addColorArrayToPackedArray(colorArray: PackedColorArray) = packedColorArray.appendArray(colorArray)
 
-    @RegisterFunction
+    @GodotMember
     fun deleteColorFromPackedArray(index: Int) = packedColorArray.removeAt(index)
 
-    @RegisterFunction
+    @GodotMember
     fun getColorFromPackedArray(index: Int) = packedColorArray[index]
 
-    @RegisterFunction
+    @GodotMember
     fun setColorInPackedArray(index: Int, color: Color) {
         packedColorArray[index] = color
     }
 
-    @RegisterFunction
+    @GodotMember
     fun resizeColorPackedArray(newSize: Int) {
         packedColorArray.resize(newSize)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun addIntToPackedArray(int: Int) = packedInt32Array.append(int)
 
-    @RegisterFunction
+    @GodotMember
     fun addIntArrayToPackedArray(intArray: PackedInt32Array) = this.packedInt32Array.appendArray(intArray)
 
-    @RegisterFunction
+    @GodotMember
     fun deleteIntFromPackedArray(index: Int) = packedInt32Array.removeAt(index)
 
-    @RegisterFunction
+    @GodotMember
     fun getIntFromPackedArray(index: Int) = packedInt32Array[index]
 
-    @RegisterFunction
+    @GodotMember
     fun setIntInPackedArray(index: Int, value: Int) {
         packedInt32Array[index] = value
     }
 
-    @RegisterFunction
+    @GodotMember
     fun resizeIntPackedArray(newSize: Int) {
         packedInt32Array.resize(newSize)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun addRealToPackedArray(realT: RealT) = packedFloat64Array.append(realT)
 
-    @RegisterFunction
+    @GodotMember
     fun addRealArrayToPackedArray(realArray: PackedFloat64Array) = packedFloat64Array.appendArray(realArray)
 
-    @RegisterFunction
+    @GodotMember
     fun readStringFromByteArray() {
 
         val asciiArray = testString.toByteArray(Charsets.US_ASCII)
@@ -613,94 +565,94 @@ class Invocation : Node3D() {
         utf8String = packed2.getStringFromUtf8()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun deleteRealFromPackedArray(index: Int) = packedFloat64Array.removeAt(index)
 
-    @RegisterFunction
+    @GodotMember
     fun getRealFromPackedArray(index: Int) = packedFloat64Array[index]
 
-    @RegisterFunction
+    @GodotMember
     fun setRealInPackedArray(index: Int, value: Double) {
         packedFloat64Array[index] = value
     }
 
-    @RegisterFunction
+    @GodotMember
     fun resizeRealPackedArray(newSize: Int) {
         packedFloat64Array.resize(newSize)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun addStringToPackedArray(string: String) = packedStringArray.append(string)
 
-    @RegisterFunction
+    @GodotMember
     fun addStringArrayToPackedArray(stringArray: PackedStringArray) = packedStringArray.appendArray(stringArray)
 
-    @RegisterFunction
+    @GodotMember
     fun deleteStringFromPackedArray(index: Int) = packedStringArray.removeAt(index)
 
-    @RegisterFunction
+    @GodotMember
     fun getStringFromPackedArray(index: Int) = packedStringArray[index]
 
-    @RegisterFunction
+    @GodotMember
     fun setStringInPackedArray(index: Int, value: String) {
         packedStringArray[index] = value
     }
 
-    @RegisterFunction
+    @GodotMember
     fun resizeStringPackedArray(newSize: Int) {
         packedStringArray.resize(newSize)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun addVector2ToPackedArray(vector2: Vector2) = packedVector2Array.append(vector2)
 
-    @RegisterFunction
+    @GodotMember
     fun addVector2ArrayToPackedArray(vector2Array: PackedVector2Array) = packedVector2Array.appendArray(vector2Array)
 
-    @RegisterFunction
+    @GodotMember
     fun deleteVector2FromPackedArray(index: Int) = packedVector2Array.removeAt(index)
 
-    @RegisterFunction
+    @GodotMember
     fun getVector2FromPackedArray(index: Int) = packedVector2Array[index]
 
-    @RegisterFunction
+    @GodotMember
     fun setVector2InPackedArray(index: Int, vector2: Vector2) {
         packedVector2Array[index] = vector2
     }
 
-    @RegisterFunction
+    @GodotMember
     fun resizeVector2PackedArray(newSize: Int) {
         packedVector2Array.resize(newSize)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun addVector3ToPackedArray(vector3: Vector3) = packedVector3Array.append(vector3)
 
-    @RegisterFunction
+    @GodotMember
     fun addVector3ArrayToPackedArray(vector3Array: PackedVector3Array) = packedVector3Array.appendArray(vector3Array)
 
-    @RegisterFunction
+    @GodotMember
     fun deleteVector3FromPackedArray(index: Int) = packedVector3Array.removeAt(index)
 
-    @RegisterFunction
+    @GodotMember
     fun getVector3FromPackedArray(index: Int) = packedVector3Array[index]
 
-    @RegisterFunction
+    @GodotMember
     fun setVector3InPackedArray(index: Int, vector3: Vector3) {
         packedVector3Array[index] = vector3
     }
 
-    @RegisterFunction
+    @GodotMember
     fun resizeVector3PackedArray(newSize: Int) {
         packedVector3Array.resize(newSize)
     }
 
     // Singleton tests
 
-    @RegisterFunction
+    @GodotMember
     fun isSentXrSameInstanceAsJvmSingleton(arvrServer: XRServer) =
         XRServer.getInstanceId() == arvrServer.getInstanceId()
 
-    @RegisterFunction
+    @GodotMember
     fun createVariantArrayOfUserType() = variantArrayOf<OtherScript>()
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/LambdaCallableTest.kt b/harness/tests/src/main/kotlin/godot/tests/LambdaCallableTest.kt
index b84f50b000..23abc95111 100644
--- a/harness/tests/src/main/kotlin/godot/tests/LambdaCallableTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/LambdaCallableTest.kt
@@ -1,44 +1,40 @@
 package godot.tests
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.annotation.RegisterSignal
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.Signal3
 import godot.core.asCallable
 import godot.core.connect
 import godot.core.signal0
 import godot.core.signal3
 
-@RegisterClass
+@GodotScript
 class LambdaCallableTest : Node() {
 
-    @RegisterSignal
     val signalNoParam by signal0()
 
-    @RegisterProperty
+    @GodotMember
     var hasSignalNoParamBeenTriggered = false
 
-    @RegisterSignal
     val signalWithParams: Signal3<String, Long, Node> by signal3("str", "long", "node")
 
-    @RegisterProperty
+    @GodotMember
     var signalString: String = ""
 
-    @RegisterProperty
+    @GodotMember
     var signalLong: Long = Long.MIN_VALUE
 
-    @RegisterProperty
+    @GodotMember
     lateinit var signalNode: Node
 
-    @RegisterProperty
+    @GodotMember
     var ktCallable = { str: String -> ktCallableString = str }.asCallable()
 
-    @RegisterProperty
+    @GodotMember
     var ktCallableString: String = ""
 
-    @RegisterFunction
+    @GodotMember
     override fun _ready() {
         signalNoParam.connect {
             hasSignalNoParamBeenTriggered = true
@@ -51,12 +47,12 @@ class LambdaCallableTest : Node() {
         }
     }
 
-    @RegisterFunction
+    @GodotMember
     fun emitSignalNoParam() {
         signalNoParam.emit()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun emitSignalWithParam(str: String, long: Long, node: Node) {
         signalWithParams.emit(str, long, node)
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/MultiArgsConstructorTest.kt b/harness/tests/src/main/kotlin/godot/tests/MultiArgsConstructorTest.kt
index 060c5e4f6b..5c756856f6 100644
--- a/harness/tests/src/main/kotlin/godot/tests/MultiArgsConstructorTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/MultiArgsConstructorTest.kt
@@ -3,45 +3,44 @@ package godot.tests
 import godot.NavigationMesh
 import godot.Node
 import godot.Object
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterConstructor
-import godot.annotation.RegisterProperty
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.VariantArray
 
-@RegisterClass
+@GodotScript
 class MultiArgsConstructorTest : Node {
 
-    @RegisterProperty
+    @GodotMember
     var defaultConstructorHasBeenCalled = false
 
-    @RegisterProperty
+    @GodotMember
     var oneArgConstructorHasBeenCalled = false
 
-    @RegisterProperty
+    @GodotMember
     var threeArgsConstructorHasBeenCalled = false
 
-    @RegisterConstructor
+    @GodotMember
     constructor() : super() {
         defaultConstructorHasBeenCalled = true
     }
 
-    @RegisterConstructor
+    @GodotMember
     constructor(i: Int) : this() {
         oneArgConstructorHasBeenCalled = true
     }
 
-    @RegisterConstructor
+    @GodotMember
     constructor(i: Int, s: String) : this() {
         threeArgsConstructorHasBeenCalled = true
     }
 
-    @RegisterConstructor
+    @GodotMember
     constructor(i: Int, s: String, obj: Object?) : this()
 
-    @RegisterConstructor
+    @GodotMember
     constructor(i: Int, s: String, obj: Object?, variantArray: VariantArray<Any?>) : this()
 
-    @RegisterConstructor
+    @GodotMember
     constructor(i: Int, s: String, obj: Object?, variantArray: VariantArray<Any?>?, navMesh: NavigationMesh) : this()
 
     constructor(
@@ -62,8 +61,8 @@ class MultiArgsConstructorTest : Node {
     ) : this()
 
     // constructors which should fail:
-//    @RegisterConstructor
+//    @GodotMember
 //    constructor(iShouldFailAsOverloadingIsNotSupported: String, s: String, obj: Object?, variantArray: VariantArray<Any?>?, navMesh: NavigationMesh) : this()
-//    @RegisterConstructor
+//    @GodotMember
 //    constructor(i: Int, s: Int, obj: Object?, variantArray: VariantArray<Any?>?, navMesh: NavigationMesh, tooManyArgs: String) : this()
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/args/ConstructorArgSizeTest.kt b/harness/tests/src/main/kotlin/godot/tests/args/ConstructorArgSizeTest.kt
index 6d3d810c4b..95d62b2076 100644
--- a/harness/tests/src/main/kotlin/godot/tests/args/ConstructorArgSizeTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/args/ConstructorArgSizeTest.kt
@@ -1,26 +1,23 @@
 package godot.tests.args
 
 import godot.Node
-import godot.Resource
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterConstructor
-import godot.annotation.RegisterFunction
-import godot.core.Dictionary
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.VariantArray
 import godot.core.variantArrayOf
 
-@RegisterClass
+@GodotScript
 class ConstructorArgSizeTest(): Node() {
     private val receivedConstructorArgs: VariantArray<Any> = variantArrayOf()
 
-    @RegisterConstructor
+    @GodotMember
     constructor(
         p1: String,
     ): this() {
         receivedConstructorArgs.add(p1)
     }
 
-    @RegisterConstructor
+    @GodotMember
     constructor(
         p1: String,
         p2: String,
@@ -31,7 +28,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @RegisterConstructor
+    @GodotMember
     constructor(
         p1: String,
         p2: String,
@@ -44,7 +41,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @RegisterConstructor
+    @GodotMember
     constructor(
         p1: String,
         p2: String,
@@ -59,7 +56,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @RegisterConstructor
+    @GodotMember
     constructor(
         p1: String,
         p2: String,
@@ -76,7 +73,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @RegisterConstructor
+    @GodotMember
     constructor(
         p1: String,
         p2: String,
@@ -95,7 +92,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @RegisterConstructor
+    @GodotMember
     constructor(
         p1: String,
         p2: String,
@@ -116,7 +113,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @RegisterConstructor
+    @GodotMember
     constructor(
         p1: String,
         p2: String,
@@ -139,7 +136,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @RegisterFunction
+    @GodotMember
     fun getReceivedConstructorArgs(): VariantArray<Any> {
         return receivedConstructorArgs
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/args/FunctionArgSizeTest.kt b/harness/tests/src/main/kotlin/godot/tests/args/FunctionArgSizeTest.kt
index e196fd781d..e4d40574a1 100644
--- a/harness/tests/src/main/kotlin/godot/tests/args/FunctionArgSizeTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/args/FunctionArgSizeTest.kt
@@ -1,22 +1,20 @@
 package godot.tests.args
 
 import godot.Node
-import godot.Resource
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.core.Dictionary
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.VariantArray
 import godot.core.variantArrayOf
 
-@RegisterClass
+@GodotScript
 class FunctionArgSizeTest : Node() {
 
-    @RegisterFunction
+    @GodotMember
     fun arg0(): VariantArray<Any> {
         return variantArrayOf()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg1(
         p1: String,
     ): VariantArray<Any> {
@@ -25,7 +23,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg2(
         p1: String,
         p2: String,
@@ -36,7 +34,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg3(
         p1: String,
         p2: String,
@@ -49,7 +47,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg4(
         p1: String,
         p2: String,
@@ -64,7 +62,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg5(
         p1: String,
         p2: String,
@@ -81,7 +79,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg6(
         p1: String,
         p2: String,
@@ -100,7 +98,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg7(
         p1: String,
         p2: String,
@@ -121,7 +119,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg8(
         p1: String,
         p2: String,
@@ -144,7 +142,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg9(
         p1: String,
         p2: String,
@@ -169,7 +167,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg10(
         p1: String,
         p2: String,
@@ -196,7 +194,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg11(
         p1: String,
         p2: String,
@@ -225,7 +223,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg12(
         p1: String,
         p2: String,
@@ -256,7 +254,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg13(
         p1: String,
         p2: String,
@@ -289,7 +287,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg14(
         p1: String,
         p2: String,
@@ -324,7 +322,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg15(
         p1: String,
         p2: String,
@@ -361,7 +359,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @RegisterFunction
+    @GodotMember
     fun arg16(
         p1: String,
         p2: String,
diff --git a/harness/tests/src/main/kotlin/godot/tests/binding/BindingA.kt b/harness/tests/src/main/kotlin/godot/tests/binding/BindingA.kt
index 68312354cb..b4fedeb422 100644
--- a/harness/tests/src/main/kotlin/godot/tests/binding/BindingA.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/binding/BindingA.kt
@@ -2,8 +2,8 @@ package godot.tests.binding
 
 
 import godot.Node
-import godot.annotation.RegisterClass
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class BindingA : Node() {
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/binding/BindingB.kt b/harness/tests/src/main/kotlin/godot/tests/binding/BindingB.kt
index 31a6ad5717..fdd842890e 100644
--- a/harness/tests/src/main/kotlin/godot/tests/binding/BindingB.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/binding/BindingB.kt
@@ -1,8 +1,8 @@
 package godot.tests.binding
 
 import godot.Node
-import godot.annotation.RegisterClass
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class BindingB : Node() {
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/binding/BindingTest.kt b/harness/tests/src/main/kotlin/godot/tests/binding/BindingTest.kt
index d01bb631db..5b9de96b32 100644
--- a/harness/tests/src/main/kotlin/godot/tests/binding/BindingTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/binding/BindingTest.kt
@@ -1,12 +1,12 @@
 package godot.tests.binding
 
 import godot.Object
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class BindingTest : Object() {
-    @RegisterFunction
+    @GodotMember
     fun getClassName(obj: Object) = obj::class.simpleName
 }
 
diff --git a/harness/tests/src/main/kotlin/godot/tests/callable/CallableMethodBindTest.kt b/harness/tests/src/main/kotlin/godot/tests/callable/CallableMethodBindTest.kt
index 3c760e7234..2475053a36 100644
--- a/harness/tests/src/main/kotlin/godot/tests/callable/CallableMethodBindTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/callable/CallableMethodBindTest.kt
@@ -1,40 +1,39 @@
 package godot.tests.callable
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.NativeCallable
 import godot.core.VariantArray
 import godot.core.variantArrayOf
 import godot.global.GD
 
-@RegisterClass
+@GodotScript
 class CallableMethodBindTest: Node() {
-    @RegisterProperty
+    @GodotMember
     var methodBinds: VariantArray<Int> = variantArrayOf(-1, -1, -1)
 
-    @RegisterFunction
+    @GodotMember
     fun callWithMethodWithAllBinds() {
         NativeCallable(this, CallableMethodBindTest::readySignalMethodBindTest).bind(1, 2, 3).call()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun callWithMethodWithTwoBinds() {
         NativeCallable(this, CallableMethodBindTest::readySignalMethodBindTest).bind(2, 3).call(0)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun callWithMethodWithOneBind() {
         NativeCallable(this, CallableMethodBindTest::readySignalMethodBindTest).bind(3).call(0, 0)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun callWithMethodWithNoBind() {
         NativeCallable(this, CallableMethodBindTest::readySignalMethodBindTest).bind().call(0, 0, 0)
     }
 
-    @RegisterFunction
+    @GodotMember
     fun readySignalMethodBindTest(a: Int, b: Int, c: Int) {
         GD.print("Called with args: $a, $b, $c")
         methodBinds = variantArrayOf(a, b, c)
diff --git a/harness/tests/src/main/kotlin/godot/tests/constructor/ConstructorRegistrationTest.kt b/harness/tests/src/main/kotlin/godot/tests/constructor/ConstructorRegistrationTest.kt
index f956afddec..ed74ac295e 100644
--- a/harness/tests/src/main/kotlin/godot/tests/constructor/ConstructorRegistrationTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/constructor/ConstructorRegistrationTest.kt
@@ -1,14 +1,14 @@
 package godot.tests.constructor
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterConstructor
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.Dictionary
 import godot.core.VariantArray
 
-@RegisterClass
+@GodotScript
 class ConstructorRegistrationTest(): Node() {
 
-    @RegisterConstructor
+    @GodotMember
     constructor(param1: Dictionary<Any, Any?>, param2: VariantArray<Long>): this()
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/coretypes/BasisTest.kt b/harness/tests/src/main/kotlin/godot/tests/coretypes/BasisTest.kt
index bf3395df34..14715a9c04 100644
--- a/harness/tests/src/main/kotlin/godot/tests/coretypes/BasisTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/coretypes/BasisTest.kt
@@ -1,35 +1,35 @@
 package godot.tests.coretypes
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.Basis
 import godot.core.Quaternion
 import godot.core.Vector3
 
-@RegisterClass
+@GodotScript
 class BasisTest : Node() {
 
-    @RegisterFunction
+    @GodotMember
     fun getFromBasis(basis: Basis, index: Int) = basis[index]
 
-    @RegisterFunction
+    @GodotMember
     fun setInBasis(basis: Basis, index: Int, vector3: Vector3): Basis {
         basis[index] = vector3
         return basis
     }
 
-    @RegisterFunction
+    @GodotMember
     fun getRotationQuat(basis: Basis): Quaternion {
         return basis.getRotationQuaternion()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun newJvmBasis(): Basis {
         return Basis()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun isEqualApproxJvm(a: Basis, b: Basis): Boolean {
         return a.isEqualApprox(b)
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/coretypes/StringTest.kt b/harness/tests/src/main/kotlin/godot/tests/coretypes/StringTest.kt
index 51543b3925..ce7107ccfc 100644
--- a/harness/tests/src/main/kotlin/godot/tests/coretypes/StringTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/coretypes/StringTest.kt
@@ -1,13 +1,12 @@
 package godot.tests.coretypes
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.core.StringName
-import godot.core.asStringName
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.Vector2
+import godot.core.asStringName
 
-@RegisterClass
+@GodotScript
 class StringTest : Node() {
 
     private val _shortString = "Short String"
@@ -46,35 +45,35 @@ class StringTest : Node() {
         """.trimIndent()
 
 
-    @RegisterFunction
+    @GodotMember
     fun identity(str: String) = str
 
-    @RegisterFunction
+    @GodotMember
     fun fillTheBuffer(str1: String, str2: String, str3: String, str4: String, str5: String): Boolean {
         return true
     }
 
-    @RegisterFunction
+    @GodotMember
     fun mixStringAndVariant(i1: Int, str1: String, vec: Vector2, str2: String, f1: Float): Boolean {
         return true
     }
 
-    @RegisterFunction
+    @GodotMember
     fun getShortString() = _shortString
 
-    @RegisterFunction
+    @GodotMember
     fun getLongestShortString() = _longestShortString
 
-    @RegisterFunction
+    @GodotMember
     fun getShortestLongString() = _shortestLongString
 
-    @RegisterFunction
+    @GodotMember
     fun getLongString() = _longString
   
-    @RegisterFunction
+    @GodotMember
     fun getLength(str: String) = str.length
 
-    @RegisterFunction
+    @GodotMember
     fun getAsStringName(str: String) = str.asStringName()
 
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/coretypes/Vector3Test.kt b/harness/tests/src/main/kotlin/godot/tests/coretypes/Vector3Test.kt
index 6b13eac73b..c126a31560 100644
--- a/harness/tests/src/main/kotlin/godot/tests/coretypes/Vector3Test.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/coretypes/Vector3Test.kt
@@ -1,18 +1,18 @@
 package godot.tests.coretypes
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.Vector3
 import godot.common.util.RealT
 
-@RegisterClass
+@GodotScript
 class Vector3Test : Node() {
 
-    @RegisterFunction
+    @GodotMember
     fun getFromVector3(vector3: Vector3, index: Int) = vector3[index]
 
-    @RegisterFunction
+    @GodotMember
     fun setInVector3(vector3: Vector3, index: Int, realT: RealT): Vector3 {
         vector3[index] = realT
         return vector3
diff --git a/harness/tests/src/main/kotlin/godot/tests/coroutine/CoroutineTest.kt b/harness/tests/src/main/kotlin/godot/tests/coroutine/CoroutineTest.kt
index e279554dbc..bcbb84da38 100644
--- a/harness/tests/src/main/kotlin/godot/tests/coroutine/CoroutineTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/coroutine/CoroutineTest.kt
@@ -4,10 +4,8 @@ package godot.tests.coroutine
 import godot.Object
 import godot.PackedScene
 import godot.ResourceLoader
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.annotation.RegisterSignal
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.Vector2
 import godot.core.signal0
 import godot.core.signal1
@@ -15,55 +13,53 @@ import godot.core.signal4
 import godot.coroutines.await
 import godot.coroutines.awaitLoadAs
 import godot.coroutines.awaitMainThread
+import godot.coroutines.godotCoroutine
 import godot.coroutines.awaitPhysicsFrame
 import godot.coroutines.awaitProcessFrame
 import godot.coroutines.godotCoroutine
 import godot.global.GD
 import kotlinx.coroutines.CoroutineStart
 
-@RegisterClass
+@GodotScript
 class CoroutineTest : Object() {
 
-    @RegisterSignal
     val signalWithoutParameter by signal0()
 
-    @RegisterSignal
     val signalWithOneParameter by signal1<Int>("int")
 
-    @RegisterSignal
     val signalWithManyParameters by signal4<Int, Float, Vector2, String>("int", "float", "vector2", "string")
 
-    @RegisterProperty
+    @GodotMember
     var step: Int = 0
 
-    @RegisterFunction
+    @GodotMember
     fun startCoroutineWithoutParameter() = godotCoroutine {
         step = 1
         signalWithoutParameter.await()
         step = 2
     }
 
-    @RegisterFunction
+    @GodotMember
     fun startCoroutineWithOneParameter() = godotCoroutine {
         step = 3
         step = signalWithOneParameter.await()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun startCoroutineWithManyParameters() = godotCoroutine {
         step = 5
         val (int, _, _, _) = signalWithManyParameters.await()
         step = int
     }
 
-    @RegisterFunction
+    @GodotMember
     fun startCoroutineUndispatched() = godotCoroutine(start = CoroutineStart.UNDISPATCHED) {
         step = 7
         signalWithoutParameter.await()
         step = 8
     }
 
-    @RegisterFunction
+    @GodotMember
     fun startCoroutineWithPhysicsFrame() = godotCoroutine(start = CoroutineStart.UNDISPATCHED) {
         step = 9
         awaitPhysicsFrame {
@@ -71,7 +67,7 @@ class CoroutineTest : Object() {
         }
     }
 
-    @RegisterFunction
+    @GodotMember
     fun startCoroutineWithProcessFrame() = godotCoroutine(start = CoroutineStart.UNDISPATCHED) {
         step = 11
         awaitProcessFrame {
@@ -82,7 +78,7 @@ class CoroutineTest : Object() {
     @RegisterSignal
     val runOnMainThreadFromBackgroundThreadFinished by signal1<Boolean>("is_test_successful")
 
-    @RegisterFunction
+    @GodotMember
     fun runOnMainThreadFromBackgroundThread() {
         val thread = Thread.currentThread().name
 
@@ -109,10 +105,9 @@ class CoroutineTest : Object() {
         }
     }
 
-    @RegisterSignal
     val asyncLoadResourceFinished by signal1<Boolean>("is_test_successful")
 
-    @RegisterFunction
+    @GodotMember
     fun asyncLoadResource() {
         godotCoroutine {
             val resource = ResourceLoader.awaitLoadAs<PackedScene>("res://Spatial.tscn") { progress ->
diff --git a/harness/tests/src/main/kotlin/godot/tests/exception/ExceptionTest.kt b/harness/tests/src/main/kotlin/godot/tests/exception/ExceptionTest.kt
index b79bad523c..e4d35ecec6 100644
--- a/harness/tests/src/main/kotlin/godot/tests/exception/ExceptionTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/exception/ExceptionTest.kt
@@ -1,13 +1,13 @@
 package godot.tests.exception
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class ExceptionTest: Node() {
 
-    @RegisterFunction
+    @GodotMember
     fun throwException() {
         throw RuntimeException("Test exception")
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/freeform/FreeformRegistrationFileTestClass.kt b/harness/tests/src/main/kotlin/godot/tests/freeform/FreeformRegistrationFileTestClass.kt
index a808079ce8..4c88c62a0e 100644
--- a/harness/tests/src/main/kotlin/godot/tests/freeform/FreeformRegistrationFileTestClass.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/freeform/FreeformRegistrationFileTestClass.kt
@@ -1,11 +1,11 @@
 package godot.tests.freeform
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class FreeformRegistrationFileTestClass: Node() {
-    @RegisterFunction
+    @GodotMember
     fun greeting(): String = "Hello from class with freely moved registration file"
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceChild.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceChild.kt
index 480e9a89ee..d9322d08a4 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceChild.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceChild.kt
@@ -1,27 +1,24 @@
 package godot.tests.inheritance
 
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.annotation.RegisterSignal
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.signal2
 
-@RegisterClass
+@GodotScript
 class AbstractClassInheritanceChild : AbstractClassInheritanceParent() {
 
-    @RegisterSignal
     override val testOverridden by signal2<String, Int>("blubb", "habbalubbb")
 
     //---------------- Here to check ------------------
 
-    @RegisterProperty
+    @GodotMember
     var childOpenFunctionHasBeenCalled = false
 
     //-------------------------------------------------
 
     override var openVar: Int = 100
 
-    @RegisterFunction
+    @GodotMember
     override fun openFunction() {
         childOpenFunctionHasBeenCalled = true
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceEmptyChild.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceEmptyChild.kt
index dc1c6c2313..05f0a808de 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceEmptyChild.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceEmptyChild.kt
@@ -1,7 +1,7 @@
 package godot.tests.inheritance
 
-import godot.annotation.RegisterClass
+import godot.annotation.GodotScript
 
 // issue: https://github.com/utopia-rise/godot-kotlin-jvm/issues/365
-@RegisterClass
+@GodotScript
 class AbstractClassInheritanceEmptyChild: AbstractClassInheritanceEmptyParent()
diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceParent.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceParent.kt
index 114310e7ce..b7e5622739 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceParent.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceParent.kt
@@ -2,9 +2,7 @@ package godot.tests.inheritance
 
 import godot.Node
 import godot.annotation.Export
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.annotation.RegisterSignal
+import godot.annotation.GodotMember
 import godot.core.signal1
 import godot.core.signal2
 
@@ -12,33 +10,30 @@ import godot.core.signal2
 abstract class AbstractClassInheritanceParent : Node() {
 
     @Export
-    @RegisterProperty
     var registeredExportedPropertyInParent = false
 
-    @RegisterSignal
     val testNotOverridden by signal1<String>("blubb")
 
-    @RegisterSignal
     open val testOverridden  by signal2<String, Int>("blubb", "habbalubb")
 
     //---------------- Here to check ------------------
 
-    @RegisterProperty
+    @GodotMember
     var closedFunctionHasBeenCalled = false
 
     //-------------------------------------------------
 
-    @RegisterProperty
+    @GodotMember
     var closedVar = 0
 
-    @RegisterProperty
+    @GodotMember
     open var openVar = 0
 
-    @RegisterFunction
+    @GodotMember
     fun closedFunction() {
         closedFunctionHasBeenCalled = true
     }
 
-    @RegisterFunction
+    @GodotMember
     abstract fun openFunction()
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt
index c7822adfcc..5d837bdf94 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt
@@ -1,33 +1,30 @@
 package godot.tests.inheritance
 
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.annotation.RegisterSignal
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.signal2
 import godot.global.GD
 
-@RegisterClass
+@GodotScript
 class ClassInheritanceChild : ClassInheritanceParent() {
 
-    @RegisterSignal
     override val testOverridden  by signal2<String, Int>("blubb", "habbalubbb")
 
     //---------------- Here to check ------------------
 
-    @RegisterProperty
+    @GodotMember
     var childOpenFunctionHasBeenCalled = false
 
     //-------------------------------------------------
 
     override var openVar: Int = 100
 
-    @RegisterFunction
+    @GodotMember
     override fun openFunction() {
         childOpenFunctionHasBeenCalled = true
     }
 
-    @RegisterFunction
+    @GodotMember
     override fun _notification() = godotNotification {
         GD.print("Called ClassInheritanceChild::_notification on $this with $it")
         notificationCallBitFlag += notificationCallBitFlag or 2
diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
index 0480fd4506..c04de81f6e 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
@@ -1,54 +1,49 @@
 package godot.tests.inheritance
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.annotation.RegisterSignal
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.GodotNotification
 import godot.core.signal1
 import godot.core.signal2
 import godot.global.GD
 
-@RegisterClass
+@GodotScript
 open class ClassInheritanceParent : Node() {
 
-    @RegisterSignal
     val testNotOverridden by signal1<String>("blubb")
 
-    @RegisterSignal
     open val testOverridden by signal2<String, Int>("blubb", "habbalubb")
 
     //---------------- Here to check ------------------
 
-    @RegisterProperty
+    @GodotMember
     var closedFunctionHasBeenCalled = false
 
-    @RegisterProperty
+    @GodotMember
     var parentOpenFunctionHasBeenCalled = false
 
     //-------------------------------------------------
 
-    @RegisterProperty
+    @GodotMember
     var closedVar = 0
 
-    @RegisterProperty
+    @GodotMember
     open var openVar = 0
 
-    @RegisterFunction
+    @GodotMember
     fun closedFunction() {
         closedFunctionHasBeenCalled = true
     }
 
-    @RegisterFunction
+    @GodotMember
     open fun openFunction() {
         parentOpenFunctionHasBeenCalled = true
     }
 
-    @RegisterProperty
+    @GodotMember
     var notificationCallBitFlag = 0
 
-    @RegisterFunction
     override fun _notification(): GodotNotification = godotNotification {
         GD.print("Called ClassInheritanceParent::_notification on $this with $it")
         notificationCallBitFlag = notificationCallBitFlag or 1
diff --git a/harness/tests/src/main/kotlin/godot/tests/instance/NodeInstance.kt b/harness/tests/src/main/kotlin/godot/tests/instance/NodeInstance.kt
index 7e3ffc8b08..67301deff0 100644
--- a/harness/tests/src/main/kotlin/godot/tests/instance/NodeInstance.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/instance/NodeInstance.kt
@@ -1,8 +1,8 @@
 package godot.tests.instance
 
 import godot.Node
-import godot.annotation.RegisterClass
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class NodeInstance : Node() {
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/instance/ObjectInstance.kt b/harness/tests/src/main/kotlin/godot/tests/instance/ObjectInstance.kt
index 7763a1e3d1..b4cfdf9626 100644
--- a/harness/tests/src/main/kotlin/godot/tests/instance/ObjectInstance.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/instance/ObjectInstance.kt
@@ -1,9 +1,9 @@
 package godot.tests.instance
 
 import godot.Object
-import godot.annotation.RegisterClass
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class ObjectInstance : Object() {
 }
 
diff --git a/harness/tests/src/main/kotlin/godot/tests/instance/RefCountedInstance.kt b/harness/tests/src/main/kotlin/godot/tests/instance/RefCountedInstance.kt
index cf7c480ed9..bb054328a7 100644
--- a/harness/tests/src/main/kotlin/godot/tests/instance/RefCountedInstance.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/instance/RefCountedInstance.kt
@@ -1,8 +1,8 @@
 package godot.tests.instance
 
 import godot.RefCounted
-import godot.annotation.RegisterClass
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class RefCountedInstance : RefCounted() {
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/packedarray/PackedArrayTest.kt b/harness/tests/src/main/kotlin/godot/tests/packedarray/PackedArrayTest.kt
index 2989c29763..0f5e276b24 100644
--- a/harness/tests/src/main/kotlin/godot/tests/packedarray/PackedArrayTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/packedarray/PackedArrayTest.kt
@@ -1,72 +1,72 @@
 package godot.tests.packedarray
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.PackedByteArray
 import godot.core.PackedFloat32Array
 import godot.core.PackedFloat64Array
 import godot.core.PackedInt32Array
 import godot.core.PackedInt64Array
 
-@RegisterClass
+@GodotScript
 class PackedArrayTest : Node() {
 
-    @RegisterFunction
+    @GodotMember
     fun convertByteArray() : PackedByteArray {
         val arr = byteArrayOf(0, 1, 2, 4, 8, 16, 32, 64, 127)
         return PackedByteArray(arr);
     }
 
-    @RegisterFunction
+    @GodotMember
     fun convertIntArray() : PackedInt32Array {
         val arr = intArrayOf(0, 1, 2, 4, 8, 16, 32, 64, 127)
         return PackedInt32Array(arr);
     }
 
-    @RegisterFunction
+    @GodotMember
     fun convertLongArray() : PackedInt64Array {
         val arr = longArrayOf(0L, 1L, 2L, 4L, 8L, 16L, 32L, 64L, 127L)
         return PackedInt64Array(arr);
     }
 
-    @RegisterFunction
+    @GodotMember
     fun convertFloatArray() : PackedFloat32Array {
         val arr = floatArrayOf(0f, 1f, 2f, 4f, 8f, 16f, 32f, 64f, 127f)
         return PackedFloat32Array(arr);
     }
 
-    @RegisterFunction
+    @GodotMember
     fun convertDoubleArray() : PackedFloat64Array {
         val arr = doubleArrayOf(0.0, 1.0, 2.0, 4.0, 8.0, 16.0, 32.0, 64.0, 127.0)
         return PackedFloat64Array(arr);
     }
 
-    @RegisterFunction
+    @GodotMember
     fun getByteArrayValue(arr: PackedByteArray, index: Int) : Byte {
         val kotlinArr = arr.toByteArray()
         return kotlinArr[index];
     }
 
-    @RegisterFunction
+    @GodotMember
     fun getIntArrayValue(arr: PackedInt32Array, index: Int) : Int {
         val kotlinArr = arr.toIntArray()
         return kotlinArr[index];
     }
 
-    @RegisterFunction
+    @GodotMember
     fun getLongArrayValue(arr: PackedInt64Array, index: Int) : Long {
         val kotlinArr = arr.toLongArray()
         return kotlinArr[index];
     }
 
-    @RegisterFunction
+    @GodotMember
     fun getFloatArrayValue(arr: PackedFloat32Array, index: Int) : Float {
         val kotlinArr = arr.toFloatArray()
         return kotlinArr[index];
     }
 
-    @RegisterFunction
+    @GodotMember
     fun getDoubleArrayValue(arr: PackedFloat64Array, index: Int) : Double {
         val kotlinArr = arr.toDoubleArray()
         return kotlinArr[index];
diff --git a/harness/tests/src/main/kotlin/godot/tests/reflection/BaseReflectionTest.kt b/harness/tests/src/main/kotlin/godot/tests/reflection/BaseReflectionTest.kt
index df5ff0436c..5163bea9f3 100644
--- a/harness/tests/src/main/kotlin/godot/tests/reflection/BaseReflectionTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/reflection/BaseReflectionTest.kt
@@ -1,15 +1,15 @@
 package godot.tests.reflection
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import kotlin.reflect.full.hasAnnotation
 
-@RegisterClass
+@GodotScript
 class BaseReflectionTest: Node() {
 
-    @RegisterFunction
+    @GodotMember
     fun hasRegisterClassAnnotation(): Boolean {
-        return BaseReflectionTest::class.hasAnnotation<RegisterClass>()
+        return BaseReflectionTest::class.hasAnnotation<GodotScript>()
     }
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/reflection/GH571_ReflectionTest.kt b/harness/tests/src/main/kotlin/godot/tests/reflection/GH571_ReflectionTest.kt
index dd090823b1..b333122956 100644
--- a/harness/tests/src/main/kotlin/godot/tests/reflection/GH571_ReflectionTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/reflection/GH571_ReflectionTest.kt
@@ -3,12 +3,12 @@ package godot.tests.reflection
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 
 
 @Suppress("ClassName")
-@RegisterClass
+@GodotScript
 class GH571_ReflectionTest: Node() {
 
     private val testJsonString = """
@@ -23,7 +23,7 @@ class GH571_ReflectionTest: Node() {
         val data: String,
     )
 
-    @RegisterFunction
+    @GodotMember
     fun deserializeJson(): String {
         val mapper = jacksonObjectMapper()
         val testClass = mapper.readValue(testJsonString, object : TypeReference<TestClass>() {})
diff --git a/harness/tests/src/main/kotlin/godot/tests/registration/TypedVariantArrayRegistration.kt b/harness/tests/src/main/kotlin/godot/tests/registration/TypedVariantArrayRegistration.kt
index 9451fcceb7..467ea15d59 100644
--- a/harness/tests/src/main/kotlin/godot/tests/registration/TypedVariantArrayRegistration.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/registration/TypedVariantArrayRegistration.kt
@@ -4,23 +4,19 @@ import godot.Button
 import godot.Node
 import godot.Texture
 import godot.annotation.Export
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterProperty
+import godot.annotation.GodotScript
 import godot.core.VariantArray
 import godot.core.variantArrayOf
 
-@RegisterClass
+@GodotScript
 class TypedVariantArrayRegistration: Node() {
 
     @Export
-    @RegisterProperty
     var intVariantArray: VariantArray<Int> = variantArrayOf()
 
     @Export
-    @RegisterProperty
     var buttonVariantArray: VariantArray<Button> = variantArrayOf()
 
     @Export
-    @RegisterProperty
     var textureVariantArray: VariantArray<Texture> = variantArrayOf()
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/rpctests/RpcTests.kt b/harness/tests/src/main/kotlin/godot/tests/rpctests/RpcTests.kt
index f0a0e330b6..ef6cd14e35 100644
--- a/harness/tests/src/main/kotlin/godot/tests/rpctests/RpcTests.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/rpctests/RpcTests.kt
@@ -1,25 +1,23 @@
 package godot.tests.rpctests
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.annotation.Rpc
 import godot.annotation.Sync
 
-@RegisterClass("RPCTests")
+@GodotScript("RPCTests")
 class RpcTests : Node() {
 
-    @RegisterProperty
+    @GodotMember
     var remoteSyncCalled: Boolean = false
 
     @Rpc(sync = Sync.SYNC)
-    @RegisterFunction
     fun remoteSyncTest(called: Boolean) {
         remoteSyncCalled = called
     }
 
-    @RegisterFunction
+    @GodotMember
     fun triggerFunctionRemoteSyncCall() {
         rpc(::remoteSyncTest, true)
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/signal/SignalTest.kt b/harness/tests/src/main/kotlin/godot/tests/signal/SignalTest.kt
index e1971b7587..277b8a7b61 100644
--- a/harness/tests/src/main/kotlin/godot/tests/signal/SignalTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/signal/SignalTest.kt
@@ -1,10 +1,8 @@
 package godot.tests.signal
 
 import godot.Node
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.annotation.RegisterSignal
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.Signal0
 import godot.core.Signal1
 import godot.core.Signal2
@@ -17,33 +15,24 @@ import godot.core.signal1
 import godot.core.signal2
 import godot.tests.subpackage.OtherScript
 
-@RegisterClass
+@GodotScript
 class SignalTest : Node() {
-    @RegisterSignal
     val noParamSignalDelegate by signal0()
 
-    @RegisterSignal
     val oneParamSignalDelegate by signal1<Boolean>("refresh")
 
-    @RegisterSignal
     val twoParamSignalDelegate by signal2<String, SignalTest>("str", "inv")
 
-
-    @RegisterSignal
     val noParamSignalField = Signal0("noParamSignalField")
 
-    @RegisterSignal
     val oneParamSignalField = Signal1<Boolean>("oneParamSignalField","refresh")
 
-    @RegisterSignal
     val twoParamSignalField = Signal2<String, SignalTest>("twoParamSignalField","str", "inv")
 
-    @RegisterProperty
+    @GodotMember
     var otherScript = OtherScript()
 
-    @RegisterFunction
     override fun _ready() {
-
         noParamSignalDelegate.connect(otherScript, OtherScript::hookNoParam)
         oneParamSignalDelegate.connect(otherScript, OtherScript::hookOneParam)
         twoParamSignalDelegate.connect(otherScript, OtherScript::hookTwoParam)
@@ -76,14 +65,13 @@ class SignalTest : Node() {
     }
 
 
-    @RegisterSignal
     val signalWithMultipleTargets by signal1<Vector2>("vector2")
 
     //To store values emitted by signals
-    @RegisterProperty
+    @GodotMember
     var array: VariantArray<Vector2> = VariantArray()
 
-    @RegisterFunction
+    @GodotMember
     fun targetFunctionOne(vector2: Vector2) {
         array.append(vector2)
         //call GodotAPI to insert different parameters in the stack.
@@ -95,7 +83,7 @@ class SignalTest : Node() {
     }
 
 
-    @RegisterFunction
+    @GodotMember
     fun targetFunctionTwo(vector2: Vector2) {
         array.append(vector2)
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/static/CallStaticTest.kt b/harness/tests/src/main/kotlin/godot/tests/static/CallStaticTest.kt
index 47bca4e6ba..ef643a5215 100644
--- a/harness/tests/src/main/kotlin/godot/tests/static/CallStaticTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/static/CallStaticTest.kt
@@ -3,14 +3,13 @@ package godot.tests.static
 import godot.DirAccess
 import godot.Node
 import godot.ProjectSettings
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.core.Color
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class CallStaticTest: Node() {
 
-    @RegisterFunction
+    @GodotMember
     fun testStaticCall(): Boolean {
         return DirAccess.dirExistsAbsolute(ProjectSettings.globalizePath("res://scripts"))
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/subpackage/OtherScript.kt b/harness/tests/src/main/kotlin/godot/tests/subpackage/OtherScript.kt
index be5558887a..aebb7f496c 100644
--- a/harness/tests/src/main/kotlin/godot/tests/subpackage/OtherScript.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/subpackage/OtherScript.kt
@@ -1,23 +1,22 @@
 package godot.tests.subpackage
 
 import godot.Node
-import godot.Node3D
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 
-@RegisterClass
+@GodotScript
 class OtherScript : Node() {
-    @RegisterFunction
+    @GodotMember
     fun hookNoParam() {
         println("Hook was called with no param.")
     }
 
-    @RegisterFunction
+    @GodotMember
     fun hookOneParam(b: Boolean) {
         println("Hook was called with parameter: $b")
     }
 
-    @RegisterFunction
+    @GodotMember
     fun hookTwoParam(str: String, inv: Node) {
         println("Hook was called with parameters: $str, $inv")
     }
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/LateinitPropertyCheck.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/LateinitPropertyCheck.kt
index 4f0c452388..7eccf72bae 100644
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/LateinitPropertyCheck.kt
+++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/LateinitPropertyCheck.kt
@@ -2,8 +2,6 @@ package godot.entrygenerator.checks
 
 import godot.entrygenerator.ext.isCoreType
 import godot.entrygenerator.ext.isGodotPrimitive
-import godot.entrygenerator.model.ExportAnnotation
-import godot.entrygenerator.model.RegisterPropertyAnnotation
 import godot.entrygenerator.model.SourceFile
 import godot.entrygenerator.utils.Logger
 
@@ -13,7 +11,6 @@ class LateinitPropertyCheck(logger: Logger, sourceFiles: List<SourceFile>): Base
         sourceFiles
             .flatMap { it.registeredClasses }
             .flatMap { it.properties }
-            .filter { registeredProperty -> registeredProperty.annotations.filterIsInstance<RegisterPropertyAnnotation>().isNotEmpty() }
             .forEach { exportedProperty ->
                 if (exportedProperty.isLateinit && (exportedProperty.type.isCoreType() || exportedProperty.type.isGodotPrimitive())) {
                     hasIssue = true
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/NullablePropertyCheck.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/NullablePropertyCheck.kt
index 44a4596cdd..8f9638af52 100644
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/NullablePropertyCheck.kt
+++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/NullablePropertyCheck.kt
@@ -2,7 +2,6 @@ package godot.entrygenerator.checks
 
 import godot.entrygenerator.ext.isCoreType
 import godot.entrygenerator.ext.isGodotPrimitive
-import godot.entrygenerator.model.RegisterPropertyAnnotation
 import godot.entrygenerator.model.SourceFile
 import godot.entrygenerator.utils.Logger
 
@@ -12,7 +11,6 @@ class NullablePropertyCheck(logger: Logger, sourceFiles: List<SourceFile>): Base
         sourceFiles
             .flatMap { it.registeredClasses }
             .flatMap { it.properties }
-            .filter { registeredProperty -> registeredProperty.annotations.filterIsInstance<RegisterPropertyAnnotation>().isNotEmpty() }
             .forEach { exportedProperty ->
                 if (exportedProperty.type.isNullable && (exportedProperty.type.isCoreType() || exportedProperty.type.isGodotPrimitive())) {
                     hasIssue = true
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/PropertyMutablilityCheck.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/PropertyMutablilityCheck.kt
index 3bac62e47e..a30c382a9a 100644
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/PropertyMutablilityCheck.kt
+++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/PropertyMutablilityCheck.kt
@@ -1,6 +1,5 @@
 package godot.entrygenerator.checks
 
-import godot.entrygenerator.model.RegisterPropertyAnnotation
 import godot.entrygenerator.model.SourceFile
 import godot.entrygenerator.utils.Logger
 
@@ -10,7 +9,6 @@ class PropertyMutablilityCheck(logger: Logger, sourceFiles: List<SourceFile>): B
         sourceFiles
             .flatMap { it.registeredClasses }
             .flatMap { it.properties }
-            .filter { registeredProperty -> registeredProperty.annotations.filterIsInstance<RegisterPropertyAnnotation>().isNotEmpty() }
             .forEach { registeredProperty ->
                 if (!registeredProperty.isMutable) {
                     hasIssue = true
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/PropertyTypeCheck.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/PropertyTypeCheck.kt
index bfe067fd11..1362463d99 100644
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/PropertyTypeCheck.kt
+++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/checks/PropertyTypeCheck.kt
@@ -6,7 +6,6 @@ import godot.entrygenerator.ext.isGodotPrimitive
 import godot.entrygenerator.ext.isKotlinCollection
 import godot.entrygenerator.ext.isNodeType
 import godot.entrygenerator.ext.isRefCounted
-import godot.entrygenerator.model.RegisterPropertyAnnotation
 import godot.entrygenerator.model.SourceFile
 import godot.entrygenerator.utils.Logger
 
@@ -16,9 +15,6 @@ class PropertyTypeCheck(logger: Logger, sourceFiles: List<SourceFile>) : BaseChe
         sourceFiles
             .flatMap { it.registeredClasses }
             .flatMap { it.properties }
-            .filter { registeredProperty ->
-                registeredProperty.annotations.filterIsInstance<RegisterPropertyAnnotation>().isNotEmpty()
-            }
             .forEach { exportedProperty ->
                 if (
                     !exportedProperty.type.isGodotPrimitive()
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/ConstructorRegistrationGenerator.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/ConstructorRegistrationGenerator.kt
index 52d11d8ab0..318b4d7d73 100644
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/ConstructorRegistrationGenerator.kt
+++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/ConstructorRegistrationGenerator.kt
@@ -2,10 +2,8 @@ package godot.entrygenerator.generator
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.FunSpec
-import godot.entrygenerator.ext.hasAnnotation
 import godot.entrygenerator.ext.toKtVariantType
 import godot.entrygenerator.ext.toTypeName
-import godot.entrygenerator.model.RegisterConstructorAnnotation
 import godot.entrygenerator.model.RegisteredClass
 import godot.tools.common.constants.godotCorePackage
 
@@ -15,8 +13,7 @@ object ConstructorRegistrationGenerator {
         registeredClass
             .constructors
             .filter { registeredConstructor ->
-                registeredConstructor.parameters.isEmpty() ||
-                    registeredConstructor.annotations.hasAnnotation<RegisterConstructorAnnotation>()
+                registeredConstructor.parameters.isEmpty()
             }
             .forEach { registeredConstructor ->
                 val ctorParamsCount = registeredConstructor.parameters.size
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/GodotMemberAnnotation.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/GodotMemberAnnotation.kt
new file mode 100644
index 0000000000..1b51fd98ac
--- /dev/null
+++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/GodotMemberAnnotation.kt
@@ -0,0 +1,3 @@
+package godot.entrygenerator.model
+
+class GodotMemberAnnotation(override val symbolProcessorSource: Any) : FunctionAnnotation
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterClassAnnotation.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/GodotScriptAnnotation.kt
similarity index 79%
rename from kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterClassAnnotation.kt
rename to kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/GodotScriptAnnotation.kt
index d5df5ae3d5..c8a00ff714 100644
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterClassAnnotation.kt
+++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/GodotScriptAnnotation.kt
@@ -1,6 +1,6 @@
 package godot.entrygenerator.model
 
-data class RegisterClassAnnotation(
+data class GodotScriptAnnotation(
     val customName: String? = null,
     override val symbolProcessorSource: Any
 ) : ClassAnnotation
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterConstructorAnnotation.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterConstructorAnnotation.kt
deleted file mode 100644
index c90db69e1c..0000000000
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterConstructorAnnotation.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package godot.entrygenerator.model
-
-class RegisterConstructorAnnotation(override val symbolProcessorSource: Any) : ConstructorAnnotation
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterFunctionAnnotation.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterFunctionAnnotation.kt
deleted file mode 100644
index 7b0870ccea..0000000000
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterFunctionAnnotation.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package godot.entrygenerator.model
-
-class RegisterFunctionAnnotation(override val symbolProcessorSource: Any) : FunctionAnnotation
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterPropertyAnnotation.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterPropertyAnnotation.kt
deleted file mode 100644
index c38c8210d3..0000000000
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterPropertyAnnotation.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package godot.entrygenerator.model
-
-class RegisterPropertyAnnotation(override val symbolProcessorSource: Any) : PropertyAnnotation
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterSignalAnnotation.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterSignalAnnotation.kt
deleted file mode 100644
index 928fd37bcf..0000000000
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/RegisterSignalAnnotation.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package godot.entrygenerator.model
-
-class RegisterSignalAnnotation(override val symbolProcessorSource: Any) : PropertyAnnotation
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/GodotKotlinSymbolProcessor.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/GodotKotlinSymbolProcessor.kt
index 3348644978..7cc9849f00 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/GodotKotlinSymbolProcessor.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/GodotKotlinSymbolProcessor.kt
@@ -53,7 +53,7 @@ class GodotKotlinSymbolProcessor(
             settings = provideSettingsFromArguments()
         }
 
-        val currentProcessingRound = ProcessingRound.values().getOrNull(processingRound)
+        val currentProcessingRound = ProcessingRound.entries.getOrNull(processingRound)
             ?: return emptyList<KSAnnotated>().also {
                 kspLogger.warn("Unexpected processing round: $processingRound. Only expecting ${ProcessingRound.values().size} rounds. No op.")
             }
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt
new file mode 100644
index 0000000000..259cc15d96
--- /dev/null
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt
@@ -0,0 +1,33 @@
+package godot.annotation.processor.ext
+
+import com.google.devtools.ksp.isAnnotationPresent
+import com.google.devtools.ksp.symbol.KSAnnotated
+import com.google.devtools.ksp.symbol.KSAnnotation
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
+import kotlin.reflect.KClass
+
+fun <T : Annotation> KSAnnotated.hasAnnotation(annotationClass: KClass<T>): Boolean {
+    return isAnnotationPresent(annotationClass) || annotations
+        .any { ksAnnotation ->
+            ksAnnotation
+                .annotationType
+                .resolve()
+                .declaration
+                .annotations
+                .any { it.hasAnnotation(annotationClass) }
+        }
+}
+
+fun <T : Annotation> KSAnnotation.hasAnnotation(annotationClass: KClass<T>): Boolean {
+    return this.fqNameUnsafe == annotationClass.qualifiedName || this
+        .annotationType
+        .annotations
+        .toList()
+        .any { it.hasAnnotation(annotationClass) }
+}
+
+fun KSAnnotated.hasRegistrationAnnotation(): Boolean {
+    return hasAnnotation(GodotScript::class)
+        || hasAnnotation(GodotMember::class)
+}
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt
index 78daf22c9e..2930136254 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt
@@ -12,14 +12,11 @@ import godot.annotation.EnumFlag
 import godot.annotation.EnumTypeHint
 import godot.annotation.ExpEasing
 import godot.annotation.Export
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.annotation.IntFlag
 import godot.annotation.MultilineText
 import godot.annotation.PlaceHolderText
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterConstructor
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.annotation.RegisterSignal
 import godot.annotation.Rpc
 import godot.annotation.Tool
 import godot.entrygenerator.model.ColorNoAlphaHintAnnotation
@@ -30,16 +27,13 @@ import godot.entrygenerator.model.ExportAnnotation
 import godot.entrygenerator.model.FileHintAnnotation
 import godot.entrygenerator.model.GodotAnnotation
 import godot.entrygenerator.model.GodotBaseTypeAnnotation
+import godot.entrygenerator.model.GodotMemberAnnotation
+import godot.entrygenerator.model.GodotScriptAnnotation
 import godot.entrygenerator.model.IntFlagHintAnnotation
 import godot.entrygenerator.model.MultilineTextHintAnnotation
 import godot.entrygenerator.model.PlaceHolderTextHintAnnotation
 import godot.entrygenerator.model.Range
 import godot.entrygenerator.model.RangeHintAnnotation
-import godot.entrygenerator.model.RegisterClassAnnotation
-import godot.entrygenerator.model.RegisterConstructorAnnotation
-import godot.entrygenerator.model.RegisterFunctionAnnotation
-import godot.entrygenerator.model.RegisterPropertyAnnotation
-import godot.entrygenerator.model.RegisterSignalAnnotation
 import godot.entrygenerator.model.RpcAnnotation
 import godot.entrygenerator.model.RpcMode
 import godot.entrygenerator.model.Sync
@@ -92,14 +86,11 @@ internal val KSAnnotation.rpcChannel: Int
 
 internal fun KSAnnotation.mapToAnnotation(parentDeclaration: KSDeclaration): GodotAnnotation? {
     return when (fqNameUnsafe) {
-        RegisterClass::class.qualifiedName -> RegisterClassAnnotation(
+        GodotScript::class.qualifiedName -> GodotScriptAnnotation(
             customName = arguments.first().value as? String,
             symbolProcessorSource = this
         )
-        RegisterConstructor::class.qualifiedName -> RegisterConstructorAnnotation(this)
-        RegisterFunction::class.qualifiedName -> RegisterFunctionAnnotation(this)
-        RegisterProperty::class.qualifiedName -> RegisterPropertyAnnotation(this)
-        RegisterSignal::class.qualifiedName -> RegisterSignalAnnotation(this)
+        GodotMember::class.qualifiedName -> GodotMemberAnnotation(this)
         Tool::class.qualifiedName -> ToolAnnotation(this)
         Export::class.qualifiedName -> ExportAnnotation(this)
         Rpc::class.qualifiedName -> RpcAnnotation(
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
index 6f9b12e546..cb6bd97620 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
@@ -6,10 +6,10 @@ import com.google.devtools.ksp.getDeclaredProperties
 import com.google.devtools.ksp.isAbstract
 import com.google.devtools.ksp.isPublic
 import com.google.devtools.ksp.symbol.KSClassDeclaration
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterConstructor
-import godot.annotation.RegisterProperty
-import godot.annotation.RegisterSignal
+import com.google.devtools.ksp.symbol.KSFunctionDeclaration
+import com.google.devtools.ksp.symbol.KSPropertyDeclaration
+import godot.annotation.GodotApiMember
+import godot.annotation.GodotMember
 import godot.annotation.processor.Settings
 import godot.entrygenerator.model.ClassAnnotation
 import godot.entrygenerator.model.Clazz
@@ -17,6 +17,8 @@ import godot.entrygenerator.model.RegisteredClass
 import godot.entrygenerator.model.RegisteredFunction
 import godot.entrygenerator.model.RegisteredProperty
 import godot.entrygenerator.model.RegisteredSignal
+import godot.tools.common.constants.GodotKotlinJvmTypes
+import godot.tools.common.constants.godotCorePackage
 import java.io.File
 
 internal fun KSClassDeclaration.mapToClazz(
@@ -34,6 +36,9 @@ internal fun KSClassDeclaration.mapToClazz(
         .toList()
 
     val registeredFunctions = getAllFunctions()
+        .filter { function ->
+            function.hasAnnotation(GodotMember::class) || function.overridesApiFunction()
+        }
         .mapNotNull { it.mapToRegisteredFunction(this, settings) }
         .toList()
 
@@ -41,8 +46,7 @@ internal fun KSClassDeclaration.mapToClazz(
     val allProperties = getAllProperties()
     val registeredProperties = allProperties
         .filter { property ->
-            property.annotations.any { it.fqNameUnsafe == RegisterProperty::class.qualifiedName } ||
-                property.findOverridee()?.annotations?.any { it.fqNameUnsafe == RegisterProperty::class.qualifiedName } == true
+            property.hasRegistrationAnnotation() || property.overridesRegisteredProperty()
         }
         .map {
             it.mapToRegisteredProperty(settings)
@@ -50,12 +54,19 @@ internal fun KSClassDeclaration.mapToClazz(
         .toList()
     val registeredSignals = allProperties
         .filter { property ->
-            property.annotations.any { it.fqNameUnsafe == RegisterSignal::class.qualifiedName }
+            property
+                .type
+                .resolve()
+                .declaration
+                .qualifiedName
+                ?.asString()
+                ?.startsWith("$godotCorePackage.${GodotKotlinJvmTypes.signal}") == true
+                && !property.hasAnnotation(GodotApiMember::class)
         }
         .map { it.mapToRegisteredSignal(declaredProperties.toList(), settings) }
         .toList()
 
-    val shouldBeRegistered = annotations.any { it.fqNameUnsafe == RegisterClass::class.qualifiedName } ||
+    val shouldBeRegistered = hasRegistrationAnnotation() ||
         isAbstractAndContainsRegisteredMembers(registeredFunctions, registeredProperties, registeredSignals) ||
         isAbstractAndInheritsGodotBaseClass()
 
@@ -67,7 +78,7 @@ internal fun KSClassDeclaration.mapToClazz(
         val registeredConstructors = getConstructors()
             .filter { it.isPublic() }
             .filter { constructor ->
-                constructor.annotations.any { it.fqNameUnsafe == RegisterConstructor::class.qualifiedName } ||
+                constructor.hasAnnotation(GodotMember::class) ||
                     constructor.parameters.isEmpty()
             }
             .map { it.mapToRegisteredConstructor(settings) }
@@ -122,3 +133,24 @@ internal fun KSClassDeclaration.isAbstractAndInheritsGodotBaseClass(): Boolean {
                 .any { annotation -> annotation.fqNameUnsafe == "godot.annotation.GodotBaseType" }
         }
 }
+
+private fun KSFunctionDeclaration.overridesApiFunction(isOveridee: Boolean = false): Boolean {
+    return if (hasAnnotation(GodotApiMember::class) && !isOveridee) {
+        // when we retrieve all functions from KSP, KSP adds the override modifier to all functions not declared in the current class
+        // hence if we are in the first recursion, we are coming from the current class. If any function here contains the `GodotApiMember`
+        // annotation, it means, it was added by KSP for us, and it is no function we need to register
+        false
+    } else {
+        val overridee = (findOverridee() as? KSFunctionDeclaration) ?: return false
+
+        if (overridee.hasAnnotation(GodotApiMember::class)) {
+            return true
+        } else {
+            return overridee.overridesApiFunction(true)
+        }
+    }
+}
+
+private fun KSPropertyDeclaration.overridesRegisteredProperty(): Boolean {
+    return hasAnnotation(GodotMember::class) || findOverridee()?.overridesRegisteredProperty() == true
+}
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksDeclarationExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksDeclarationExt.kt
index aec457fc0a..10636f24d7 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksDeclarationExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksDeclarationExt.kt
@@ -4,9 +4,17 @@ import com.google.devtools.ksp.symbol.KSClassDeclaration
 
 fun KSClassDeclaration.hasCompilationErrors(): Boolean = superTypes
     .toList()
-    .any { superTypeDeclaration -> superTypeDeclaration.resolve().isError }
-    || this.asStarProjectedType().isError
-    || this.getAllProperties().any { property -> property.type.resolve().isError }
-    || this.getAllFunctions().any { function ->
-        function.returnType?.resolve()?.isError == true || function.parameters.any { param -> param.type.resolve().isError }
-    }
+    .any { superTypeDeclaration ->
+        superTypeDeclaration.resolve().isError
+    } ||
+    this.asStarProjectedType().isError ||
+    this.getAllProperties().any { property ->
+        property.type.resolve().isError
+            || property.annotations.any { it.annotationType.resolve().isError }
+    } ||
+    this.getAllFunctions().any { function ->
+        function.returnType?.resolve()?.isError == true
+            || function.parameters.any { param -> param.type.resolve().isError }
+            || function.annotations.any { it.annotationType.resolve().isError }
+    } ||
+    this.annotations.any { it.annotationType.resolve().isError }
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksFunctionDeclarationExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksFunctionDeclarationExt.kt
index a33fa47aca..1aa45afaa7 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksFunctionDeclarationExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksFunctionDeclarationExt.kt
@@ -3,7 +3,6 @@ package godot.annotation.processor.ext
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSFunctionDeclaration
 import com.google.devtools.ksp.symbol.Modifier
-import godot.annotation.RegisterFunction
 import godot.annotation.processor.Settings
 import godot.entrygenerator.model.ConstructorAnnotation
 import godot.entrygenerator.model.FunctionAnnotation
@@ -32,20 +31,16 @@ internal fun KSFunctionDeclaration.mapToRegisteredFunction(
     currentClass: KSClassDeclaration,
     settings: Settings,
 ): RegisteredFunction? {
-    return if (annotations.any { it.fqNameUnsafe == RegisterFunction::class.qualifiedName }) {
-        val fqName = requireNotNull(qualifiedName?.asString()) {
-            "Qualified name for a registered function declaration cannot be null"
-        }
-        val parameters = parameters.map { it.mapToValueParameter(settings) }
-        val annotations = annotations.mapNotNull { it.mapToAnnotation(this) as? FunctionAnnotation }
-        RegisteredFunction(
-            fqName = fqName,
-            isOverridee = this.modifiers.contains(Modifier.OVERRIDE),
-            isDeclaredInThisClass = parentDeclaration == currentClass,
-            parameters = parameters,
-            returnType = returnType?.mapToType(settings),
-            annotations = annotations.toList(),
-            symbolProcessorSource = this
-        )
-    } else null
+    val fqName = qualifiedName?.asString() ?: return null
+    val parameters = parameters.map { it.mapToValueParameter(settings) }
+    val annotations = annotations.mapNotNull { it.mapToAnnotation(this) as? FunctionAnnotation }
+    return RegisteredFunction(
+        fqName = fqName,
+        isOverridee = this.modifiers.contains(Modifier.OVERRIDE),
+        isDeclaredInThisClass = parentDeclaration == currentClass,
+        parameters = parameters,
+        returnType = returnType?.mapToType(settings),
+        annotations = annotations.toList(),
+        symbolProcessorSource = this
+    )
 }
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksTypeReferenceExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksTypeReferenceExt.kt
index 229c76f3d1..4d5c2efb76 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksTypeReferenceExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksTypeReferenceExt.kt
@@ -6,7 +6,7 @@ import com.google.devtools.ksp.symbol.KSDeclaration
 import com.google.devtools.ksp.symbol.KSType
 import com.google.devtools.ksp.symbol.KSTypeAlias
 import com.google.devtools.ksp.symbol.KSTypeReference
-import godot.annotation.RegisterClass
+import godot.annotation.GodotScript
 import godot.annotation.processor.Settings
 import godot.entrygenerator.model.Type
 import godot.entrygenerator.model.TypeKind
@@ -56,10 +56,10 @@ internal fun KSType.provideRegisteredClassName(
 internal fun KSDeclaration.provideRegisteredClassName(
     settings: Settings,
 ): String? {
-    val registerClassAnnotation = annotations
-        .firstOrNull { it.fqNameUnsafe == RegisterClass::class.qualifiedName }
+    val godotScriptAnnotation = annotations
+        .firstOrNull { it.fqNameUnsafe == GodotScript::class.qualifiedName }
 
-    val customName = registerClassAnnotation
+    val customName = godotScriptAnnotation
         ?.arguments
         ?.first()
         ?.value as? String
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt
index 22dcc6c796..51a73d2e54 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt
@@ -3,34 +3,23 @@ package godot.annotation.processor.visitor
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSFile
 import com.google.devtools.ksp.symbol.KSVisitorVoid
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterConstructor
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
-import godot.annotation.RegisterSignal
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.annotation.processor.Settings
-import godot.annotation.processor.ext.fqNameUnsafe
 import godot.annotation.processor.ext.hasCompilationErrors
+import godot.annotation.processor.ext.hasRegistrationAnnotation
 import godot.annotation.processor.ext.mapToClazz
 import godot.entrygenerator.model.RegisteredClass
 import godot.entrygenerator.model.SourceFile
 
 /**
- * Collects [RegisterClass], [RegisterConstructor], [RegisterFunction], [RegisterProperty], [RegisterSignal] annotations
+ * Collects [GodotScript], [RegisterConstructor], [GodotMember], [RegisterProperty], [RegisterSignal] annotations
  * for registrar generation and entry generation
  */
 internal class RegistrationAnnotationVisitor(
     private val settings: Settings,
 ) : KSVisitorVoid() {
 
-    private val registerAnnotations = listOf(
-        RegisterClass::class.qualifiedName!!,
-        RegisterConstructor::class.qualifiedName!!,
-        RegisterFunction::class.qualifiedName!!,
-        RegisterProperty::class.qualifiedName!!,
-        RegisterSignal::class.qualifiedName!!
-    )
-
     private val _registeredClassToKSFileMap: MutableMap<RegisteredClass, KSFile> = mutableMapOf()
     val registeredClassToKSFileMap: Map<RegisteredClass, KSFile> = _registeredClassToKSFileMap
 
@@ -53,7 +42,7 @@ internal class RegistrationAnnotationVisitor(
                             } else null
                         }
                     }
-                    else -> if (declaration.annotations.any { registerAnnotations.contains(it.fqNameUnsafe) }) {
+                    else -> if (declaration.hasRegistrationAnnotation()) {
                         throw IllegalStateException("${declaration.qualifiedName} was registered top level. Only classes can be registered top level.")
                     } else {
                         null
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt b/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt
index 5097a38b5a..9f3f2685a8 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt
@@ -10,4 +10,5 @@ package godot.annotation
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class Export
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/GodotApiMember.kt b/kt/godot-library/src/main/kotlin/godot/annotation/GodotApiMember.kt
index 0906a77007..f14cc52a95 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/GodotApiMember.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/GodotApiMember.kt
@@ -7,4 +7,4 @@ package godot.annotation
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
-internal annotation class GodotApiMember
+annotation class GodotApiMember
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/GodotMember.kt b/kt/godot-library/src/main/kotlin/godot/annotation/GodotMember.kt
new file mode 100644
index 0000000000..a3de93f6c4
--- /dev/null
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/GodotMember.kt
@@ -0,0 +1,17 @@
+package godot.annotation
+
+/**
+ * Registeres a member in godot so it can be called through another language or from godot
+ *
+ * You can only register functions that receive and return either primitives, Objects derived from Godot classes or Objects wrapped
+ * in `Variant` and properties with those types.
+ */
+@Target(
+    AnnotationTarget.FUNCTION,
+    AnnotationTarget.PROPERTY,
+    AnnotationTarget.FIELD,
+    AnnotationTarget.CONSTRUCTOR,
+    AnnotationTarget.ANNOTATION_CLASS
+)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class GodotMember
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/GodotScript.kt b/kt/godot-library/src/main/kotlin/godot/annotation/GodotScript.kt
new file mode 100644
index 0000000000..b0edab1589
--- /dev/null
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/GodotScript.kt
@@ -0,0 +1,10 @@
+package godot.annotation
+
+/**
+ * Registeres a class in godot so it can be used from another language or from godot
+ *
+ * @param customName Register the class name with this string rather than with `fully_qualified_ClassName`. **Note:** If this class name is already registered, a compilation error will be thrown! So make sure your custom class name is unique!
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class GodotScript(val customName: String = "")
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/RegisterClass.kt b/kt/godot-library/src/main/kotlin/godot/annotation/RegisterClass.kt
deleted file mode 100644
index 85221ca4e7..0000000000
--- a/kt/godot-library/src/main/kotlin/godot/annotation/RegisterClass.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package godot.annotation
-
-/**
- * Registeres a class in godot so it can be used from another language or from godot
- *
- * @param className Register the class name with this string rather than with `fully_qualified_ClassName`. **Note:** If this class name is already registered, a compilation error will be thrown! So make sure your custom class name is unique!
- */
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class RegisterClass(val className: String = "")
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/RegisterConstructor.kt b/kt/godot-library/src/main/kotlin/godot/annotation/RegisterConstructor.kt
deleted file mode 100644
index 4b8a1af307..0000000000
--- a/kt/godot-library/src/main/kotlin/godot/annotation/RegisterConstructor.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package godot.annotation
-
-/**
- * Registeres a constructor in godot so it can be used from another language
- */
-@Target(AnnotationTarget.CONSTRUCTOR)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class RegisterConstructor
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/RegisterFunction.kt b/kt/godot-library/src/main/kotlin/godot/annotation/RegisterFunction.kt
deleted file mode 100644
index e674feb545..0000000000
--- a/kt/godot-library/src/main/kotlin/godot/annotation/RegisterFunction.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package godot.annotation
-
-/**
- * Registeres a function in godot so it can be called through another language or from godot
- *
- * **Note:** Engine functions like `_ready` also need to be annotated with this annotation in order to work
- *
- * Also you can only register functions that receive and return either primitives, Objects derived from Godot classes or Objects wrapped in `Variant`
- */
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class RegisterFunction
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/RegisterProperty.kt b/kt/godot-library/src/main/kotlin/godot/annotation/RegisterProperty.kt
deleted file mode 100644
index 6cd446da93..0000000000
--- a/kt/godot-library/src/main/kotlin/godot/annotation/RegisterProperty.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package godot.annotation
-
-/**
- * Registeres a property in godot so it can be used from another language or from godot
- *
- * **Note:** If a property is registered. Only compile time constant assignments can be used. If this is not possible you have to use lateinit and set the value either in the constructor or in `_ready`
- */
-@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class RegisterProperty
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/RegisterSignal.kt b/kt/godot-library/src/main/kotlin/godot/annotation/RegisterSignal.kt
deleted file mode 100644
index d5b3915a0a..0000000000
--- a/kt/godot-library/src/main/kotlin/godot/annotation/RegisterSignal.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package godot.annotation
-
-
-/**
- * Registeres a signal to make it usable
- *
- * **Note:** Properties annotated with this signal have to have the prefix `signal` and have to be assigned through one of the signal delegates.
- *
- * A signal without the delegate, without the prefix or without this annotation WILL NOT WORK.
- *
- * The `signal` prefix is dropped during registration: `signalReverseChanged` becomes `reverseChanged` in Godot
- *
- * Use the signals `connect` method to register receivers in a typesafe way.
- */
-@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class RegisterSignal
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/Rpc.kt b/kt/godot-library/src/main/kotlin/godot/annotation/Rpc.kt
index 5e36cffaef..3f43d53478 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/Rpc.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/Rpc.kt
@@ -11,6 +11,7 @@ package godot.annotation
  */
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class Rpc(
     val rpcMode: RpcMode = RpcMode.AUTHORITY,
     val sync: Sync = Sync.NO_SYNC,
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt b/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt
index a75895e1b4..35f3bfd300 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt
@@ -4,7 +4,7 @@ package godot.annotation
 /**
  * Mark a class as tool class.
  *
- * The class needs to have the @[RegisterClass] annotation added as well
+ * The class needs to have the @[GodotScript] annotation added as well
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/propertyHintAnnotations.kt b/kt/godot-library/src/main/kotlin/godot/annotation/propertyHintAnnotations.kt
index 6934f5df3b..13b7bbad3c 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/propertyHintAnnotations.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/propertyHintAnnotations.kt
@@ -14,6 +14,7 @@ The following annotations are implemented based on https://github.com/godotengin
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class IntRange(
     val min: Int,
     val max: Int,
@@ -31,6 +32,7 @@ annotation class IntRange(
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class LongRange(
     val min: Long,
     val max: Long,
@@ -48,6 +50,7 @@ annotation class LongRange(
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class FloatRange(
     val min: Float,
     val max: Float,
@@ -65,6 +68,7 @@ annotation class FloatRange(
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class DoubleRange(
     val min: Double,
     val max: Double,
@@ -82,6 +86,7 @@ annotation class DoubleRange(
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class EnumTypeHint
 
 /**
@@ -89,6 +94,7 @@ annotation class EnumTypeHint
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class ExpEasing(val attenuation: Boolean = false, val isPositiveOnly: Boolean = true)
 
 /**
@@ -96,6 +102,7 @@ annotation class ExpEasing(val attenuation: Boolean = false, val isPositiveOnly:
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class Lenght(val lenght: Int = -1)
 
 /**
@@ -107,6 +114,7 @@ annotation class ExpEasing(val attenuation: Boolean = false, val isPositiveOnly:
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class EnumFlag
 
 /**
@@ -116,6 +124,7 @@ annotation class EnumFlag
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class IntFlag(vararg val names: String)
 
 /**
@@ -123,6 +132,7 @@ annotation class IntFlag(vararg val names: String)
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class Layers2DRender
 
 /**
@@ -130,6 +140,7 @@ annotation class IntFlag(vararg val names: String)
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class Layers2DPhysics
 
 /**
@@ -137,6 +148,7 @@ annotation class IntFlag(vararg val names: String)
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class Layers3DRender
 
 /**
@@ -144,6 +156,7 @@ annotation class IntFlag(vararg val names: String)
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class Layers3DPhysics
 
 /**
@@ -151,6 +164,7 @@ annotation class IntFlag(vararg val names: String)
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class File(vararg val extensions: String = [], val global: Boolean = false)
 
 /**
@@ -158,6 +172,7 @@ annotation class File(vararg val extensions: String = [], val global: Boolean =
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class Dir(val global: Boolean = false)
 
 /**
@@ -165,6 +180,7 @@ annotation class Dir(val global: Boolean = false)
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class MultilineText
 
 /**
@@ -172,6 +188,7 @@ annotation class MultilineText
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class PlaceHolderText
 
 /**
@@ -179,6 +196,7 @@ annotation class PlaceHolderText
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotMember
 annotation class ColorNoAlpha
 
 /**
@@ -186,6 +204,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class ImageCompressLossy
 
 /**
@@ -193,6 +212,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class ImageCompressLossLess
 
 /**
@@ -200,6 +220,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class ObjectId
 
 /**
@@ -207,6 +228,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class TypeString(val baseTypeAsString: String)
 
 /**
@@ -214,6 +236,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class NodePathToEditedNode
 
 /**
@@ -221,6 +244,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class MethodOfVariantType
 
 /**
@@ -228,6 +252,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class MethodOfBaseType
 
 /**
@@ -235,6 +260,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class MethodOfInstance
 
 /**
@@ -242,6 +268,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class MethodOfScript
 
 /**
@@ -249,6 +276,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class PropertyOfVariantType
 
 /**
@@ -256,6 +284,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class PropertyOfBaseType
 
 /**
@@ -263,6 +292,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class PropertyOfInstance
 
 /**
@@ -270,10 +300,12 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class PropertyOfScript
 
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class ObjectTooBig
 
 /**
@@ -281,6 +313,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class NodePathValidTypes
 
 /**
@@ -288,6 +321,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class SaveFile(vararg val extensions: String = [])
 
 /**
@@ -295,6 +329,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class IntIsObjectId
 
 /**
@@ -302,4 +337,5 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
+//@GodotMember
 //annotation class Max
diff --git a/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt b/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt
index 464de127fc..000cb99961 100644
--- a/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt
+++ b/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt
@@ -89,11 +89,11 @@ abstract class KtObject: IdentityPointer {
     @JvmName("godotNotification")
     protected fun <T : KtObject> javaGodotNotification(obj: T, block: T.(Int) -> Unit) = obj.godotNotification(block)
 
-    @Suppress("FunctionName")
     /**
      * Called automatically when the Object is destroyed. Note that this method is not available for RefCounted or any of its child class.
      * By the time a RefCounted counter reaches 0, its JVM instance has already being GCed and can't be used anymore.
      */
+    @Suppress("FunctionName")
     open fun _onDestroy() = Unit
 
     fun free() {

From 1768f06410abbcd0315e9e9ee2fd411d57830089 Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sat, 12 Oct 2024 23:08:52 +0200
Subject: [PATCH 04/18] Update checks

---
 .../main/java/godot/tests/JavaTestClass.java  |   1 -
 .../src/main/kotlin/godot/tests/Invocation.kt |   2 -
 .../processor/ext/ksAnnotationExt.kt          | 146 +++++++++++++-----
 .../processor/ext/ksClassDeclarationExt.kt    |   3 +-
 .../processor/ext/ksFunctionDeclarationExt.kt |   7 +-
 .../processor/ext/ksPropertyDeclarationExt.kt |   9 +-
 .../main/kotlin/godot/annotation/Export.kt    |   6 +-
 .../annotation/propertyHintAnnotations.kt     |  72 ++++-----
 .../annotator/clazz/RegisterClassAnnotator.kt |  24 ++-
 .../function/RegisterFunctionAnnotator.kt     |  40 +----
 .../property/PropertyHintAnnotationChecker.kt |  38 -----
 .../property/RegisterPropertiesAnnotator.kt   |  22 +--
 .../reference/CallFunctionReferenceChecker.kt |   4 +-
 .../reference/RpcFunctionReferenceChecker.kt  |   4 +-
 .../SignalFunctionReferenceChecker.kt         |   4 +-
 .../signal/RegisterSignalAnnotator.kt         |   8 +-
 .../intellij/plugin/data/model/annotations.kt |   9 +-
 .../plugin/extension/ktClassExtensions.kt     |   6 +-
 .../godot/intellij/plugin/extension/ktPsi.kt  |  13 ++
 .../intellij/plugin/extension/psiClass.kt     |   5 +-
 .../plugin/extension/psiElementExt.kt         |  19 +++
 .../linemarker/RegisteredNameLineMarker.kt    | 132 ++++++++++++++--
 .../plugin/listener/PsiTreeListener.kt        |   4 +-
 .../quickfix/ClassNotRegisteredQuickFix.kt    |   6 +-
 .../quickfix/FunctionNotRegisteredQuickFix.kt |  21 ---
 .../quickfix/PropertyNotExportedQuickFix.kt   |  27 ----
 .../quickfix/PropertyNotRegisteredQuickFix.kt |  27 ----
 .../PropertyRemoveExportAnnotationQuickFix.kt |  24 ---
 .../RegisterSignalInitializerQuickFix.kt      |   4 +-
 .../TargetFunctionNotRegisteredQuickFix.kt    |   4 +-
 .../TargetPropertyNotRegisteredQuickFix.kt    |  26 ----
 .../messages/generalLabels.properties         |   9 --
 .../godot/tools/common/constants/Classes.kt   |   7 +-
 33 files changed, 349 insertions(+), 384 deletions(-)
 create mode 100644 kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
 delete mode 100644 kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/FunctionNotRegisteredQuickFix.kt
 delete mode 100644 kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyNotExportedQuickFix.kt
 delete mode 100644 kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyNotRegisteredQuickFix.kt
 delete mode 100644 kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyRemoveExportAnnotationQuickFix.kt
 delete mode 100644 kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/TargetPropertyNotRegisteredQuickFix.kt

diff --git a/harness/tests/src/main/java/godot/tests/JavaTestClass.java b/harness/tests/src/main/java/godot/tests/JavaTestClass.java
index 74a9070f32..5ddf4511b2 100644
--- a/harness/tests/src/main/java/godot/tests/JavaTestClass.java
+++ b/harness/tests/src/main/java/godot/tests/JavaTestClass.java
@@ -72,7 +72,6 @@ public String greeting() {
 
     public NativeCallable methodCallable = Callable.create(this, StringNames.asStringName("DummyName"));
 
-    @GodotMember
     @Override
     public void _ready() {
         // Check if Singletons have the correct syntax, without Single.INSTANCE
diff --git a/harness/tests/src/main/kotlin/godot/tests/Invocation.kt b/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
index 03931f9360..458b082109 100644
--- a/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
@@ -293,7 +293,6 @@ class Invocation : Node3D() {
         hasInitializedLateInits = true
     }
 
-    @GodotMember
     override fun _enterTree() {
         //TODO: uncomment once https://github.com/utopia-rise/godot-kotlin-jvm/issues/86 is fixed
 //        GD.print("Hello", "Hello")
@@ -307,7 +306,6 @@ class Invocation : Node3D() {
         println("CustomName is $customName")
     }
 
-    @GodotMember
     override fun _ready() {
         val formerName = name
         println("Name is: $name")
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt
index 2930136254..2390c384c0 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt
@@ -84,23 +84,37 @@ internal val KSAnnotation.rpcTransferModeEnum: TransferMode
 internal val KSAnnotation.rpcChannel: Int
     get() = (arguments.firstOrNull { it.name?.asString() == "transferChannel" }?.value ?: arguments[3].value) as Int
 
-internal fun KSAnnotation.mapToAnnotation(parentDeclaration: KSDeclaration): GodotAnnotation? {
+internal fun KSAnnotation.mapToAnnotation(parentDeclaration: KSDeclaration): List<GodotAnnotation> {
     return when (fqNameUnsafe) {
-        GodotScript::class.qualifiedName -> GodotScriptAnnotation(
-            customName = arguments.first().value as? String,
-            symbolProcessorSource = this
+        GodotScript::class.qualifiedName -> listOf(
+            GodotScriptAnnotation(
+                customName = arguments.first().value as? String,
+                symbolProcessorSource = this
+            )
+        )
+        GodotMember::class.qualifiedName -> listOf(
+            GodotMemberAnnotation(this)
+        )
+        Tool::class.qualifiedName -> listOf(
+            ToolAnnotation(this)
+        )
+        Export::class.qualifiedName -> listOf(
+            ExportAnnotation(this),
+            GodotMemberAnnotation(this),
+        )
+        Rpc::class.qualifiedName -> listOf(
+            RpcAnnotation(
+                rpcMode = rpcModeEnum,
+                sync = rpcSyncEnum,
+                transferMode = rpcTransferModeEnum,
+                transferChannel = rpcChannel,
+                symbolProcessorSource = this
+            ),
+            GodotMemberAnnotation(this),
         )
-        GodotMember::class.qualifiedName -> GodotMemberAnnotation(this)
-        Tool::class.qualifiedName -> ToolAnnotation(this)
-        Export::class.qualifiedName -> ExportAnnotation(this)
-        Rpc::class.qualifiedName -> RpcAnnotation(
-            rpcMode = rpcModeEnum,
-            sync = rpcSyncEnum,
-            transferMode = rpcTransferModeEnum,
-            transferChannel = rpcChannel,
-            symbolProcessorSource = this
+        "godot.annotation.GodotBaseType" -> listOf(
+            GodotBaseTypeAnnotation(this) //is internal
         )
-        "godot.annotation.GodotBaseType" -> GodotBaseTypeAnnotation(this) //is internal
         EnumFlag::class.qualifiedName -> {
             val setType = (parentDeclaration as KSPropertyDeclaration).type.resolve()
             require(setType.declaration.qualifiedName?.asString()?.matches(Regex("^kotlin\\.collections\\..*Set\$")) ?: false) {
@@ -120,48 +134,100 @@ internal fun KSAnnotation.mapToAnnotation(parentDeclaration: KSDeclaration): God
                 .map { it.simpleName.asString() }
                 .toList()
 
-            EnumFlagHintStringAnnotation(enumValueNames = enumValueNames, source = this)
+            listOf(
+                EnumFlagHintStringAnnotation(enumValueNames = enumValueNames, source = this),
+                ExportAnnotation(this),
+                GodotMemberAnnotation(this),
+            )
         }
-        IntFlag::class.qualifiedName -> IntFlagHintAnnotation(
-            @Suppress("UNCHECKED_CAST")
-            (arguments.firstOrNull()?.value as? ArrayList<String>)?.toList() ?: emptyList(),
-            this
+        IntFlag::class.qualifiedName -> listOf(
+            IntFlagHintAnnotation(
+                @Suppress("UNCHECKED_CAST")
+                (arguments.firstOrNull()?.value as? ArrayList<String>)?.toList() ?: emptyList(),
+                this
+            ),
+            ExportAnnotation(this),
+            GodotMemberAnnotation(this),
+        )
+        MultilineText::class.qualifiedName -> listOf(
+            MultilineTextHintAnnotation(this),
+            ExportAnnotation(this),
+            GodotMemberAnnotation(this),
+        )
+        PlaceHolderText::class.qualifiedName -> listOf(
+            PlaceHolderTextHintAnnotation(this),
+            ExportAnnotation(this),
+            GodotMemberAnnotation(this),
         )
-        MultilineText::class.qualifiedName -> MultilineTextHintAnnotation(this)
-        PlaceHolderText::class.qualifiedName -> PlaceHolderTextHintAnnotation(this)
-        ColorNoAlpha::class.qualifiedName -> ColorNoAlphaHintAnnotation(this)
-        godot.annotation.IntRange::class.qualifiedName -> provideRangeHintAnnotation(-1)
-        godot.annotation.LongRange::class.qualifiedName -> provideRangeHintAnnotation(-1L)
-        godot.annotation.FloatRange::class.qualifiedName -> provideRangeHintAnnotation(-1f)
-        godot.annotation.DoubleRange::class.qualifiedName -> provideRangeHintAnnotation(-1.0)
-        EnumTypeHint::class.qualifiedName -> null
+        ColorNoAlpha::class.qualifiedName -> listOf(
+            ColorNoAlphaHintAnnotation(this),
+            ExportAnnotation(this),
+            GodotMemberAnnotation(this),
+        )
+        godot.annotation.IntRange::class.qualifiedName -> listOf(
+            provideRangeHintAnnotation(-1),
+            ExportAnnotation(this),
+            GodotMemberAnnotation(this),
+        )
+        godot.annotation.LongRange::class.qualifiedName -> listOf(
+            provideRangeHintAnnotation(-1L),
+            ExportAnnotation(this),
+            GodotMemberAnnotation(this),
+        )
+        godot.annotation.FloatRange::class.qualifiedName -> listOf(
+            provideRangeHintAnnotation(-1f),
+            ExportAnnotation(this),
+            GodotMemberAnnotation(this),
+        )
+        godot.annotation.DoubleRange::class.qualifiedName -> listOf(
+            provideRangeHintAnnotation(-1.0),
+            ExportAnnotation(this),
+            GodotMemberAnnotation(this),
+        )
+        EnumTypeHint::class.qualifiedName -> emptyList()
         ExpEasing::class.qualifiedName -> {
             val attenuation = ((arguments.firstOrNull { it.name?.asString() == "attenuation" }?.value ?: arguments.firstOrNull()?.value) as? Boolean) ?: false
             val isPositiveOnly = ((arguments.firstOrNull { it.name?.asString() == "isPositiveOnly" }?.value ?: arguments[1].value) as? Boolean) ?: false
-            ExpEasingHintAnnotation(
-                attenuation = attenuation,
-                isPositiveOnly = isPositiveOnly,
-                source = this
+
+            listOf(
+                ExpEasingHintAnnotation(
+                    attenuation = attenuation,
+                    isPositiveOnly = isPositiveOnly,
+                    source = this
+                ),
+                ExportAnnotation(this),
+                GodotMemberAnnotation(this),
             )
         }
         godot.annotation.File::class.qualifiedName -> {
             @Suppress("UNCHECKED_CAST")
             val extensions = ((arguments.firstOrNull { it.name?.asString() == "extensions" }?.value ?: arguments.firstOrNull()?.value) as? ArrayList<String>)?.toList() ?: emptyList()
             val global = ((arguments.firstOrNull { it.name?.asString() == "global" }?.value ?: arguments[1].value) as? Boolean) ?: false
-            FileHintAnnotation(
-                extensions = extensions,
-                global = global,
-                source = this
+
+            listOf(
+                FileHintAnnotation(
+                    extensions = extensions,
+                    global = global,
+                    source = this
+                ),
+                ExportAnnotation(this),
+                GodotMemberAnnotation(this),
             )
         }
         Dir::class.qualifiedName -> {
-            val global = ((arguments.firstOrNull { it.name?.asString() == "global" }?.value ?: arguments.firstOrNull()?.value) as? Boolean) ?: false
-            DirHintAnnotation(
-                global = global,
-                source = this
+            val global =
+                ((arguments.firstOrNull { it.name?.asString() == "global" }?.value ?: arguments.firstOrNull()?.value) as? Boolean) ?: false
+
+            listOf(
+                DirHintAnnotation(
+                    global = global,
+                    source = this
+                ),
+                ExportAnnotation(this),
+                GodotMemberAnnotation(this),
             )
         }
-        else -> null
+        else -> emptyList()
     }
 }
 
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
index cb6bd97620..c213cdaf5a 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
@@ -32,7 +32,8 @@ internal fun KSClassDeclaration.mapToClazz(
         .map { it.mapToClazz(settings) }
         .toList()
     val mappedAnnotations = annotations
-        .mapNotNull { it.mapToAnnotation(this) as? ClassAnnotation }
+        .flatMap { it.mapToAnnotation(this) }
+        .filterIsInstance<ClassAnnotation>()
         .toList()
 
     val registeredFunctions = getAllFunctions()
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksFunctionDeclarationExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksFunctionDeclarationExt.kt
index 1aa45afaa7..8355f474e0 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksFunctionDeclarationExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksFunctionDeclarationExt.kt
@@ -20,7 +20,8 @@ internal fun KSFunctionDeclaration.mapToRegisteredConstructor(
             ksValueParameter.mapToValueParameter(settings)
         },
         annotations = annotations
-            .mapNotNull { it.mapToAnnotation(this) as? ConstructorAnnotation }
+            .flatMap { it.mapToAnnotation(this) }
+            .filterIsInstance<ConstructorAnnotation>()
             .toList(),
         symbolProcessorSource = this
     )
@@ -33,7 +34,9 @@ internal fun KSFunctionDeclaration.mapToRegisteredFunction(
 ): RegisteredFunction? {
     val fqName = qualifiedName?.asString() ?: return null
     val parameters = parameters.map { it.mapToValueParameter(settings) }
-    val annotations = annotations.mapNotNull { it.mapToAnnotation(this) as? FunctionAnnotation }
+    val annotations = annotations
+        .flatMap { it.mapToAnnotation(this) }
+        .filterIsInstance<FunctionAnnotation>()
     return RegisteredFunction(
         fqName = fqName,
         isOverridee = this.modifiers.contains(Modifier.OVERRIDE),
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksPropertyDeclarationExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksPropertyDeclarationExt.kt
index c173aa42a6..bbd97e8076 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksPropertyDeclarationExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksPropertyDeclarationExt.kt
@@ -21,7 +21,8 @@ internal fun KSPropertyDeclaration.mapToRegisteredProperty(
         "Qualified name for a registered property declaration cannot be null"
     }
     val annotations = annotations
-        .mapNotNull { it.mapToAnnotation(this) as? PropertyAnnotation }
+        .flatMap { it.mapToAnnotation(this) }
+        .filterIsInstance<PropertyAnnotation>()
         .toMutableList()
         .also { declaredAnnotations ->
             declaredAnnotations.addAll(
@@ -29,7 +30,8 @@ internal fun KSPropertyDeclaration.mapToRegisteredProperty(
                     ?.let { overridee ->
                         overridee
                             .annotations
-                            .mapNotNull { it.mapToAnnotation(overridee) as? PropertyAnnotation }
+                            .flatMap { it.mapToAnnotation(overridee) }
+                            .filterIsInstance<PropertyAnnotation>()
                     }
                     ?: emptySequence()
             )
@@ -96,7 +98,8 @@ internal fun KSPropertyDeclaration.mapToRegisteredSignal(
         "Qualified name for a registered property declaration cannot be null"
     }
     val annotations = annotations
-        .mapNotNull { it.mapToAnnotation(this) as? PropertyAnnotation }
+        .flatMap { it.mapToAnnotation(this) }
+        .filterIsInstance<PropertyAnnotation>()
 
     val mappedType = requireNotNull(type.mapToType(settings)) {
         "type of property $fqName cannot be null"
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt b/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt
index 9f3f2685a8..c6ef12fb66 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt
@@ -8,7 +8,11 @@ package godot.annotation
  *
  * The property needs to have the @[RegisterProperty] annotation added as well
  */
-@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
+@Target(
+    AnnotationTarget.PROPERTY,
+    AnnotationTarget.FIELD,
+    AnnotationTarget.ANNOTATION_CLASS,
+)
 @Retention(AnnotationRetention.RUNTIME)
 @GodotMember
 annotation class Export
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/propertyHintAnnotations.kt b/kt/godot-library/src/main/kotlin/godot/annotation/propertyHintAnnotations.kt
index 13b7bbad3c..b72ac0eef6 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/propertyHintAnnotations.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/propertyHintAnnotations.kt
@@ -14,7 +14,7 @@ The following annotations are implemented based on https://github.com/godotengin
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class IntRange(
     val min: Int,
     val max: Int,
@@ -32,7 +32,7 @@ annotation class IntRange(
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class LongRange(
     val min: Long,
     val max: Long,
@@ -50,7 +50,7 @@ annotation class LongRange(
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class FloatRange(
     val min: Float,
     val max: Float,
@@ -68,7 +68,7 @@ annotation class FloatRange(
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class DoubleRange(
     val min: Double,
     val max: Double,
@@ -86,7 +86,7 @@ annotation class DoubleRange(
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class EnumTypeHint
 
 /**
@@ -94,7 +94,7 @@ annotation class EnumTypeHint
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class ExpEasing(val attenuation: Boolean = false, val isPositiveOnly: Boolean = true)
 
 /**
@@ -102,7 +102,7 @@ annotation class ExpEasing(val attenuation: Boolean = false, val isPositiveOnly:
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class Lenght(val lenght: Int = -1)
 
 /**
@@ -114,7 +114,7 @@ annotation class ExpEasing(val attenuation: Boolean = false, val isPositiveOnly:
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class EnumFlag
 
 /**
@@ -124,7 +124,7 @@ annotation class EnumFlag
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class IntFlag(vararg val names: String)
 
 /**
@@ -132,7 +132,7 @@ annotation class IntFlag(vararg val names: String)
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class Layers2DRender
 
 /**
@@ -140,7 +140,7 @@ annotation class IntFlag(vararg val names: String)
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class Layers2DPhysics
 
 /**
@@ -148,7 +148,7 @@ annotation class IntFlag(vararg val names: String)
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class Layers3DRender
 
 /**
@@ -156,7 +156,7 @@ annotation class IntFlag(vararg val names: String)
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class Layers3DPhysics
 
 /**
@@ -164,7 +164,7 @@ annotation class IntFlag(vararg val names: String)
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class File(vararg val extensions: String = [], val global: Boolean = false)
 
 /**
@@ -172,7 +172,7 @@ annotation class File(vararg val extensions: String = [], val global: Boolean =
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class Dir(val global: Boolean = false)
 
 /**
@@ -180,7 +180,7 @@ annotation class Dir(val global: Boolean = false)
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class MultilineText
 
 /**
@@ -188,7 +188,7 @@ annotation class MultilineText
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class PlaceHolderText
 
 /**
@@ -196,7 +196,7 @@ annotation class PlaceHolderText
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Export
 annotation class ColorNoAlpha
 
 /**
@@ -204,7 +204,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class ImageCompressLossy
 
 /**
@@ -212,7 +212,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class ImageCompressLossLess
 
 /**
@@ -220,7 +220,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class ObjectId
 
 /**
@@ -228,7 +228,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class TypeString(val baseTypeAsString: String)
 
 /**
@@ -236,7 +236,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class NodePathToEditedNode
 
 /**
@@ -244,7 +244,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class MethodOfVariantType
 
 /**
@@ -252,7 +252,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class MethodOfBaseType
 
 /**
@@ -260,7 +260,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class MethodOfInstance
 
 /**
@@ -268,7 +268,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class MethodOfScript
 
 /**
@@ -276,7 +276,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class PropertyOfVariantType
 
 /**
@@ -284,7 +284,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class PropertyOfBaseType
 
 /**
@@ -292,7 +292,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class PropertyOfInstance
 
 /**
@@ -300,12 +300,12 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class PropertyOfScript
 
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class ObjectTooBig
 
 /**
@@ -313,7 +313,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class NodePathValidTypes
 
 /**
@@ -321,7 +321,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class SaveFile(vararg val extensions: String = [])
 
 /**
@@ -329,7 +329,7 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class IntIsObjectId
 
 /**
@@ -337,5 +337,5 @@ annotation class ColorNoAlpha
  */
 //@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD)
 //@Retention(AnnotationRetention.RUNTIME)
-//@GodotMember
+//@Export
 //annotation class Max
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt
index 4915f965e6..b917933d3c 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt
@@ -6,16 +6,14 @@ import com.intellij.psi.PsiElement
 import godot.intellij.plugin.GodotPluginBundle
 import godot.intellij.plugin.annotator.base.BaseAnnotator
 import godot.intellij.plugin.annotator.general.checkNotGeneric
-import godot.intellij.plugin.data.model.REGISTER_CLASS_ANNOTATION
-import godot.intellij.plugin.data.model.REGISTER_CONSTRUCTOR_ANNOTATION
-import godot.intellij.plugin.data.model.REGISTER_FUNCTION_ANNOTATION
-import godot.intellij.plugin.data.model.REGISTER_PROPERTY_ANNOTATION
-import godot.intellij.plugin.data.model.REGISTER_SIGNAL_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_MEMBER_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_SCRIPT_ANNOTATION
 import godot.intellij.plugin.data.model.TOOL_ANNOTATION
 import godot.intellij.plugin.extension.anyFunctionHasAnnotation
 import godot.intellij.plugin.extension.anyPropertyHasAnnotation
 import godot.intellij.plugin.extension.getRegisteredClassName
 import godot.intellij.plugin.extension.isAbstract
+import godot.intellij.plugin.extension.isRegistered
 import godot.intellij.plugin.extension.registerProblem
 import godot.intellij.plugin.extension.registeredClassNameCache
 import godot.intellij.plugin.extension.resolveToDescriptor
@@ -34,7 +32,7 @@ class RegisterClassAnnotator : BaseAnnotator {
     override fun checkElement(element: PsiElement, holder: AnnotationHolder) {
         when(element) {
             is PsiClass -> {
-                if (element.getAnnotation(REGISTER_CLASS_ANNOTATION) == null) {
+                if (!element.isRegistered()) {
                     val errorLocation = element.nameIdentifier ?: element.navigationElement
                     if (element.getAnnotation(TOOL_ANNOTATION) != null) {
                         holder.registerProblem(
@@ -43,21 +41,21 @@ class RegisterClassAnnotator : BaseAnnotator {
                             classNotRegisteredQuickFix
                         )
                     }
-                    if (!element.isAbstract && element.anyPropertyHasAnnotation(REGISTER_PROPERTY_ANNOTATION)) {
+                    if (!element.isAbstract && element.anyPropertyHasAnnotation(GODOT_MEMBER_ANNOTATION)) {
                         holder.registerProblem(
                             GodotPluginBundle.message("problem.class.notRegistered.properties"),
                             errorLocation,
                             classNotRegisteredQuickFix
                         )
                     }
-                    if (!element.isAbstract && element.anyPropertyHasAnnotation(REGISTER_SIGNAL_ANNOTATION)) {
+                    if (!element.isAbstract && element.anyPropertyHasAnnotation(GODOT_MEMBER_ANNOTATION)) {
                         holder.registerProblem(
                             GodotPluginBundle.message("problem.class.notRegistered.signals"),
                             errorLocation,
                             classNotRegisteredQuickFix
                         )
                     }
-                    if (!element.isAbstract && element.anyFunctionHasAnnotation(REGISTER_FUNCTION_ANNOTATION)) {
+                    if (!element.isAbstract && element.anyFunctionHasAnnotation(GODOT_MEMBER_ANNOTATION)) {
                         holder.registerProblem(
                             GodotPluginBundle.message("problem.class.notRegistered.functions"),
                             errorLocation,
@@ -100,7 +98,7 @@ class RegisterClassAnnotator : BaseAnnotator {
     private fun checkConstructorParameterCount(psiClass: PsiClass, holder: AnnotationHolder) {
         psiClass
             .constructors
-            .filter { it.getAnnotation(REGISTER_CONSTRUCTOR_ANNOTATION) != null }
+            .filter { it.getAnnotation(GODOT_MEMBER_ANNOTATION) != null }
             .forEach { ktConstructor ->
                 if (ktConstructor.parameterList.parametersCount > Constraints.MAX_CONSTRUCTOR_ARG_COUNT) {
                     holder.registerProblem(
@@ -114,10 +112,10 @@ class RegisterClassAnnotator : BaseAnnotator {
     private fun checkConstructorOverloading(psiClass: PsiClass, holder: AnnotationHolder) {
         val constructors = psiClass
             .constructors
-            .filter { it.getAnnotation(REGISTER_CONSTRUCTOR_ANNOTATION) != null }
+            .filter { it.getAnnotation(GODOT_MEMBER_ANNOTATION) != null }
 
         val constructorsByArgCount = constructors
-            .filter { it.getAnnotation(REGISTER_CONSTRUCTOR_ANNOTATION) != null }
+            .filter { it.getAnnotation(GODOT_MEMBER_ANNOTATION) != null }
             .groupBy { it.parameterList.parametersCount }
 
         if (constructorsByArgCount.size != constructors.size) {
@@ -143,7 +141,7 @@ class RegisterClassAnnotator : BaseAnnotator {
             ?: return
 
         if (fqNames.size > 1 || (fqNames.size == 1 && !fqNames.contains(fqName))) {
-            val registerClassAnnotation = psiClass.getAnnotation(REGISTER_CLASS_ANNOTATION)
+            val registerClassAnnotation = psiClass.getAnnotation(GODOT_SCRIPT_ANNOTATION)
             val psiElement = if (registerClassAnnotation == null) {
                 psiClass.nameIdentifier ?: psiClass.navigationElement
             } else {
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/function/RegisterFunctionAnnotator.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/function/RegisterFunctionAnnotator.kt
index 9d42989a14..45523331ba 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/function/RegisterFunctionAnnotator.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/function/RegisterFunctionAnnotator.kt
@@ -1,65 +1,29 @@
 package godot.intellij.plugin.annotator.function
 
-import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.lang.annotation.Annotator
 import com.intellij.psi.PsiElement
 import godot.intellij.plugin.GodotPluginBundle
 import godot.intellij.plugin.annotator.general.checkNotGeneric
-import godot.intellij.plugin.data.model.REGISTER_CLASS_ANNOTATION
-import godot.intellij.plugin.data.model.REGISTER_FUNCTION_ANNOTATION
 import godot.intellij.plugin.extension.isInGodotRoot
+import godot.intellij.plugin.extension.isRegistered
 import godot.intellij.plugin.extension.registerProblem
-import godot.intellij.plugin.quickfix.FunctionNotRegisteredQuickFix
 import godot.common.constants.Constraints
-import godot.tools.common.constants.GodotTypes
 import org.jetbrains.kotlin.asJava.toLightMethods
-import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
-import org.jetbrains.kotlin.idea.util.findAnnotation
-import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtNamedFunction
-import org.jetbrains.kotlin.psi.psiUtil.containingClass
 
 class RegisterFunctionAnnotator : Annotator {
-    private val functionNotRegisteredQuickFix by lazy { FunctionNotRegisteredQuickFix() }
-
     override fun annotate(element: PsiElement, holder: AnnotationHolder) {
         if (!element.isInGodotRoot()) return
 
         if (element is KtNamedFunction) {
-            when {
-                overriddenNotificationFunctionNotRegistered(element) -> holder.registerProblem(
-                    GodotPluginBundle.message("problem.function.notificationFunctionNotRegistered"),
-                    element.navigationElement,
-                    functionNotRegisteredQuickFix
-                )
-                overriddenRegisteredAbstractFunctionNotRegistered(element) -> holder.registerProblem(
-                    GodotPluginBundle.message("problem.function.overriddenAbstractFunctionNotRegistered"),
-                    element.nameIdentifier ?: element.navigationElement,
-                    functionNotRegisteredQuickFix,
-                    problemHighlightType = ProblemHighlightType.WEAK_WARNING
-                )
-            }
-
-            if (element.findAnnotation(FqName(REGISTER_FUNCTION_ANNOTATION)) != null) {
+            if (element.isRegistered()) {
                 checkNotGeneric(element.toLightMethods().first(), holder)
                 checkFunctionParameterCount(element, holder)
             }
         }
     }
 
-    private fun overriddenRegisteredAbstractFunctionNotRegistered(element: KtNamedFunction): Boolean {
-        return element.containingClass()?.findAnnotation(FqName(REGISTER_CLASS_ANNOTATION)) != null &&
-            element.findAnnotation(FqName(REGISTER_FUNCTION_ANNOTATION)) == null &&
-            element.resolveToDescriptorIfAny()?.overriddenDescriptors?.any { it.annotations.hasAnnotation(FqName(REGISTER_FUNCTION_ANNOTATION)) } == true
-    }
-
-    private fun overriddenNotificationFunctionNotRegistered(element: KtNamedFunction) =
-        element.containingClass()?.findAnnotation(FqName(REGISTER_CLASS_ANNOTATION)) != null &&
-            GodotTypes.notificationFunctions.contains(element.name) &&
-            element.findAnnotation(FqName(REGISTER_FUNCTION_ANNOTATION)) == null
-
-
     private fun checkFunctionParameterCount(element: KtNamedFunction, holder: AnnotationHolder) {
         if (element.valueParameters.size > Constraints.MAX_FUNCTION_ARG_COUNT) {
             holder.registerProblem(
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/PropertyHintAnnotationChecker.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/PropertyHintAnnotationChecker.kt
index a3e7a54667..6244780691 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/PropertyHintAnnotationChecker.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/PropertyHintAnnotationChecker.kt
@@ -2,12 +2,8 @@ package godot.intellij.plugin.annotator.property
 
 import com.intellij.lang.annotation.AnnotationHolder
 import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.EXPORT_ANNOTATION
-import godot.intellij.plugin.data.model.REGISTER_PROPERTY_ANNOTATION
 import godot.intellij.plugin.extension.registerProblem
 import godot.intellij.plugin.extension.type
-import godot.intellij.plugin.quickfix.PropertyNotExportedQuickFix
-import godot.intellij.plugin.quickfix.PropertyNotRegisteredQuickFix
 import godot.tools.common.constants.GodotKotlinJvmTypes
 import godot.tools.common.constants.GodotTypes
 import godot.tools.common.constants.godotAnnotationPackage
@@ -28,9 +24,6 @@ import org.jetbrains.kotlin.types.typeUtil.isLong
 private const val MAX_ENUM_ENTRIES_FOR_ENUM_FLAGS = 32
 
 class PropertyHintAnnotationChecker {
-    private val propertyNotRegisteredQuickFix by lazy { PropertyNotRegisteredQuickFix() }
-    private val propertyNotExportedQuickFix by lazy { PropertyNotExportedQuickFix() }
-
     fun checkPropertyHintAnnotations(ktProperty: KtProperty, holder: AnnotationHolder) {
         when {
             ktProperty.findAnnotation(FqName("$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.intRange}")) != null -> checkIntRange(ktProperty, holder)
@@ -51,7 +44,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkColorNoAlpha(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.getKotlinTypeFqName(false) != "$godotCorePackage.${GodotTypes.color}") {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", "$godotCorePackage.${GodotTypes.color}"),
@@ -61,7 +53,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkPlaceholderText(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.getKotlinTypeFqName(false) != String::class.qualifiedName) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", String::class.qualifiedName.toString()),
@@ -71,7 +62,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkMultilineText(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.getKotlinTypeFqName(false) != String::class.qualifiedName) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", String::class.qualifiedName.toString()),
@@ -81,7 +71,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkDir(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.getKotlinTypeFqName(false) != String::class.qualifiedName) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", String::class.qualifiedName.toString()),
@@ -91,7 +80,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkFile(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.getKotlinTypeFqName(false) != String::class.qualifiedName) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", String::class.qualifiedName.toString()),
@@ -101,7 +89,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkIntFlag(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.isInt() == false) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", Int::class.qualifiedName.toString()),
@@ -111,7 +98,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkEnumFlag(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.getKotlinTypeFqName(false)?.matches(Regex("^kotlin\\.collections\\..*Set\$")) == false) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", "kotlin.collections.Set or kotlin.collections.MutableSet"),
@@ -138,7 +124,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkEnumTypeHint(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.isEnum() == false) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", Enum::class.qualifiedName.toString()),
@@ -148,7 +133,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkExpEasing(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.isFloat() == false && ktProperty.type()?.isDouble() == false) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", "${Float::class.qualifiedName} or ${Double::class.qualifiedName}"),
@@ -158,7 +142,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkExpRange(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.isFloat() == false && ktProperty.type()?.isDouble() == false) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", "${Float::class.qualifiedName} or ${Double::class.qualifiedName}"),
@@ -168,7 +151,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkDoubleRange(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.isDouble() == false) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", Double::class.qualifiedName.toString()),
@@ -178,7 +160,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkFloatRange(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.isFloat() == false) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", Float::class.qualifiedName.toString()),
@@ -188,7 +169,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkLongRange(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.isLong() == false) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", Long::class.qualifiedName.toString()),
@@ -198,7 +178,6 @@ class PropertyHintAnnotationChecker {
     }
 
     private fun checkIntRange(ktProperty: KtProperty, holder: AnnotationHolder) {
-        checkForRegistrationAnnotation(ktProperty, holder)
         if (ktProperty.type()?.isInt() == false) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", Int::class.qualifiedName.toString()),
@@ -206,21 +185,4 @@ class PropertyHintAnnotationChecker {
             )
         }
     }
-
-    private fun checkForRegistrationAnnotation(ktProperty: KtProperty, holder: AnnotationHolder) {
-        if (ktProperty.findAnnotation(FqName(REGISTER_PROPERTY_ANNOTATION)) == null) {
-            holder.registerProblem(
-                GodotPluginBundle.message("problem.property.hint.notRegistered"),
-                ktProperty.nameIdentifier ?: ktProperty.navigationElement,
-                propertyNotRegisteredQuickFix
-            )
-        }
-        if (ktProperty.findAnnotation(FqName(EXPORT_ANNOTATION)) == null) {
-            holder.registerProblem(
-                GodotPluginBundle.message("problem.property.hint.notExported"),
-                ktProperty.nameIdentifier ?: ktProperty.navigationElement,
-                propertyNotExportedQuickFix
-            )
-        }
-    }
 }
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/RegisterPropertiesAnnotator.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/RegisterPropertiesAnnotator.kt
index 37ffbe56f3..534441f4c4 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/RegisterPropertiesAnnotator.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/RegisterPropertiesAnnotator.kt
@@ -5,15 +5,12 @@ import com.intellij.lang.annotation.Annotator
 import com.intellij.psi.PsiElement
 import godot.intellij.plugin.GodotPluginBundle
 import godot.intellij.plugin.annotator.general.checkNotGeneric
-import godot.intellij.plugin.data.model.EXPORT_ANNOTATION
-import godot.intellij.plugin.data.model.REGISTER_PROPERTY_ANNOTATION
 import godot.intellij.plugin.extension.isCoreType
 import godot.intellij.plugin.extension.isGodotPrimitive
 import godot.intellij.plugin.extension.isInGodotRoot
+import godot.intellij.plugin.extension.isRegistered
 import godot.intellij.plugin.extension.registerProblem
 import godot.intellij.plugin.extension.type
-import godot.intellij.plugin.quickfix.PropertyNotRegisteredQuickFix
-import godot.intellij.plugin.quickfix.PropertyRemoveExportAnnotationQuickFix
 import godot.intellij.plugin.quickfix.RegisterPropertyMutabilityQuickFix
 import godot.tools.common.constants.GodotKotlinJvmTypes
 import godot.tools.common.constants.godotAnnotationPackage
@@ -35,15 +32,13 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance
 
 class RegisterPropertiesAnnotator : Annotator {
     private val mutabilityQuickFix by lazy { RegisterPropertyMutabilityQuickFix() }
-    private val propertyNotRegisteredQuickFix by lazy { PropertyNotRegisteredQuickFix() }
-    private val propertyRemoveExportAnnotationQuickFix by lazy { PropertyRemoveExportAnnotationQuickFix() }
     private val propertyHintAnnotationChecker by lazy { PropertyHintAnnotationChecker() }
 
     override fun annotate(element: PsiElement, holder: AnnotationHolder) {
         if (!element.isInGodotRoot()) return
 
         if (element is KtProperty) {
-            if (element.findAnnotation(FqName(REGISTER_PROPERTY_ANNOTATION)) != null) {
+            if (element.isRegistered()) {
                 checkNotGeneric(element.toLightElements().firstIsInstance(), holder)
                 checkMutability(element, holder)
                 checkRegisteredType(element, holder)
@@ -52,7 +47,6 @@ class RegisterPropertiesAnnotator : Annotator {
             }
             // outside to check if the property is also registered
             propertyHintAnnotationChecker.checkPropertyHintAnnotations(element, holder)
-            checkExportAnnotation(element, holder)
         }
     }
 
@@ -66,18 +60,6 @@ class RegisterPropertiesAnnotator : Annotator {
         }
     }
 
-    private fun checkExportAnnotation(ktProperty: KtProperty, holder: AnnotationHolder) {
-        if (ktProperty.findAnnotation(FqName(EXPORT_ANNOTATION)) != null) {
-            if (ktProperty.findAnnotation(FqName(REGISTER_PROPERTY_ANNOTATION)) == null) {
-                holder.registerProblem(
-                    GodotPluginBundle.message("problem.property.export.notRegistered"),
-                    ktProperty.nameIdentifier ?: ktProperty.navigationElement,
-                    propertyNotRegisteredQuickFix
-                )
-            }
-        }
-    }
-
     private fun checkRegisteredType(ktProperty: KtProperty, holder: AnnotationHolder) {
         val type = ktProperty.type() ?: return
         // enum flag is the only case where registering a kotlin collection is allowed
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/CallFunctionReferenceChecker.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/CallFunctionReferenceChecker.kt
index 239e619694..38a9070ad3 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/CallFunctionReferenceChecker.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/CallFunctionReferenceChecker.kt
@@ -2,7 +2,7 @@ package godot.intellij.plugin.annotator.reference
 
 import com.intellij.lang.annotation.AnnotationHolder
 import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.REGISTER_FUNCTION_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_MEMBER_ANNOTATION
 import godot.intellij.plugin.extension.registerProblem
 import godot.intellij.plugin.extension.type
 import godot.intellij.plugin.quickfix.TargetFunctionNotRegisteredQuickFix
@@ -52,7 +52,7 @@ object CallFunctionReferenceChecker {
                 .mainReference
                 .resolve() as? KtNamedFunction
 
-            val registerFunctionAnnotation = targetFunction?.findAnnotation(FqName(REGISTER_FUNCTION_ANNOTATION))
+            val registerFunctionAnnotation = targetFunction?.findAnnotation(FqName(GODOT_MEMBER_ANNOTATION))
             if (targetFunction != null && registerFunctionAnnotation == null) {
                 holder.registerProblem(
                     GodotPluginBundle.message("problem.general.calledFunctionNotRegistered"),
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/RpcFunctionReferenceChecker.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/RpcFunctionReferenceChecker.kt
index c15d02f11b..8363c9218b 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/RpcFunctionReferenceChecker.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/RpcFunctionReferenceChecker.kt
@@ -2,7 +2,7 @@ package godot.intellij.plugin.annotator.reference
 
 import com.intellij.lang.annotation.AnnotationHolder
 import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.REGISTER_FUNCTION_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_MEMBER_ANNOTATION
 import godot.intellij.plugin.data.model.RPC_ANNOTATION
 import godot.intellij.plugin.extension.registerProblem
 import godot.intellij.plugin.quickfix.TargetFunctionHasNoRpcAnnotationQuickFix
@@ -52,7 +52,7 @@ object RpcFunctionReferenceChecker {
                 .mainReference
                 .resolve() as? KtNamedFunction
 
-            val registerFunctionAnnotation = targetFunction?.findAnnotation(FqName(REGISTER_FUNCTION_ANNOTATION))
+            val registerFunctionAnnotation = targetFunction?.findAnnotation(FqName(GODOT_MEMBER_ANNOTATION))
             val rpcAnnotation = targetFunction?.findAnnotation(FqName(RPC_ANNOTATION))
 
             when {
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/SignalFunctionReferenceChecker.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/SignalFunctionReferenceChecker.kt
index 2e7025f536..a86a1bc51d 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/SignalFunctionReferenceChecker.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/SignalFunctionReferenceChecker.kt
@@ -3,7 +3,7 @@ package godot.intellij.plugin.annotator.reference
 import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.psi.util.parentOfType
 import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.REGISTER_FUNCTION_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_MEMBER_ANNOTATION
 import godot.intellij.plugin.extension.registerProblem
 import godot.intellij.plugin.extension.type
 import godot.intellij.plugin.quickfix.TargetFunctionNotRegisteredQuickFix
@@ -47,7 +47,7 @@ object SignalFunctionReferenceChecker {
                 .mainReference
                 .resolve() as? KtNamedFunction
 
-            if (targetFunction != null && targetFunction.findAnnotation(FqName(REGISTER_FUNCTION_ANNOTATION)) == null) {
+            if (targetFunction != null && targetFunction.findAnnotation(FqName(GODOT_MEMBER_ANNOTATION)) == null) {
                 holder.registerProblem(
                     GodotPluginBundle.message("problem.signal.connection.connectedFunctionNotRegistered"),
                     element,
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/signal/RegisterSignalAnnotator.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/signal/RegisterSignalAnnotator.kt
index 4bfee74b85..19473f7012 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/signal/RegisterSignalAnnotator.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/signal/RegisterSignalAnnotator.kt
@@ -6,8 +6,8 @@ import com.intellij.lang.annotation.Annotator
 import com.intellij.psi.PsiElement
 import godot.intellij.plugin.GodotPluginBundle
 import godot.intellij.plugin.annotator.general.checkNotGeneric
-import godot.intellij.plugin.data.model.REGISTER_SIGNAL_ANNOTATION
 import godot.intellij.plugin.extension.isInGodotRoot
+import godot.intellij.plugin.extension.isSignal
 import godot.intellij.plugin.extension.registerProblem
 import godot.intellij.plugin.extension.type
 import godot.intellij.plugin.quickfix.RegisterSignalInitializerQuickFix
@@ -15,11 +15,7 @@ import godot.intellij.plugin.quickfix.RegisterSignalMutabilityQuickFix
 import godot.tools.common.constants.GodotKotlinJvmTypes
 import godot.tools.common.constants.godotCorePackage
 import org.jetbrains.kotlin.asJava.toLightElements
-import org.jetbrains.kotlin.idea.util.findAnnotation
 import org.jetbrains.kotlin.js.descriptorUtils.getKotlinTypeFqName
-
-import org.jetbrains.kotlin.name.FqName
-
 import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance
 
@@ -30,7 +26,7 @@ class RegisterSignalAnnotator : Annotator {
     override fun annotate(element: PsiElement, holder: AnnotationHolder) {
         if (!element.isInGodotRoot()) return
 
-        if (element is KtProperty && element.findAnnotation(FqName(REGISTER_SIGNAL_ANNOTATION)) != null) {
+        if (element is KtProperty && element.isSignal()) {
             checkNotGeneric(element.toLightElements().firstIsInstance(), holder)
             checkMutability(element, holder)
             checkRegisteredType(element, holder)
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/data/model/annotations.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/data/model/annotations.kt
index 63eebeb27d..a9acaf01e7 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/data/model/annotations.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/data/model/annotations.kt
@@ -3,13 +3,10 @@ package godot.intellij.plugin.data.model
 import godot.tools.common.constants.GodotKotlinJvmTypes
 import godot.tools.common.constants.godotAnnotationPackage
 
-const val REGISTER_CLASS_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.registerClass}"
+const val GODOT_SCRIPT_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotScript}"
 const val TOOL_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.tool}"
-const val REGISTER_CONSTRUCTOR_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.registerConstructor}"
-const val REGISTER_FUNCTION_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.registerFunction}"
-const val REGISTER_PROPERTY_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.registerProperty}"
+const val GODOT_MEMBER_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotMember}"
+const val GODOT_API_MEMBER_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotApiMemeber}"
 const val EXPORT_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.export}"
-const val REGISTER_SIGNAL_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.registerSignal}"
-const val CORE_TYPE_HELPER_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.coreTypeHelper}"
 const val CORE_TYPE_LOCAL_COPY_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.coreTypeLocalCopy}"
 const val RPC_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.rpc}"
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktClassExtensions.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktClassExtensions.kt
index 6e4716c9e2..fb4aef7bc3 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktClassExtensions.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktClassExtensions.kt
@@ -1,7 +1,7 @@
 package godot.intellij.plugin.extension
 
 import com.intellij.psi.PsiClass
-import godot.intellij.plugin.data.model.REGISTER_CLASS_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_SCRIPT_ANNOTATION
 import godot.intellij.plugin.gradle.GodotKotlinJvmSettings
 import godot.tools.common.constants.FileExtensions
 import org.jetbrains.kotlin.asJava.toLightClass
@@ -29,7 +29,7 @@ fun PsiClass.getRegisteredClassName(): Pair<String, String>? {
         name
     }
 
-    val customName = getAnnotation(REGISTER_CLASS_ANNOTATION)
+    val customName = getAnnotation(GODOT_SCRIPT_ANNOTATION)
         ?.findAttributeValue("className")
         ?.text
         ?.removeSurrounding("\"")
@@ -43,7 +43,7 @@ fun PsiClass.getRegisteredClassName(): Pair<String, String>? {
 fun KtClass.getRegistrationFilePath(): String? = this.toLightClass()?.getRegistrationFilePath()
 
 fun PsiClass.getRegistrationFilePath(): String? {
-    return if (annotations.any { annotation -> annotation.qualifiedName == REGISTER_CLASS_ANNOTATION }) {
+    return if (annotations.any { annotation -> annotation.qualifiedName == GODOT_SCRIPT_ANNOTATION }) {
         val fqName = qualifiedName ?: return null
         val registeredName = getRegisteredClassName()?.second ?: return null
 
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktPsi.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktPsi.kt
index 29ede95451..1caaa4c5ff 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktPsi.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktPsi.kt
@@ -1,10 +1,23 @@
 package godot.intellij.plugin.extension
 
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiField
+import godot.tools.common.constants.GodotKotlinJvmTypes
+import godot.tools.common.constants.godotCorePackage
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
+import org.jetbrains.kotlin.js.descriptorUtils.getKotlinTypeFqName
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.types.KotlinType
 
 fun KtClass.type(): KotlinType? = (this.resolveToDescriptorIfAny() as? CallableDescriptor)?.returnType
 fun KtProperty.type(): KotlinType? = (this.resolveToDescriptorIfAny() as? CallableDescriptor)?.returnType
+
+fun PsiElement.isSignal(): Boolean {
+    return when(this) {
+        is KtProperty -> this.type()?.getKotlinTypeFqName(false) == "$godotCorePackage.${GodotKotlinJvmTypes.signal}"
+        is PsiField -> this.type.canonicalText == "$godotCorePackage.${GodotKotlinJvmTypes.signal}"
+        else -> false
+    }
+}
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiClass.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiClass.kt
index de57d857a8..048a14cdde 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiClass.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiClass.kt
@@ -1,10 +1,9 @@
 package godot.intellij.plugin.extension
 
 import com.intellij.psi.PsiClass
-import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiModifier
-import godot.intellij.plugin.data.model.REGISTER_CLASS_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_SCRIPT_ANNOTATION
 import org.jetbrains.kotlin.asJava.classes.KtUltraLightClass
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
@@ -37,7 +36,7 @@ fun PsiClass.anyPropertyHasAnnotation(annotationFqName: String) = when(this) {
 }
 
 val PsiClass.isRegistered: Boolean
-    get() = getAnnotation(REGISTER_CLASS_ANNOTATION) != null
+    get() = getAnnotation(GODOT_SCRIPT_ANNOTATION) != null
 
 
 fun PsiClass.resolveToDescriptor(): ClassDescriptor? {
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
new file mode 100644
index 0000000000..5e4ae33a94
--- /dev/null
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
@@ -0,0 +1,19 @@
+package godot.intellij.plugin.extension
+
+import com.intellij.psi.PsiAnnotation
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiModifierListOwner
+import godot.tools.common.constants.GodotKotlinJvmTypes
+import godot.tools.common.constants.godotAnnotationPackage
+
+
+fun PsiElement.isRegistered(): Boolean {
+    if (this !is PsiModifierListOwner) return false
+    return this.annotations.any { it.isRegistrationAnnotation() }
+}
+
+private fun PsiAnnotation.isRegistrationAnnotation(): Boolean {
+    return this.qualifiedName == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotScript}" ||
+        this.qualifiedName == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotMember}" ||
+        this.resolveAnnotationType()?.annotations?.any { it.isRegistrationAnnotation() } == true
+}
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/linemarker/RegisteredNameLineMarker.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/linemarker/RegisteredNameLineMarker.kt
index 76b2589546..2783936408 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/linemarker/RegisteredNameLineMarker.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/linemarker/RegisteredNameLineMarker.kt
@@ -13,21 +13,29 @@ import com.intellij.psi.PsiField
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.impl.source.tree.LeafPsiElement
 import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.REGISTER_CLASS_ANNOTATION
-import godot.intellij.plugin.data.model.REGISTER_FUNCTION_ANNOTATION
-import godot.intellij.plugin.data.model.REGISTER_PROPERTY_ANNOTATION
-import godot.intellij.plugin.data.model.REGISTER_SIGNAL_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_API_MEMBER_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_MEMBER_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_SCRIPT_ANNOTATION
 import godot.intellij.plugin.extension.getRegisteredClassName
 import godot.intellij.plugin.extension.isAbstract
 import godot.intellij.plugin.extension.isInGodotRoot
+import godot.intellij.plugin.extension.isRegistered
+import godot.intellij.plugin.extension.isSignal
 import godot.common.extensions.convertToSnakeCase
+import org.jetbrains.kotlin.backend.jvm.ir.psiElement
+import org.jetbrains.kotlin.descriptors.PropertyDescriptor
+import org.jetbrains.kotlin.idea.base.psi.kotlinFqName
+import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.refactoring.isAbstract
+import org.jetbrains.kotlin.idea.searching.inheritors.findAllOverridings
 import org.jetbrains.kotlin.idea.util.findAnnotation
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.KtProperty
+import org.jetbrains.kotlin.resolve.DescriptorUtils
+import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import java.awt.datatransfer.StringSelection
 import javax.swing.Icon
 
@@ -46,8 +54,8 @@ class RegisteredNameLineMarker : LineMarkerProvider {
             return null
         }
 
-        val lineMarkerData = when(val parent = element.parent) {
-            is KtClass -> if (parent.findAnnotation(FqName(REGISTER_CLASS_ANNOTATION)) != null) {
+        val lineMarkerData = when (val parent = element.parent) {
+            is KtClass -> if (parent.findAnnotation(FqName(GODOT_SCRIPT_ANNOTATION)) != null) {
                 val name = if (parent.isAbstract()) {
                     GodotPluginBundle.message(
                         "linemarker.registeredName.notRegisteredBecauseIsAbstract.text"
@@ -61,7 +69,8 @@ class RegisteredNameLineMarker : LineMarkerProvider {
                     gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_script.svg", this::class.java)
                 )
             } else null
-            is PsiClass -> if (parent.getAnnotation(REGISTER_CLASS_ANNOTATION) != null) {
+
+            is PsiClass -> if (parent.getAnnotation(GODOT_SCRIPT_ANNOTATION) != null) {
                 val name = if (parent.isAbstract) {
                     GodotPluginBundle.message(
                         "linemarker.registeredName.notRegisteredBecauseIsAbstract.text"
@@ -76,53 +85,112 @@ class RegisteredNameLineMarker : LineMarkerProvider {
                     gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_script.svg", this::class.java)
                 )
             } else null
-            is PsiMethod -> if (parent.getAnnotation(REGISTER_FUNCTION_ANNOTATION) != null) {
-                LineMarkerData(
+
+            is PsiMethod -> when {
+                parent.getAnnotation(GODOT_MEMBER_ANNOTATION) != null -> LineMarkerData(
                     identifier = parent.nameIdentifier ?: parent.navigationElement,
                     convertedName = parent.name.convertToSnakeCase(),
                     gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_method.svg", this::class.java)
                 )
-            } else null
+
+                else -> {
+                    val superMethods = parent.findSuperMethods()
+
+                    val isAnySuperMethodAApiMethod = superMethods.any { superMethod ->
+                        superMethod.annotations.any { superMethodAnnotation -> superMethodAnnotation.qualifiedName == GODOT_API_MEMBER_ANNOTATION }
+                    }
+                    val isAnySuperMethodRegistered = superMethods.any { it.isRegistered() }
+
+                    if (isAnySuperMethodAApiMethod || isAnySuperMethodRegistered) {
+                        LineMarkerData(
+                            identifier = parent.nameIdentifier ?: parent.navigationElement,
+                            convertedName = parent.name.convertToSnakeCase(),
+                            gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_method.svg", this::class.java)
+                        )
+                    } else null
+                }
+            }
+
             is PsiField -> when {
-                parent.getAnnotation(REGISTER_PROPERTY_ANNOTATION) != null -> LineMarkerData(
+                parent.getAnnotation(GODOT_MEMBER_ANNOTATION) != null -> LineMarkerData(
                     identifier = parent.nameIdentifier,
                     convertedName = parent.name.convertToSnakeCase(),
                     gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_property.svg", this::class.java)
                 )
-                parent.getAnnotation(REGISTER_SIGNAL_ANNOTATION) != null -> LineMarkerData(
+
+                parent.isSignal() -> LineMarkerData(
                     identifier = parent.nameIdentifier,
                     convertedName = parent.name.convertToSnakeCase(),
                     gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_signal.svg", this::class.java)
                 )
+
+                parent.getOverriddenFields().any { it.isRegistered() } -> LineMarkerData(
+                    identifier = parent.nameIdentifier,
+                    convertedName = parent.name.convertToSnakeCase(),
+                    gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_property.svg", this::class.java)
+                )
+
                 else -> null
             }
+
             is KtProperty -> when {
-                parent.findAnnotation(FqName(REGISTER_PROPERTY_ANNOTATION)) != null -> parent.name?.let { name ->
+                parent.findAnnotation(FqName(GODOT_MEMBER_ANNOTATION)) != null ||
+                    parent.findAllOverridings().any { it.isRegistered() } -> parent.name?.let { name ->
                     LineMarkerData(
                         identifier = parent.nameIdentifier ?: parent.navigationElement,
                         convertedName = name.convertToSnakeCase(),
                         gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_property.svg", this::class.java)
                     )
                 }
-                parent.findAnnotation(FqName(REGISTER_SIGNAL_ANNOTATION)) != null -> parent.name?.let { name ->
+
+                parent.isSignal() -> parent.name?.let { name ->
                     LineMarkerData(
                         identifier = parent.nameIdentifier ?: parent.navigationElement,
                         convertedName = name.convertToSnakeCase(),
                         gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_signal.svg", this::class.java)
                     )
                 }
+
+                parent.getOverriddenProperties().any { it.isRegistered() } -> parent.name?.let { name ->
+                    LineMarkerData(
+                        identifier = parent.nameIdentifier ?: parent.navigationElement,
+                        convertedName = name.convertToSnakeCase(),
+                        gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_property.svg", this::class.java)
+                    )
+                }
+
                 else -> null
             }
+
             is KtFunction -> when {
-                parent.findAnnotation(FqName(REGISTER_FUNCTION_ANNOTATION)) != null -> parent.name?.let { name ->
+                parent.findAnnotation(FqName(GODOT_MEMBER_ANNOTATION)) != null -> parent.name?.let { name ->
                     LineMarkerData(
                         identifier = parent.nameIdentifier ?: parent.navigationElement,
                         convertedName = name.convertToSnakeCase(),
                         gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_method.svg", this::class.java)
                     )
                 }
-                else -> null
+
+                else -> {
+                    val superMethods = parent.findAllOverridings().filterIsInstance<KtFunction>()
+
+                    val isAnySuperMethodAApiMethod = superMethods.any { superMethod ->
+                        superMethod.annotations.any { superMethodAnnotation -> superMethodAnnotation.kotlinFqName?.asString() == GODOT_API_MEMBER_ANNOTATION }
+                    }
+                    val isAnySuperMethodRegistered = superMethods.any { it.isRegistered() }
+
+                    if (isAnySuperMethodAApiMethod || isAnySuperMethodRegistered) {
+                        parent.name?.let { name ->
+                            LineMarkerData(
+                                identifier = parent.nameIdentifier ?: parent.navigationElement,
+                                convertedName = name.convertToSnakeCase(),
+                                gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_method.svg", this::class.java)
+                            )
+                        }
+                    } else null
+                }
             }
+
             else -> null
         }
 
@@ -143,3 +211,35 @@ class RegisteredNameLineMarker : LineMarkerProvider {
         } else null
     }
 }
+
+
+fun PsiField.getOverriddenFields(): List<PsiField> {
+    val overriddenFields = mutableListOf<PsiField>()
+    val containingClass = this.containingClass ?: return overriddenFields
+
+    var superClass: PsiClass? = containingClass.superClass
+
+    while (superClass != null) {
+        for (superField in superClass.fields) {
+            if (this.name == superField.name && this.type.isAssignableFrom(superField.type)) {
+                overriddenFields.add(superField)
+            }
+        }
+        superClass = superClass.superClass
+    }
+
+    return overriddenFields
+}
+
+fun KtProperty.getOverriddenProperties(): List<KtProperty> {
+    // Resolve the property to a PropertyDescriptor
+    val propertyDescriptor = this.resolveToDescriptorIfAny(BodyResolveMode.FULL) as? PropertyDescriptor
+        ?: return emptyList()
+
+    // Get overridden properties
+    return DescriptorUtils
+        .getAllOverriddenDescriptors(propertyDescriptor)
+        .filterIsInstance<PropertyDescriptor>()
+        .mapNotNull { it.psiElement }
+        .filterIsInstance<KtProperty>()
+}
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/listener/PsiTreeListener.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/listener/PsiTreeListener.kt
index 79fe392562..9cb0cf8d1f 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/listener/PsiTreeListener.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/listener/PsiTreeListener.kt
@@ -15,7 +15,7 @@ import com.intellij.psi.PsiTreeChangeEvent
 import com.intellij.psi.search.FileTypeIndex
 import com.intellij.psi.search.GlobalSearchScope
 import godot.intellij.plugin.data.cache.classname.RegisteredClassNameCache
-import godot.intellij.plugin.data.model.REGISTER_CLASS_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_SCRIPT_ANNOTATION
 import godot.intellij.plugin.data.model.ResPath
 import godot.intellij.plugin.extension.isInGodotRoot
 import godot.intellij.plugin.refactor.SceneAction
@@ -80,7 +80,7 @@ class PsiTreeListener(
                         }
 
                         containingClasses
-                            .filter { clazz -> clazz.annotations.any { annotation -> annotation.qualifiedName == REGISTER_CLASS_ANNOTATION } }
+                            .filter { clazz -> clazz.annotations.any { annotation -> annotation.qualifiedName == GODOT_SCRIPT_ANNOTATION } }
                             .forEach { registeredClass ->
                                 val module = containingFile.module ?: return@forEach
                                 val simpleName = registeredClass.qualifiedName?.substringAfterLast(".") ?: return@forEach
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/ClassNotRegisteredQuickFix.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/ClassNotRegisteredQuickFix.kt
index f26af95fd6..2805d00cf8 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/ClassNotRegisteredQuickFix.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/ClassNotRegisteredQuickFix.kt
@@ -5,7 +5,7 @@ import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClass
 import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.REGISTER_CLASS_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_SCRIPT_ANNOTATION
 import org.jetbrains.kotlin.asJava.classes.KtUltraLightClass
 import org.jetbrains.kotlin.idea.util.addAnnotation
 import org.jetbrains.kotlin.name.FqName
@@ -21,8 +21,8 @@ class ClassNotRegisteredQuickFix : LocalQuickFix {
         } ?: return
 
         when(psiClass) {
-            is KtUltraLightClass -> psiClass.kotlinOrigin.addAnnotation(FqName(REGISTER_CLASS_ANNOTATION))
-            else -> psiClass.modifierList?.addAnnotation(REGISTER_CLASS_ANNOTATION)
+            is KtUltraLightClass -> psiClass.kotlinOrigin.addAnnotation(FqName(GODOT_SCRIPT_ANNOTATION))
+            else -> psiClass.modifierList?.addAnnotation(GODOT_SCRIPT_ANNOTATION)
         }
     }
 }
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/FunctionNotRegisteredQuickFix.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/FunctionNotRegisteredQuickFix.kt
deleted file mode 100644
index 80ccd3a0aa..0000000000
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/FunctionNotRegisteredQuickFix.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package godot.intellij.plugin.quickfix
-
-import com.intellij.codeInspection.LocalQuickFix
-import com.intellij.codeInspection.ProblemDescriptor
-import com.intellij.openapi.project.Project
-import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.REGISTER_FUNCTION_ANNOTATION
-import org.jetbrains.kotlin.idea.util.addAnnotation
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.psi.KtNamedFunction
-
-class FunctionNotRegisteredQuickFix : LocalQuickFix {
-    override fun getFamilyName(): String = GodotPluginBundle.message("quickFix.function.notificationFunctionNotRegistered.familyName")
-
-    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
-        val ktNamedFunction = descriptor.psiElement as? KtNamedFunction
-            ?: descriptor.psiElement.parent as? KtNamedFunction
-            ?: return
-        ktNamedFunction.addAnnotation(FqName(REGISTER_FUNCTION_ANNOTATION))
-    }
-}
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyNotExportedQuickFix.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyNotExportedQuickFix.kt
deleted file mode 100644
index 4e049b3279..0000000000
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyNotExportedQuickFix.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package godot.intellij.plugin.quickfix
-
-import com.intellij.codeInspection.LocalQuickFix
-import com.intellij.codeInspection.ProblemDescriptor
-import com.intellij.openapi.project.Project
-import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.EXPORT_ANNOTATION
-import org.jetbrains.kotlin.idea.util.addAnnotation
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.psi.KtModifierListOwner
-import org.jetbrains.kotlin.psi.KtProperty
-
-class PropertyNotExportedQuickFix : LocalQuickFix {
-    override fun getFamilyName(): String = GodotPluginBundle.message("quickFix.property.notExported.familyName")
-
-    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
-        val ktProperty = if (descriptor.psiElement is KtProperty) {
-            descriptor.psiElement
-        } else {
-            descriptor.psiElement.parent
-        }
-
-        ktProperty
-            .let { it as? KtModifierListOwner }
-            ?.addAnnotation(FqName(EXPORT_ANNOTATION))
-    }
-}
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyNotRegisteredQuickFix.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyNotRegisteredQuickFix.kt
deleted file mode 100644
index f2f824bbfd..0000000000
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyNotRegisteredQuickFix.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package godot.intellij.plugin.quickfix
-
-import com.intellij.codeInspection.LocalQuickFix
-import com.intellij.codeInspection.ProblemDescriptor
-import com.intellij.openapi.project.Project
-import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.REGISTER_PROPERTY_ANNOTATION
-import org.jetbrains.kotlin.idea.util.addAnnotation
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.psi.KtModifierListOwner
-import org.jetbrains.kotlin.psi.KtProperty
-
-class PropertyNotRegisteredQuickFix : LocalQuickFix {
-    override fun getFamilyName(): String = GodotPluginBundle.message("quickFix.property.notRegistered.familyName")
-
-    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
-        val ktProperty = if (descriptor.psiElement is KtProperty) {
-            descriptor.psiElement
-        } else {
-            descriptor.psiElement.parent
-        }
-
-        ktProperty
-            .let { it as? KtModifierListOwner }
-            ?.addAnnotation(FqName(REGISTER_PROPERTY_ANNOTATION))
-    }
-}
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyRemoveExportAnnotationQuickFix.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyRemoveExportAnnotationQuickFix.kt
deleted file mode 100644
index 761bfd1152..0000000000
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/PropertyRemoveExportAnnotationQuickFix.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package godot.intellij.plugin.quickfix
-
-import com.intellij.codeInspection.LocalQuickFix
-import com.intellij.codeInspection.ProblemDescriptor
-import com.intellij.openapi.project.Project
-import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.EXPORT_ANNOTATION
-import org.jetbrains.kotlin.idea.util.findAnnotation
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.psi.KtProperty
-
-class PropertyRemoveExportAnnotationQuickFix : LocalQuickFix {
-    override fun getFamilyName(): String = GodotPluginBundle.message("quickFix.property.removeExportAnnotation.familyName")
-
-    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
-        val ktProperty = if (descriptor.psiElement is KtProperty) {
-            descriptor.psiElement
-        } else {
-            descriptor.psiElement.parent
-        }
-
-        (ktProperty as? KtProperty)?.findAnnotation(FqName(EXPORT_ANNOTATION))?.delete()
-    }
-}
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/RegisterSignalInitializerQuickFix.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/RegisterSignalInitializerQuickFix.kt
index a0fd7aad05..755780c08a 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/RegisterSignalInitializerQuickFix.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/RegisterSignalInitializerQuickFix.kt
@@ -4,9 +4,7 @@ import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
 import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.REGISTER_SIGNAL_ANNOTATION
 import godot.tools.common.constants.godotCorePackage
-import org.jetbrains.kotlin.idea.util.addAnnotation
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtModifierListOwner
 import org.jetbrains.kotlin.psi.KtProperty
@@ -25,7 +23,7 @@ class RegisterSignalInitializerQuickFix : LocalQuickFix {
         val property = propertyPsi.replace(newProperty)
         property.add(delegate)
 
-        (property as KtModifierListOwner).addAnnotation(FqName(REGISTER_SIGNAL_ANNOTATION))
+        require(property is KtModifierListOwner)
 
         val importDirective = factory.createImportDirective(ImportPath(FqName("$godotCorePackage.signal"), false))
         val imports = property.containingKtFile.importList
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/TargetFunctionNotRegisteredQuickFix.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/TargetFunctionNotRegisteredQuickFix.kt
index 344f3c22e4..f37899d607 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/TargetFunctionNotRegisteredQuickFix.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/TargetFunctionNotRegisteredQuickFix.kt
@@ -4,7 +4,7 @@ import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
 import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.REGISTER_FUNCTION_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_MEMBER_ANNOTATION
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.util.addAnnotation
 import org.jetbrains.kotlin.name.FqName
@@ -21,6 +21,6 @@ class TargetFunctionNotRegisteredQuickFix : LocalQuickFix {
             ?.mainReference
             ?.resolve() as? KtNamedFunction
 
-        ktNamedFunction?.addAnnotation(FqName(REGISTER_FUNCTION_ANNOTATION))
+        ktNamedFunction?.addAnnotation(FqName(GODOT_MEMBER_ANNOTATION))
     }
 }
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/TargetPropertyNotRegisteredQuickFix.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/TargetPropertyNotRegisteredQuickFix.kt
deleted file mode 100644
index ad57bbd7f7..0000000000
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/quickfix/TargetPropertyNotRegisteredQuickFix.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package godot.intellij.plugin.quickfix
-
-import com.intellij.codeInspection.LocalQuickFix
-import com.intellij.codeInspection.ProblemDescriptor
-import com.intellij.openapi.project.Project
-import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.REGISTER_PROPERTY_ANNOTATION
-import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.util.addAnnotation
-import org.jetbrains.kotlin.name.FqName
-
-import org.jetbrains.kotlin.psi.KtCallableReferenceExpression
-import org.jetbrains.kotlin.psi.KtProperty
-
-class TargetPropertyNotRegisteredQuickFix : LocalQuickFix {
-    override fun getFamilyName(): String = GodotPluginBundle.message("quickFix.property.connectedPropertyNotRegistered.familyName")
-
-    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
-        val ktNamedFunction = (descriptor.psiElement as? KtCallableReferenceExpression)
-            ?.callableReference
-            ?.mainReference
-            ?.resolve() as? KtProperty
-
-        ktNamedFunction?.addAnnotation(FqName(REGISTER_PROPERTY_ANNOTATION))
-    }
-}
diff --git a/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties b/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
index d7fde697e6..198484bfd2 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
+++ b/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
@@ -38,16 +38,9 @@ problem.class.constructor.defaultConstructorMissing=There is no default construc
 problem.class.constructor.toManyParams=Godot cannot handle constructors for registered classes with more than {0} parameters. Reduce your parameter count
 problem.class.constructor.overloading=Constructor overloading for registered constructors is not yet supported. Multiple registered constructors in the same class need a different argument count
 problem.class.nameAlreadyRegistered=Class name already registered
-problem.function.notificationFunctionNotRegistered=Overridden virtual function which is not registered will not be called by Godot.\n\
-Using virtual functions for other purposes than to be called from Godot is considered a bad practise.\n\
-Either register it or move your logic to a custom function you defined
-problem.function.overriddenAbstractFunctionNotRegistered=Overrides registered abstract function without registering itself. Without explicit @RegisterFunction annotation on overridden functions, they cannot be called from godot.
 problem.function.rpcChannelSetWhenTransferTypeIgnoresIt=Other values than 0 will be ignored if \"transferMode\" is not set to UNRELIABLE_ORDERED
 problem.function.toManyParams=Registered functions cannot have more than {0} parameters. Reduce your parameter count or wrap parameters in a wrapper class.
 problem.property.hint.wrongType=Property must be of type {0}
-problem.property.hint.notRegistered=Property has a type hint but is not registered
-problem.property.hint.notExported=Property has a type hint but is not exported. This type hint will do nothing
-problem.property.export.notRegistered=Property is exported but not registered
 problem.property.export.triedToExportUnsupportedType=Only types inheriting godot.Object, CoreType's, Godot collections, Kotlin collections, Java collections and primitives can be exported
 problem.property.hint.toManyEnumEntries=Enums used as EnumFlags can only have a maximum of 32 entries
 problem.property.mutability=Registered properties have to be mutable
@@ -86,8 +79,6 @@ quickFix.signal.initializer.familyName=Use "by signal" delegate
 quickFix.signal.mutability.familyName=Make signal immutable
 notification.signal.mutability.error.title=@RegisterSignal Quick Fix
 notification.signal.mutability.error.content=Could not change the mutability of signal {0}. Change it manually
-codeVision.name=[GodotKotlinJVM] Registered name inlay hint
-codeVision.settings.enableCheckbox=[GodotKotlinJVM] Display registered name above element
 linemarker.registeredName.tooltip=Registered as {0}\nClick to copy registered name
 linemarker.registeredName.notRegisteredBecauseIsAbstract.text=Will not be registered, as it's abstract. Members are registered through inheriting classes
 settingsIndex.action.title=Importing {0} GodotKotlinJvm
diff --git a/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt b/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt
index 4a267666d1..2ee51909b1 100644
--- a/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt
+++ b/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt
@@ -47,11 +47,8 @@ object GodotKotlinJvmTypes {
         const val coreTypeHelper = "CoreTypeHelper"
         const val coreTypeLocalCopy = "CoreTypeLocalCopy"
 
-        const val registerClass = "RegisterClass"
-        const val registerConstructor = "RegisterConstructor"
-        const val registerProperty = "RegisterProperty"
-        const val registerFunction = "RegisterFunction"
-        const val registerSignal = "RegisterSignal"
+        const val godotScript = "GodotScript"
+        const val godotMember = "GodotMember"
 
         const val tool = "Tool"
         const val export = "Export"

From af193483fcf16117376aaba1046335de1ea07cc5 Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sun, 13 Oct 2024 12:01:01 +0200
Subject: [PATCH 05/18] Register notification function

---
 .../gut/fonts/AnonymousPro-Bold.ttf.import    |   1 +
 .../fonts/AnonymousPro-BoldItalic.ttf.import  |   1 +
 .../gut/fonts/AnonymousPro-Italic.ttf.import  |   1 +
 .../gut/fonts/AnonymousPro-Regular.ttf.import |   1 +
 .../gut/fonts/CourierPrime-Bold.ttf.import    |   1 +
 .../fonts/CourierPrime-BoldItalic.ttf.import  |   1 +
 .../gut/fonts/CourierPrime-Italic.ttf.import  |   1 +
 .../gut/fonts/CourierPrime-Regular.ttf.import |   1 +
 .../gut/fonts/LobsterTwo-Bold.ttf.import      |   1 +
 .../fonts/LobsterTwo-BoldItalic.ttf.import    |   1 +
 .../gut/fonts/LobsterTwo-Italic.ttf.import    |   1 +
 .../gut/fonts/LobsterTwo-Regular.ttf.import   |   1 +
 harness/tests/addons/gut/strutils.gd          | 260 ++++++++--------
 .../tests/scripts/godot/tests/Invocation.gdj  | 292 +++++++++---------
 .../inheritance/ClassInheritanceParent.kt     |   1 +
 harness/tests/test/unit/test_array.gd         |  92 +++---
 harness/tests/test/unit/test_binding.gd       | 170 +++++-----
 .../tests/test/unit/test_call_java_class.gd   |  32 +-
 .../tests/test/unit/test_constructor_args.gd  | 170 +++++-----
 harness/tests/test/unit/test_constructors.gd  |  18 +-
 .../test/unit/test_core_types_identity.gd     | 100 +++---
 21 files changed, 580 insertions(+), 567 deletions(-)

diff --git a/harness/tests/addons/gut/fonts/AnonymousPro-Bold.ttf.import b/harness/tests/addons/gut/fonts/AnonymousPro-Bold.ttf.import
index a3eb4791fb..de1351f60d 100644
--- a/harness/tests/addons/gut/fonts/AnonymousPro-Bold.ttf.import
+++ b/harness/tests/addons/gut/fonts/AnonymousPro-Bold.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/AnonymousPro-Bold.ttf-9d8fef4d357af5b52cd60af
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/fonts/AnonymousPro-BoldItalic.ttf.import b/harness/tests/addons/gut/fonts/AnonymousPro-BoldItalic.ttf.import
index ef28dd8056..bdde20728a 100644
--- a/harness/tests/addons/gut/fonts/AnonymousPro-BoldItalic.ttf.import
+++ b/harness/tests/addons/gut/fonts/AnonymousPro-BoldItalic.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/AnonymousPro-BoldItalic.ttf-4274bf704d3d6b9cd
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/fonts/AnonymousPro-Italic.ttf.import b/harness/tests/addons/gut/fonts/AnonymousPro-Italic.ttf.import
index 1779af1720..ce3e5b918b 100644
--- a/harness/tests/addons/gut/fonts/AnonymousPro-Italic.ttf.import
+++ b/harness/tests/addons/gut/fonts/AnonymousPro-Italic.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/AnonymousPro-Italic.ttf-9989590b02137b799e13d
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/fonts/AnonymousPro-Regular.ttf.import b/harness/tests/addons/gut/fonts/AnonymousPro-Regular.ttf.import
index 1e2975b155..a567498cda 100644
--- a/harness/tests/addons/gut/fonts/AnonymousPro-Regular.ttf.import
+++ b/harness/tests/addons/gut/fonts/AnonymousPro-Regular.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/AnonymousPro-Regular.ttf-856c843fd6f89964d2ca
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/fonts/CourierPrime-Bold.ttf.import b/harness/tests/addons/gut/fonts/CourierPrime-Bold.ttf.import
index 7d60fb0a2c..cb05171da6 100644
--- a/harness/tests/addons/gut/fonts/CourierPrime-Bold.ttf.import
+++ b/harness/tests/addons/gut/fonts/CourierPrime-Bold.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/CourierPrime-Bold.ttf-1f003c66d63ebed70964e77
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/fonts/CourierPrime-BoldItalic.ttf.import b/harness/tests/addons/gut/fonts/CourierPrime-BoldItalic.ttf.import
index 4678c9ebb2..0a9a7b770f 100644
--- a/harness/tests/addons/gut/fonts/CourierPrime-BoldItalic.ttf.import
+++ b/harness/tests/addons/gut/fonts/CourierPrime-BoldItalic.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/CourierPrime-BoldItalic.ttf-65ebcc61dd5e1dfa8
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/fonts/CourierPrime-Italic.ttf.import b/harness/tests/addons/gut/fonts/CourierPrime-Italic.ttf.import
index 522e2950ce..89412fc98c 100644
--- a/harness/tests/addons/gut/fonts/CourierPrime-Italic.ttf.import
+++ b/harness/tests/addons/gut/fonts/CourierPrime-Italic.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/CourierPrime-Italic.ttf-baa9156a73770735a0f72
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/fonts/CourierPrime-Regular.ttf.import b/harness/tests/addons/gut/fonts/CourierPrime-Regular.ttf.import
index 38174660fb..9fde40b1be 100644
--- a/harness/tests/addons/gut/fonts/CourierPrime-Regular.ttf.import
+++ b/harness/tests/addons/gut/fonts/CourierPrime-Regular.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/CourierPrime-Regular.ttf-3babe7e4a7a588dfc9a8
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/fonts/LobsterTwo-Bold.ttf.import b/harness/tests/addons/gut/fonts/LobsterTwo-Bold.ttf.import
index 7548ad04dc..673d15155e 100644
--- a/harness/tests/addons/gut/fonts/LobsterTwo-Bold.ttf.import
+++ b/harness/tests/addons/gut/fonts/LobsterTwo-Bold.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/LobsterTwo-Bold.ttf-7c7f734103b58a32491a47881
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/fonts/LobsterTwo-BoldItalic.ttf.import b/harness/tests/addons/gut/fonts/LobsterTwo-BoldItalic.ttf.import
index 4b609e80bd..62048b0efd 100644
--- a/harness/tests/addons/gut/fonts/LobsterTwo-BoldItalic.ttf.import
+++ b/harness/tests/addons/gut/fonts/LobsterTwo-BoldItalic.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/LobsterTwo-BoldItalic.ttf-227406a33e84448e6aa
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/fonts/LobsterTwo-Italic.ttf.import b/harness/tests/addons/gut/fonts/LobsterTwo-Italic.ttf.import
index 5899b79770..d3ca272819 100644
--- a/harness/tests/addons/gut/fonts/LobsterTwo-Italic.ttf.import
+++ b/harness/tests/addons/gut/fonts/LobsterTwo-Italic.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/LobsterTwo-Italic.ttf-f93abf6c25390c85ad5fb6c
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/fonts/LobsterTwo-Regular.ttf.import b/harness/tests/addons/gut/fonts/LobsterTwo-Regular.ttf.import
index 45a12c8a53..9cc754218b 100644
--- a/harness/tests/addons/gut/fonts/LobsterTwo-Regular.ttf.import
+++ b/harness/tests/addons/gut/fonts/LobsterTwo-Regular.ttf.import
@@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/LobsterTwo-Regular.ttf-f3fcfa01cd671c8da433dd
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
+disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48
diff --git a/harness/tests/addons/gut/strutils.gd b/harness/tests/addons/gut/strutils.gd
index 51e45ccea4..b5b1eff5a0 100644
--- a/harness/tests/addons/gut/strutils.gd
+++ b/harness/tests/addons/gut/strutils.gd
@@ -7,139 +7,139 @@ var _utils = load('res://addons/gut/utils.gd').get_instance()
 var types = {}
 
 func _init_types_dictionary():
-	types[TYPE_AABB] = 'AABB'
-	types[TYPE_ARRAY] = 'ARRAY'
-	types[TYPE_BASIS] = 'BASIS'
-	types[TYPE_BOOL] = 'BOOL'
-	types[TYPE_CALLABLE] = 'CALLABLE'
-	types[TYPE_COLOR] = 'COLOR'
-	types[TYPE_DICTIONARY] = 'DICTIONARY'
-	types[TYPE_FLOAT] = 'FLOAT'
-	types[TYPE_INT] = 'INT'
-	types[TYPE_MAX] = 'MAX'
-	types[TYPE_NODE_PATH] = 'NODE_PATH'
-	types[TYPE_OBJECT] = 'OBJECT'
-	types[TYPE_PACKED_BYTE_ARRAY] = 'PACKED_BYTE_ARRAY'
-	types[TYPE_PACKED_COLOR_ARRAY] = 'PACKED_COLOR_ARRAY'
-	types[TYPE_PACKED_FLOAT32_ARRAY] = 'PACKED_FLOAT32_ARRAY'
-	types[TYPE_PACKED_FLOAT64_ARRAY] = 'PACKED_FLOAT64_ARRAY'
-	types[TYPE_PACKED_INT32_ARRAY] = 'PACKED_INT32_ARRAY'
-	types[TYPE_PACKED_INT64_ARRAY] = 'PACKED_INT64_ARRAY'
-	types[TYPE_PACKED_STRING_ARRAY] = 'PACKED_STRING_ARRAY'
-	types[TYPE_PACKED_VECTOR2_ARRAY] = 'PACKED_VECTOR2_ARRAY'
-	types[TYPE_PACKED_VECTOR3_ARRAY] = 'PACKED_VECTOR3_ARRAY'
-	types[TYPE_PLANE] = 'PLANE'
-	types[TYPE_PROJECTION] = 'PROJECTION'
-	types[TYPE_QUATERNION] = 'QUATERNION'
-	types[TYPE_RECT2] = 'RECT2'
-	types[TYPE_RECT2I] = 'RECT2I'
-	types[TYPE_RID] = 'RID'
-	types[TYPE_SIGNAL] = 'SIGNAL'
-	types[TYPE_STRING_NAME] = 'STRING_NAME'
-	types[TYPE_STRING] = 'STRING'
-	types[TYPE_TRANSFORM2D] = 'TRANSFORM2D'
-	types[TYPE_TRANSFORM3D] = 'TRANSFORM3D'
-	types[TYPE_VECTOR2] = 'VECTOR2'
-	types[TYPE_VECTOR2I] = 'VECTOR2I'
-	types[TYPE_VECTOR3] = 'VECTOR3'
-	types[TYPE_VECTOR3I] = 'VECTOR3I'
-	types[TYPE_VECTOR4] = 'VECTOR4'
-	types[TYPE_VECTOR4I] = 'VECTOR4I'
+    types[TYPE_AABB] = 'AABB'
+    types[TYPE_ARRAY] = 'ARRAY'
+    types[TYPE_BASIS] = 'BASIS'
+    types[TYPE_BOOL] = 'BOOL'
+    types[TYPE_CALLABLE] = 'CALLABLE'
+    types[TYPE_COLOR] = 'COLOR'
+    types[TYPE_DICTIONARY] = 'DICTIONARY'
+    types[TYPE_FLOAT] = 'FLOAT'
+    types[TYPE_INT] = 'INT'
+    types[TYPE_MAX] = 'MAX'
+    types[TYPE_NODE_PATH] = 'NODE_PATH'
+    types[TYPE_OBJECT] = 'OBJECT'
+    types[TYPE_PACKED_BYTE_ARRAY] = 'PACKED_BYTE_ARRAY'
+    types[TYPE_PACKED_COLOR_ARRAY] = 'PACKED_COLOR_ARRAY'
+    types[TYPE_PACKED_FLOAT32_ARRAY] = 'PACKED_FLOAT32_ARRAY'
+    types[TYPE_PACKED_FLOAT64_ARRAY] = 'PACKED_FLOAT64_ARRAY'
+    types[TYPE_PACKED_INT32_ARRAY] = 'PACKED_INT32_ARRAY'
+    types[TYPE_PACKED_INT64_ARRAY] = 'PACKED_INT64_ARRAY'
+    types[TYPE_PACKED_STRING_ARRAY] = 'PACKED_STRING_ARRAY'
+    types[TYPE_PACKED_VECTOR2_ARRAY] = 'PACKED_VECTOR2_ARRAY'
+    types[TYPE_PACKED_VECTOR3_ARRAY] = 'PACKED_VECTOR3_ARRAY'
+    types[TYPE_PLANE] = 'PLANE'
+    types[TYPE_PROJECTION] = 'PROJECTION'
+    types[TYPE_QUATERNION] = 'QUATERNION'
+    types[TYPE_RECT2] = 'RECT2'
+    types[TYPE_RECT2I] = 'RECT2I'
+    types[TYPE_RID] = 'RID'
+    types[TYPE_SIGNAL] = 'SIGNAL'
+    types[TYPE_STRING_NAME] = 'STRING_NAME'
+    types[TYPE_STRING] = 'STRING'
+    types[TYPE_TRANSFORM2D] = 'TRANSFORM2D'
+    types[TYPE_TRANSFORM3D] = 'TRANSFORM3D'
+    types[TYPE_VECTOR2] = 'VECTOR2'
+    types[TYPE_VECTOR2I] = 'VECTOR2I'
+    types[TYPE_VECTOR3] = 'VECTOR3'
+    types[TYPE_VECTOR3I] = 'VECTOR3I'
+    types[TYPE_VECTOR4] = 'VECTOR4'
+    types[TYPE_VECTOR4I] = 'VECTOR4I'
 
 # Types to not be formatted when using _str
 var _str_ignore_types = [
-	TYPE_INT, TYPE_FLOAT, TYPE_STRING,
-	TYPE_NIL, TYPE_BOOL
+    TYPE_INT, TYPE_FLOAT, TYPE_STRING,
+    TYPE_NIL, TYPE_BOOL
 ]
 
 func _init():
-	_init_types_dictionary()
+    _init_types_dictionary()
 
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 func _get_filename(path):
-	return path.split('/')[-1]
+    return path.split('/')[-1]
 
 # ------------------------------------------------------------------------------
 # Gets the filename of an object passed in.  This does not return the
 # full path to the object, just the filename.
 # ------------------------------------------------------------------------------
 func _get_obj_filename(thing):
-	var filename = null
-
-	if(thing == null or
-		_utils.is_native_class(thing) or
-		!is_instance_valid(thing) or
-		str(thing) == '<Object#null>' or
-		typeof(thing) != TYPE_OBJECT or
-		_utils.is_double(thing)):
-		return
-
-	if(thing.get_script() == null):
-		if(thing is PackedScene):
-			filename = _get_filename(thing.resource_path)
-		else:
-			# If it isn't a packed scene and it doesn't have a script then
-			# we do nothing.  This just reads better.
-			pass
-	elif(!_utils.is_native_class(thing)):
-		var dict = inst_to_dict(thing)
-		filename = _get_filename(dict['@path'])
-		if(str(dict['@subpath']) != ''):
-			filename += str('/', dict['@subpath'])
-
-	return filename
+    var filename = null
+
+    if(thing == null or
+        _utils.is_native_class(thing) or
+        !is_instance_valid(thing) or
+        str(thing) == '<Object#null>' or
+        typeof(thing) != TYPE_OBJECT or
+        _utils.is_double(thing)):
+        return
+
+    if(thing.get_script() == null):
+        if(thing is PackedScene):
+            filename = _get_filename(thing.resource_path)
+        else:
+            # If it isn't a packed scene and it doesn't have a script then
+            # we do nothing.  This just reads better.
+            pass
+    elif(!_utils.is_native_class(thing)):
+        var dict = inst_to_dict(thing)
+        filename = _get_filename(dict['@path'])
+        if(str(dict['@subpath']) != ''):
+            filename += str('/', dict['@subpath'])
+
+    return filename
 
 # ------------------------------------------------------------------------------
 # Better object/thing to string conversion.  Includes extra details about
 # whatever is passed in when it can/should.
 # ------------------------------------------------------------------------------
 func type2str(thing):
-	var filename = _get_obj_filename(thing)
-	var str_thing = str(thing)
-
-	if(thing == null):
-		# According to str there is a difference between null and an Object
-		# that is somehow null.  To avoid getting '[Object:null]' as output
-		# always set it to str(null) instead of str(thing).  A null object
-		# will pass typeof(thing) == TYPE_OBJECT check so this has to be
-		# before that.
-		str_thing = str(null)
-	elif(typeof(thing) == TYPE_FLOAT):
-		if(!'.' in str_thing):
-			str_thing += '.0'
-	elif(typeof(thing) == TYPE_STRING):
-		str_thing = str('"', thing, '"')
-	elif(typeof(thing) in _str_ignore_types):
-		# do nothing b/c we already have str(thing) in
-		# to_return.  I think this just reads a little
-		# better this way.
-		pass
-	elif(typeof(thing) == TYPE_OBJECT):
-		if(_utils.is_native_class(thing)):
-			str_thing = _utils.get_native_class_name(thing)
-		elif(_utils.is_double(thing)):
-			var double_path = _get_filename(thing.__gutdbl.thepath)
-			if(thing.__gutdbl.subpath != ''):
-				double_path += str('/', thing.__gutdbl.subpath)
-			elif(thing.__gutdbl.from_singleton != ''):
-				double_path = thing.__gutdbl.from_singleton + " Singleton"
-
-			var double_type = "double"
-			if(thing.__gutdbl.is_partial):
-				double_type = "partial-double"
-
-			str_thing += str("(", double_type, " of ", double_path, ")")
-
-			filename = null
-	elif(types.has(typeof(thing))):
-		if(!str_thing.begins_with('(')):
-			str_thing = '(' + str_thing + ')'
-		str_thing = str(types[typeof(thing)], str_thing)
-
-	if(filename != null):
-		str_thing += str('(', filename, ')')
-	return str_thing
+    var filename = _get_obj_filename(thing)
+    var str_thing = str(thing)
+
+    if(thing == null):
+        # According to str there is a difference between null and an Object
+        # that is somehow null.  To avoid getting '[Object:null]' as output
+        # always set it to str(null) instead of str(thing).  A null object
+        # will pass typeof(thing) == TYPE_OBJECT check so this has to be
+        # before that.
+        str_thing = str(null)
+    elif(typeof(thing) == TYPE_FLOAT):
+        if(!'.' in str_thing):
+            str_thing += '.0'
+    elif(typeof(thing) == TYPE_STRING):
+        str_thing = str('"', thing, '"')
+    elif(typeof(thing) in _str_ignore_types):
+        # do nothing b/c we already have str(thing) in
+        # to_return.  I think this just reads a little
+        # better this way.
+        pass
+    elif(typeof(thing) == TYPE_OBJECT):
+        if(_utils.is_native_class(thing)):
+            str_thing = _utils.get_native_class_name(thing)
+        elif(_utils.is_double(thing)):
+            var double_path = _get_filename(thing.__gutdbl.thepath)
+            if(thing.__gutdbl.subpath != ''):
+                double_path += str('/', thing.__gutdbl.subpath)
+            elif(thing.__gutdbl.from_singleton != ''):
+                double_path = thing.__gutdbl.from_singleton + " Singleton"
+
+            var double_type = "double"
+            if(thing.__gutdbl.is_partial):
+                double_type = "partial-double"
+
+            str_thing += str("(", double_type, " of ", double_path, ")")
+
+            filename = null
+    elif(types.has(typeof(thing))):
+        if(!str_thing.begins_with('(')):
+            str_thing = '(' + str_thing + ')'
+        str_thing = str(types[typeof(thing)], str_thing)
+
+    if(filename != null):
+        str_thing += str('(', filename, ')')
+    return str_thing
 
 # ------------------------------------------------------------------------------
 # Returns the string truncated with an '...' in it.  Shows the start and last
@@ -147,32 +147,32 @@ func type2str(thing):
 # returned.  If max_size is -1 then truncation is skipped.
 # ------------------------------------------------------------------------------
 func truncate_string(src, max_size):
-	var to_return = src
-	if(src.length() > max_size - 10 and max_size != -1):
-		to_return = str(src.substr(0, max_size - 10), '...',  src.substr(src.length() - 10, src.length()))
-	return to_return
+    var to_return = src
+    if(src.length() > max_size - 10 and max_size != -1):
+        to_return = str(src.substr(0, max_size - 10), '...',  src.substr(src.length() - 10, src.length()))
+    return to_return
 
 
 func _get_indent_text(times, pad):
-	var to_return = ''
-	for i in range(times):
-		to_return += pad
+    var to_return = ''
+    for i in range(times):
+        to_return += pad
 
-	return to_return
+    return to_return
 
 func indent_text(text, times, pad):
-	if(times == 0):
-		return text
+    if(times == 0):
+        return text
 
-	var to_return = text
-	var ending_newline = ''
+    var to_return = text
+    var ending_newline = ''
 
-	if(text.ends_with("\n")):
-		ending_newline = "\n"
-		to_return = to_return.left(to_return.length() -1)
+    if(text.ends_with("\n")):
+        ending_newline = "\n"
+        to_return = to_return.left(to_return.length() -1)
 
-	var padding = _get_indent_text(times, pad)
-	to_return = to_return.replace("\n", "\n" + padding)
-	to_return += ending_newline
+    var padding = _get_indent_text(times, pad)
+    to_return = to_return.replace("\n", "\n" + padding)
+    to_return += ending_newline
 
-	return padding + to_return
+    return padding + to_return
diff --git a/harness/tests/scripts/godot/tests/Invocation.gdj b/harness/tests/scripts/godot/tests/Invocation.gdj
index 514052f873..5b9a840ac7 100644
--- a/harness/tests/scripts/godot/tests/Invocation.gdj
+++ b/harness/tests/scripts/godot/tests/Invocation.gdj
@@ -7,158 +7,158 @@ relativeSourcePath = src/main/kotlin/godot/tests/Invocation.kt
 baseType = Node3D
 supertypes = [
     godot.Node3D,
-	godot.Node,
-	godot.Object,
-	godot.core.KtObject,
-	kotlin.Any
+    godot.Node,
+    godot.Object,
+    godot.core.KtObject,
+    kotlin.Any
 ]
 signals = [
     
 ]
 properties = [
     button,
-	enum_list,
-	vector_list,
-	enum_list_mutable,
-	register_object,
-	register_object_nullable,
-	register_object_nullable_pre_init,
-	register_object_non_nullable_pre_init,
-	vector,
-	x,
-	y,
-	z,
-	custom_name,
-	invocation,
-	enum_test,
-	resource_test,
-	jvm_id,
-	test_array_any,
-	nav_meshes,
-	nullable_array,
-	any_to_any_dictionary,
-	nav_meshes_dictionary,
-	nullable_dictionary,
-	color,
-	rid,
-	packed_byte_array,
-	packed_int32_array,
-	packed_float64_array,
-	packed_color_array,
-	packed_string_array,
-	packed_vector2_array,
-	packed_vector3_array,
-	p1,
-	p1_1,
-	p2,
-	p3,
-	p4,
-	p5,
-	p6,
-	p7,
-	p8,
-	p9,
-	p10,
-	p11,
-	p12,
-	p13,
-	p14,
-	p15,
-	p16,
-	p17,
-	stringtemplation,
-	test_string,
-	ascii_string,
-	utf8_string
+    enum_list,
+    vector_list,
+    enum_list_mutable,
+    register_object,
+    register_object_nullable,
+    register_object_nullable_pre_init,
+    register_object_non_nullable_pre_init,
+    vector,
+    x,
+    y,
+    z,
+    custom_name,
+    invocation,
+    enum_test,
+    resource_test,
+    jvm_id,
+    test_array_any,
+    nav_meshes,
+    nullable_array,
+    any_to_any_dictionary,
+    nav_meshes_dictionary,
+    nullable_dictionary,
+    color,
+    rid,
+    packed_byte_array,
+    packed_int32_array,
+    packed_float64_array,
+    packed_color_array,
+    packed_string_array,
+    packed_vector2_array,
+    packed_vector3_array,
+    p1,
+    p1_1,
+    p2,
+    p3,
+    p4,
+    p5,
+    p6,
+    p7,
+    p8,
+    p9,
+    p10,
+    p11,
+    p12,
+    p13,
+    p14,
+    p15,
+    p16,
+    p17,
+    stringtemplation,
+    test_string,
+    ascii_string,
+    utf8_string
 ]
 functions = [
     int_value,
-	long_value,
-	float_value,
-	double_value,
-	boolean_value,
-	string_value,
-	int_addition,
-	init_nullables,
-	_enter_tree,
-	_ready,
-	get_rid_id,
-	get_nav_mesh_rid,
-	append_to_any_dict,
-	remove_from_any_dict,
-	get_from_any_dict,
-	any_dict_size,
-	append_to_string_nav_mesh_dict,
-	remove_from_string_nav_mesh_dict,
-	get_from_string_nav_mesh_dict,
-	string_nav_mesh_dict_size,
-	append_to_string_nav_mesh_nullable_dict,
-	remove_from_string_nav_mesh_nullable_dict,
-	string_nav_mesh_nullable_dict_size,
-	append_nullable_standard_nav_mesh,
-	append_nullable_nav_mesh,
-	remove_nullable_nav_mesh,
-	remove_nullable_nav_mesh_with_index,
-	nullable_nav_meshes_size,
-	append_standard_nav_mesh,
-	append_nav_mesh,
-	remove_nav_mesh,
-	remove_nav_mesh_with_index,
-	get_nav_mesh_from_array,
-	nav_meshes_size,
-	append_any_to_array,
-	remove_any_from_array,
-	get_any_from_array,
-	array_any_size,
-	count_namesh_instance,
-	get_nav_mesh_count,
-	parent_is_node3_d,
-	is_object_node3_d,
-	other_jvm_id,
-	has_camera_node,
-	add_byte_to_packed_array,
-	add_byte_array_to_packed_array,
-	delete_byte_from_packed_array,
-	get_byte_from_packed_array,
-	set_byte_in_packed_array,
-	resize_byte_packed_array,
-	add_color_to_packed_array,
-	add_color_array_to_packed_array,
-	delete_color_from_packed_array,
-	get_color_from_packed_array,
-	set_color_in_packed_array,
-	resize_color_packed_array,
-	add_int_to_packed_array,
-	add_int_array_to_packed_array,
-	delete_int_from_packed_array,
-	get_int_from_packed_array,
-	set_int_in_packed_array,
-	resize_int_packed_array,
-	add_real_to_packed_array,
-	add_real_array_to_packed_array,
-	read_string_from_byte_array,
-	delete_real_from_packed_array,
-	get_real_from_packed_array,
-	set_real_in_packed_array,
-	resize_real_packed_array,
-	add_string_to_packed_array,
-	add_string_array_to_packed_array,
-	delete_string_from_packed_array,
-	get_string_from_packed_array,
-	set_string_in_packed_array,
-	resize_string_packed_array,
-	add_vector2_to_packed_array,
-	add_vector2_array_to_packed_array,
-	delete_vector2_from_packed_array,
-	get_vector2_from_packed_array,
-	set_vector2_in_packed_array,
-	resize_vector2_packed_array,
-	add_vector3_to_packed_array,
-	add_vector3_array_to_packed_array,
-	delete_vector3_from_packed_array,
-	get_vector3_from_packed_array,
-	set_vector3_in_packed_array,
-	resize_vector3_packed_array,
-	is_sent_xr_same_instance_as_jvm_singleton,
-	create_variant_array_of_user_type
-]
\ No newline at end of file
+    long_value,
+    float_value,
+    double_value,
+    boolean_value,
+    string_value,
+    int_addition,
+    init_nullables,
+    _enter_tree,
+    _ready,
+    get_rid_id,
+    get_nav_mesh_rid,
+    append_to_any_dict,
+    remove_from_any_dict,
+    get_from_any_dict,
+    any_dict_size,
+    append_to_string_nav_mesh_dict,
+    remove_from_string_nav_mesh_dict,
+    get_from_string_nav_mesh_dict,
+    string_nav_mesh_dict_size,
+    append_to_string_nav_mesh_nullable_dict,
+    remove_from_string_nav_mesh_nullable_dict,
+    string_nav_mesh_nullable_dict_size,
+    append_nullable_standard_nav_mesh,
+    append_nullable_nav_mesh,
+    remove_nullable_nav_mesh,
+    remove_nullable_nav_mesh_with_index,
+    nullable_nav_meshes_size,
+    append_standard_nav_mesh,
+    append_nav_mesh,
+    remove_nav_mesh,
+    remove_nav_mesh_with_index,
+    get_nav_mesh_from_array,
+    nav_meshes_size,
+    append_any_to_array,
+    remove_any_from_array,
+    get_any_from_array,
+    array_any_size,
+    count_namesh_instance,
+    get_nav_mesh_count,
+    parent_is_node3_d,
+    is_object_node3_d,
+    other_jvm_id,
+    has_camera_node,
+    add_byte_to_packed_array,
+    add_byte_array_to_packed_array,
+    delete_byte_from_packed_array,
+    get_byte_from_packed_array,
+    set_byte_in_packed_array,
+    resize_byte_packed_array,
+    add_color_to_packed_array,
+    add_color_array_to_packed_array,
+    delete_color_from_packed_array,
+    get_color_from_packed_array,
+    set_color_in_packed_array,
+    resize_color_packed_array,
+    add_int_to_packed_array,
+    add_int_array_to_packed_array,
+    delete_int_from_packed_array,
+    get_int_from_packed_array,
+    set_int_in_packed_array,
+    resize_int_packed_array,
+    add_real_to_packed_array,
+    add_real_array_to_packed_array,
+    read_string_from_byte_array,
+    delete_real_from_packed_array,
+    get_real_from_packed_array,
+    set_real_in_packed_array,
+    resize_real_packed_array,
+    add_string_to_packed_array,
+    add_string_array_to_packed_array,
+    delete_string_from_packed_array,
+    get_string_from_packed_array,
+    set_string_in_packed_array,
+    resize_string_packed_array,
+    add_vector2_to_packed_array,
+    add_vector2_array_to_packed_array,
+    delete_vector2_from_packed_array,
+    get_vector2_from_packed_array,
+    set_vector2_in_packed_array,
+    resize_vector2_packed_array,
+    add_vector3_to_packed_array,
+    add_vector3_array_to_packed_array,
+    delete_vector3_from_packed_array,
+    get_vector3_from_packed_array,
+    set_vector3_in_packed_array,
+    resize_vector3_packed_array,
+    is_sent_xr_same_instance_as_jvm_singleton,
+    create_variant_array_of_user_type
+]
diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
index c04de81f6e..1146e1ec8b 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
@@ -44,6 +44,7 @@ open class ClassInheritanceParent : Node() {
     @GodotMember
     var notificationCallBitFlag = 0
 
+    @GodotMember
     override fun _notification(): GodotNotification = godotNotification {
         GD.print("Called ClassInheritanceParent::_notification on $this with $it")
         notificationCallBitFlag = notificationCallBitFlag or 1
diff --git a/harness/tests/test/unit/test_array.gd b/harness/tests/test/unit/test_array.gd
index 54e0f2d647..753c5426b2 100644
--- a/harness/tests/test/unit/test_array.gd
+++ b/harness/tests/test/unit/test_array.gd
@@ -2,60 +2,60 @@ extends "res://addons/gut/test.gd"
 
 
 func test_array_any_not_null_append():
-	var invocation_script: Object = Invocation.new()
-	assert_eq(invocation_script.array_any_size(), 0, "Array should be empty")
-	var obj: Node = Node.new()
-	invocation_script.append_any_to_array(obj)
-	invocation_script.append_any_to_array(1)
-	assert_eq(invocation_script.array_any_size(), 2, "Array size should be 2")
-	assert_eq(invocation_script.test_array_any[0], obj, "Should find obj at index 0")
-	assert_eq(invocation_script.get_any_from_array(0), obj, "Should find obj at index 0")
-	assert_eq(invocation_script.test_array_any[1], 1, "Should find 1 at index 2")
-	assert_eq(invocation_script.get_any_from_array(1), 1, "Should find 1 at index 2")
-	invocation_script.free()
-	obj.free()
+    var invocation_script: Object = Invocation.new()
+    assert_eq(invocation_script.array_any_size(), 0, "Array should be empty")
+    var obj: Node = Node.new()
+    invocation_script.append_any_to_array(obj)
+    invocation_script.append_any_to_array(1)
+    assert_eq(invocation_script.array_any_size(), 2, "Array size should be 2")
+    assert_eq(invocation_script.test_array_any[0], obj, "Should find obj at index 0")
+    assert_eq(invocation_script.get_any_from_array(0), obj, "Should find obj at index 0")
+    assert_eq(invocation_script.test_array_any[1], 1, "Should find 1 at index 2")
+    assert_eq(invocation_script.get_any_from_array(1), 1, "Should find 1 at index 2")
+    invocation_script.free()
+    obj.free()
 
 func test_array_any_not_null_remove():
-	var invocation_script: Object = Invocation.new()
-	invocation_script.append_any_to_array(1)
-	assert_eq(invocation_script.array_any_size(), 1, "Array size should be 1")
-	invocation_script.remove_any_from_array(1)
-	assert_eq(invocation_script.array_any_size(), 0, "Array size should be 0")
-	var obj = Node.new()
-	invocation_script.append_any_to_array(obj)
-	assert_eq(invocation_script.array_any_size(), 1, "Array size should be 1")
-	invocation_script.remove_any_from_array(obj)
-	assert_eq(invocation_script.array_any_size(), 0, "Array size should be 0")
-	invocation_script.free()
-	obj.free()
+    var invocation_script: Object = Invocation.new()
+    invocation_script.append_any_to_array(1)
+    assert_eq(invocation_script.array_any_size(), 1, "Array size should be 1")
+    invocation_script.remove_any_from_array(1)
+    assert_eq(invocation_script.array_any_size(), 0, "Array size should be 0")
+    var obj = Node.new()
+    invocation_script.append_any_to_array(obj)
+    assert_eq(invocation_script.array_any_size(), 1, "Array size should be 1")
+    invocation_script.remove_any_from_array(obj)
+    assert_eq(invocation_script.array_any_size(), 0, "Array size should be 0")
+    invocation_script.free()
+    obj.free()
 
 func test_array_typed_not_null_append():
-	var invocation_script: Object = Invocation.new()
-	assert_eq(invocation_script.nav_meshes_size(), 1, "Array size should be 1")
-	var nav_mesh = NavigationMesh.new()
-	invocation_script.append_nav_mesh(nav_mesh)
-	assert_eq(invocation_script.nav_meshes_size(), 2, "Array size should be 2")
-	assert_eq(invocation_script.nav_meshes[1], nav_mesh, "Should find nav_mesh at index 1")
-	assert_eq(invocation_script.get_nav_mesh_from_array(1), nav_mesh, "Should find nav_mesh at index 1")
-	invocation_script.free()
+    var invocation_script: Object = Invocation.new()
+    assert_eq(invocation_script.nav_meshes_size(), 1, "Array size should be 1")
+    var nav_mesh = NavigationMesh.new()
+    invocation_script.append_nav_mesh(nav_mesh)
+    assert_eq(invocation_script.nav_meshes_size(), 2, "Array size should be 2")
+    assert_eq(invocation_script.nav_meshes[1], nav_mesh, "Should find nav_mesh at index 1")
+    assert_eq(invocation_script.get_nav_mesh_from_array(1), nav_mesh, "Should find nav_mesh at index 1")
+    invocation_script.free()
 
 func test_array_typed_not_null_remove():
-	var invocation_script: Object = Invocation.new()
-	assert_eq(invocation_script.nav_meshes_size(), 1, "Array size should be 1")
-	invocation_script.remove_nav_mesh_with_index(0)
-	assert_eq(invocation_script.nav_meshes_size(), 0, "Array size should be 0")
-	var nav_mesh = NavigationMesh.new()
-	invocation_script.append_nav_mesh(nav_mesh)
-	assert_eq(invocation_script.nav_meshes_size(), 1, "Array size should be 1")
-	invocation_script.remove_nav_mesh(nav_mesh)
-	assert_eq(invocation_script.nav_meshes_size(), 0, "Array size should be 0")
-	invocation_script.free()
+    var invocation_script: Object = Invocation.new()
+    assert_eq(invocation_script.nav_meshes_size(), 1, "Array size should be 1")
+    invocation_script.remove_nav_mesh_with_index(0)
+    assert_eq(invocation_script.nav_meshes_size(), 0, "Array size should be 0")
+    var nav_mesh = NavigationMesh.new()
+    invocation_script.append_nav_mesh(nav_mesh)
+    assert_eq(invocation_script.nav_meshes_size(), 1, "Array size should be 1")
+    invocation_script.remove_nav_mesh(nav_mesh)
+    assert_eq(invocation_script.nav_meshes_size(), 0, "Array size should be 0")
+    invocation_script.free()
 
 func test_create_user_type_variant_array():
-	var invocation_script = Invocation.new()
-	var user_type_variant_array = invocation_script.create_variant_array_of_user_type()
-	assert_not_null(user_type_variant_array, "Should return an empty user typed variant array.")
-	invocation_script.free()
+    var invocation_script = Invocation.new()
+    var user_type_variant_array = invocation_script.create_variant_array_of_user_type()
+    assert_not_null(user_type_variant_array, "Should return an empty user typed variant array.")
+    invocation_script.free()
 
 #TODO : Should be uncommented when registering nullable is done
 #func test_array_nullable_append():
diff --git a/harness/tests/test/unit/test_binding.gd b/harness/tests/test/unit/test_binding.gd
index 0362277fd2..a50923ceae 100644
--- a/harness/tests/test/unit/test_binding.gd
+++ b/harness/tests/test/unit/test_binding.gd
@@ -1,101 +1,101 @@
 extends "res://addons/gut/test.gd"
 
 func test_instance_binding():
-	var test_script: Object = BindingTest.new()
-	var bound_obj: Node = Node.new()
-	
-	var clazz = test_script.get_class_name(bound_obj)
-	assert_eq(clazz, "Node", "Type should be Node")
-	
-	bound_obj.free()
-	test_script.free()
+    var test_script: Object = BindingTest.new()
+    var bound_obj: Node = Node.new()
+    
+    var clazz = test_script.get_class_name(bound_obj)
+    assert_eq(clazz, "Node", "Type should be Node")
+    
+    bound_obj.free()
+    test_script.free()
  
 func test_script_binding():
-	var test_script: Object = BindingTest.new()
-	var bound_obj: Node = BindingA.new()
-	
-	var clazz = test_script.get_class_name(bound_obj)
-	assert_eq(clazz, "BindingA", "Type should be BindingA")
-	
-	bound_obj.free()
-	test_script.free()
+    var test_script: Object = BindingTest.new()
+    var bound_obj: Node = BindingA.new()
+    
+    var clazz = test_script.get_class_name(bound_obj)
+    assert_eq(clazz, "BindingA", "Type should be BindingA")
+    
+    bound_obj.free()
+    test_script.free()
 
 func test_add_script():
-	var test_script: Object = BindingTest.new()
-	var bound_obj: Node = Node.new()
-	
-	var clazz = test_script.get_class_name(bound_obj)
-	assert_eq(clazz, "Node", "Type should be Node")
-	
-	bound_obj.set_script(BindingA)
-	clazz = test_script.get_class_name(bound_obj)
-	assert_eq(clazz, "BindingA", "Type should be BindingA")
-	
-	bound_obj.free()
-	test_script.free()
+    var test_script: Object = BindingTest.new()
+    var bound_obj: Node = Node.new()
+    
+    var clazz = test_script.get_class_name(bound_obj)
+    assert_eq(clazz, "Node", "Type should be Node")
+    
+    bound_obj.set_script(BindingA)
+    clazz = test_script.get_class_name(bound_obj)
+    assert_eq(clazz, "BindingA", "Type should be BindingA")
+    
+    bound_obj.free()
+    test_script.free()
 
 func test_remove_script():
-	var test_script: Object = BindingTest.new()
-	var bound_obj: Node = BindingA.new()
-	
-	var clazz = test_script.get_class_name(bound_obj)
-	assert_eq(clazz, "BindingA", "Type should be BindingA")
-	
-	bound_obj.set_script(null)
-	clazz = test_script.get_class_name(bound_obj)
-	assert_eq(clazz, "Node", "Type should be Node")
-	
-	bound_obj.free()
-	test_script.free()
-	
+    var test_script: Object = BindingTest.new()
+    var bound_obj: Node = BindingA.new()
+    
+    var clazz = test_script.get_class_name(bound_obj)
+    assert_eq(clazz, "BindingA", "Type should be BindingA")
+    
+    bound_obj.set_script(null)
+    clazz = test_script.get_class_name(bound_obj)
+    assert_eq(clazz, "Node", "Type should be Node")
+    
+    bound_obj.free()
+    test_script.free()
+    
 func test_add_then_remove_script():
-	var test_script: Object = BindingTest.new()
-	var bound_obj: Node = Node.new()
-	
-	var clazz = test_script.get_class_name(bound_obj)
-	assert_eq(clazz, "Node", "Type should be Node")
-	
-	bound_obj.set_script(BindingA)
-	clazz = test_script.get_class_name(bound_obj)
-	assert_eq(clazz, "BindingA", "Type should be BindingA")
-	
-	bound_obj.set_script(null)
-	clazz = test_script.get_class_name(bound_obj)
-	assert_eq(clazz, "Node", "Type should be Node")
-	
-	bound_obj.free()
-	test_script.free()
+    var test_script: Object = BindingTest.new()
+    var bound_obj: Node = Node.new()
+    
+    var clazz = test_script.get_class_name(bound_obj)
+    assert_eq(clazz, "Node", "Type should be Node")
+    
+    bound_obj.set_script(BindingA)
+    clazz = test_script.get_class_name(bound_obj)
+    assert_eq(clazz, "BindingA", "Type should be BindingA")
+    
+    bound_obj.set_script(null)
+    clazz = test_script.get_class_name(bound_obj)
+    assert_eq(clazz, "Node", "Type should be Node")
+    
+    bound_obj.free()
+    test_script.free()
 
 func test_switch_script():
-	var test_script: Object = BindingTest.new()
-	var bound_obj: Object = BindingA.new()
-	
-	var clazz = test_script.get_class_name(bound_obj)
-	assert_eq(clazz, "BindingA", "Type should be BindingA")
-		
-	bound_obj.set_script(BindingB)
-	clazz = test_script.get_class_name(bound_obj)
-	assert_eq(clazz, "BindingB", "Type should be BindingB")
-	
-	bound_obj.free()
-	test_script.free()
-	
+    var test_script: Object = BindingTest.new()
+    var bound_obj: Object = BindingA.new()
+    
+    var clazz = test_script.get_class_name(bound_obj)
+    assert_eq(clazz, "BindingA", "Type should be BindingA")
+        
+    bound_obj.set_script(BindingB)
+    clazz = test_script.get_class_name(bound_obj)
+    assert_eq(clazz, "BindingB", "Type should be BindingB")
+    
+    bound_obj.free()
+    test_script.free()
+    
 func test_path_script():
-	var test_script: Object = load("res://src/main/kotlin/godot/tests/binding/BindingTest.kt").new()
+    var test_script: Object = load("res://src/main/kotlin/godot/tests/binding/BindingTest.kt").new()
 
-	var kotlin_script: Object = load("res://src/main/kotlin/godot/tests/binding/BindingA.kt").new()
-	var clazz = test_script.get_class_name(kotlin_script)
-	assert_eq(clazz, "BindingA", "Type should be BindingA")
+    var kotlin_script: Object = load("res://src/main/kotlin/godot/tests/binding/BindingA.kt").new()
+    var clazz = test_script.get_class_name(kotlin_script)
+    assert_eq(clazz, "BindingA", "Type should be BindingA")
 
-	var java_script: Object = load("res://src/main/java/godot/tests/JavaTestClass.java").new()
-	clazz = test_script.get_class_name(java_script)
-	assert_eq(clazz, "JavaTestClass", "Type should be JavaTestClass")
-	
-	kotlin_script.free()
-	java_script.free()
-	test_script.free()
-	
+    var java_script: Object = load("res://src/main/java/godot/tests/JavaTestClass.java").new()
+    clazz = test_script.get_class_name(java_script)
+    assert_eq(clazz, "JavaTestClass", "Type should be JavaTestClass")
+    
+    kotlin_script.free()
+    java_script.free()
+    test_script.free()
+    
 func test_path_script_and_named_script_equality():
-	var path_script: Script = load("res://src/main/kotlin/godot/tests/binding/BindingA.kt")
-	var named_script: Script = BindingA
-	assert_not_same(named_script, path_script, "Path and Named version of script shouldn't be equal")
+    var path_script: Script = load("res://src/main/kotlin/godot/tests/binding/BindingA.kt")
+    var named_script: Script = BindingA
+    assert_not_same(named_script, path_script, "Path and Named version of script shouldn't be equal")
diff --git a/harness/tests/test/unit/test_call_java_class.gd b/harness/tests/test/unit/test_call_java_class.gd
index cc3958300a..17f72c990a 100644
--- a/harness/tests/test/unit/test_call_java_class.gd
+++ b/harness/tests/test/unit/test_call_java_class.gd
@@ -2,28 +2,28 @@ extends "res://addons/gut/test.gd"
 
 
 func test_call_function():
-	var java_scene = load("res://java_test_scene.tscn").instantiate()
-	var greeting = java_scene.greeting()
-	assert_eq(greeting, "Hello from java", "Greeting from java class should match")
-	java_scene.free()
+    var java_scene = load("res://java_test_scene.tscn").instantiate()
+    var greeting = java_scene.greeting()
+    assert_eq(greeting, "Hello from java", "Greeting from java class should match")
+    java_scene.free()
 
 
 func test_field_access():
-	var java_scene = load("res://java_test_scene.tscn").instantiate()
-	assert_eq(java_scene.exported_int, 1, "Field from java should match")
-	java_scene.free()
+    var java_scene = load("res://java_test_scene.tscn").instantiate()
+    assert_eq(java_scene.exported_int, 1, "Field from java should match")
+    java_scene.free()
 
 
 func test_field_set():
-	var java_scene = load("res://java_test_scene.tscn").instantiate()
-	java_scene.exported_int = 2
-	assert_eq(java_scene.exported_int, 2, "Field from java should match")
-	java_scene.free()
+    var java_scene = load("res://java_test_scene.tscn").instantiate()
+    java_scene.exported_int = 2
+    assert_eq(java_scene.exported_int, 2, "Field from java should match")
+    java_scene.free()
 
 
 func test_signal():
-	var java_scene: JavaTestClass = load("res://java_test_scene.tscn").instantiate()
-	get_tree().root.add_child(java_scene)
-	await get_tree().create_timer(1).timeout
-	java_scene.connect_and_trigger_signal()
-	assert_true(java_scene.signal_emitted, "Signal should've been emitted in java")
+    var java_scene: JavaTestClass = load("res://java_test_scene.tscn").instantiate()
+    get_tree().root.add_child(java_scene)
+    await get_tree().create_timer(1).timeout
+    java_scene.connect_and_trigger_signal()
+    assert_true(java_scene.signal_emitted, "Signal should've been emitted in java")
diff --git a/harness/tests/test/unit/test_constructor_args.gd b/harness/tests/test/unit/test_constructor_args.gd
index 15e797580e..b832061399 100644
--- a/harness/tests/test/unit/test_constructor_args.gd
+++ b/harness/tests/test/unit/test_constructor_args.gd
@@ -1,96 +1,96 @@
 extends "res://addons/gut/test.gd"
 
 var test_data = [
-	"arg1",
-	"arg2",
-	"arg3",
-	"arg4",
-	"arg5",
-	"arg6",
-	"arg7",
-	"arg8",
+    "arg1",
+    "arg2",
+    "arg3",
+    "arg4",
+    "arg5",
+    "arg6",
+    "arg7",
+    "arg8",
 ]
 
 func _provide_test_instance_for_arg_count(arg_count: int) -> ConstructorArgSizeTest:
-	match arg_count:
-		0: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new()
-		1: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
-			test_data[0],
-		)
-		2: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
-			test_data[0],
-			test_data[1],
-		)
-		2: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
-			test_data[0],
-			test_data[1],
-			test_data[2],
-		)
-		3: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
-			test_data[0],
-			test_data[1],
-			test_data[2],
-			test_data[3],
-		)
-		4: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
-			test_data[0],
-			test_data[1],
-			test_data[2],
-			test_data[3],
-			test_data[4],
-		)
-		5: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
-			test_data[0],
-			test_data[1],
-			test_data[2],
-			test_data[3],
-			test_data[4],
-			test_data[5],
-		)
-		6: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
-			test_data[0],
-			test_data[1],
-			test_data[2],
-			test_data[3],
-			test_data[4],
-			test_data[5],
-			test_data[6],
-		)
-		7: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
-			test_data[0],
-			test_data[1],
-			test_data[2],
-			test_data[3],
-			test_data[4],
-			test_data[5],
-			test_data[6],
-			test_data[7],
-		)
-		8: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
-			test_data[0],
-			test_data[1],
-			test_data[2],
-			test_data[3],
-			test_data[4],
-			test_data[5],
-			test_data[6],
-			test_data[7],
-			test_data[8],
-		)
-		_: return null
+    match arg_count:
+        0: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new()
+        1: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
+            test_data[0],
+        )
+        2: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
+            test_data[0],
+            test_data[1],
+        )
+        2: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
+            test_data[0],
+            test_data[1],
+            test_data[2],
+        )
+        3: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
+            test_data[0],
+            test_data[1],
+            test_data[2],
+            test_data[3],
+        )
+        4: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
+            test_data[0],
+            test_data[1],
+            test_data[2],
+            test_data[3],
+            test_data[4],
+        )
+        5: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
+            test_data[0],
+            test_data[1],
+            test_data[2],
+            test_data[3],
+            test_data[4],
+            test_data[5],
+        )
+        6: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
+            test_data[0],
+            test_data[1],
+            test_data[2],
+            test_data[3],
+            test_data[4],
+            test_data[5],
+            test_data[6],
+        )
+        7: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
+            test_data[0],
+            test_data[1],
+            test_data[2],
+            test_data[3],
+            test_data[4],
+            test_data[5],
+            test_data[6],
+            test_data[7],
+        )
+        8: return load("res://scripts/godot/tests/args/ConstructorArgSizeTest.gdj").new(
+            test_data[0],
+            test_data[1],
+            test_data[2],
+            test_data[3],
+            test_data[4],
+            test_data[5],
+            test_data[6],
+            test_data[7],
+            test_data[8],
+        )
+        _: return null
 
 func test_constructor_arg_size():
-	for arg_count in range(0, test_data.size()):
-		var test_instance = _provide_test_instance_for_arg_count(arg_count)
+    for arg_count in range(0, test_data.size()):
+        var test_instance = _provide_test_instance_for_arg_count(arg_count)
 
-		var result = test_instance.get_received_constructor_args()
+        var result = test_instance.get_received_constructor_args()
 
-		if arg_count != 0:
-			for arg_index in range(0, arg_count):
-				var expected_data = test_data[arg_index]
-				var actual_data = result[arg_index]
-				assert_eq(expected_data, actual_data, "arg with index %s did not match expected arg" % arg_index)
-		else:
-			assert_eq(result.size(), 0, "arg count should be 0 when calling no arg constructor")
+        if arg_count != 0:
+            for arg_index in range(0, arg_count):
+                var expected_data = test_data[arg_index]
+                var actual_data = result[arg_index]
+                assert_eq(expected_data, actual_data, "arg with index %s did not match expected arg" % arg_index)
+        else:
+            assert_eq(result.size(), 0, "arg count should be 0 when calling no arg constructor")
 
-		test_instance.free()
+        test_instance.free()
diff --git a/harness/tests/test/unit/test_constructors.gd b/harness/tests/test/unit/test_constructors.gd
index 06551db162..288008d973 100644
--- a/harness/tests/test/unit/test_constructors.gd
+++ b/harness/tests/test/unit/test_constructors.gd
@@ -2,16 +2,16 @@ extends "res://addons/gut/test.gd"
 
 
 func test_should_call_default_constructor() -> void:
-	var test_instance = MultiArgsConstructorTest.new()
-	assert_true(test_instance.default_constructor_has_been_called, "Default constructor should have been called")
-	test_instance.free()
+    var test_instance = MultiArgsConstructorTest.new()
+    assert_true(test_instance.default_constructor_has_been_called, "Default constructor should have been called")
+    test_instance.free()
 
 func test_should_call_one_arg_constructor() -> void:
-	var test_instance = load("res://scripts/godot/tests/MultiArgsConstructorTest.gdj").new(42)
-	assert_true(test_instance.one_arg_constructor_has_been_called, "One arg constructor should have been called")
-	test_instance.free()
+    var test_instance = load("res://scripts/godot/tests/MultiArgsConstructorTest.gdj").new(42)
+    assert_true(test_instance.one_arg_constructor_has_been_called, "One arg constructor should have been called")
+    test_instance.free()
 
 func test_should_call_three_args_constructor() -> void:
-	var test_instance = load("res://scripts/godot/tests/MultiArgsConstructorTest.gdj").new(42, "hello")
-	assert_true(test_instance.three_args_constructor_has_been_called, "Three args constructor should have been called")
-	test_instance.free()
+    var test_instance = load("res://scripts/godot/tests/MultiArgsConstructorTest.gdj").new(42, "hello")
+    assert_true(test_instance.three_args_constructor_has_been_called, "Three args constructor should have been called")
+    test_instance.free()
diff --git a/harness/tests/test/unit/test_core_types_identity.gd b/harness/tests/test/unit/test_core_types_identity.gd
index 70af150194..1982028d1a 100644
--- a/harness/tests/test/unit/test_core_types_identity.gd
+++ b/harness/tests/test/unit/test_core_types_identity.gd
@@ -2,71 +2,71 @@ extends "res://addons/gut/test.gd"
 
 
 func test_should_return_right_aabb():
-	var instance = CoreTypesIdentityTest.new()
-	var expected_aabb = AABB(Vector3(1, 1, 1), Vector3(2, 2, 2))
-	assert_eq(instance.aabb, expected_aabb, "Should get same aabb")
-	assert_eq(instance.aabb(expected_aabb), expected_aabb, "Buffer should not change Aabb")
-	instance.free()
+    var instance = CoreTypesIdentityTest.new()
+    var expected_aabb = AABB(Vector3(1, 1, 1), Vector3(2, 2, 2))
+    assert_eq(instance.aabb, expected_aabb, "Should get same aabb")
+    assert_eq(instance.aabb(expected_aabb), expected_aabb, "Buffer should not change Aabb")
+    instance.free()
 
 func test_should_return_right_basis():
-	var instance = CoreTypesIdentityTest.new()
-	var expected_basis = Basis(Vector3(0, 1, 2), Vector3(3, 4, 5), Vector3(6, 7, 8))
-	assert_eq(instance.basis, expected_basis, "Should get same basis")
-	assert_eq(instance.basis(expected_basis), expected_basis, "Buffer should not change Basis")
-	instance.free()
+    var instance = CoreTypesIdentityTest.new()
+    var expected_basis = Basis(Vector3(0, 1, 2), Vector3(3, 4, 5), Vector3(6, 7, 8))
+    assert_eq(instance.basis, expected_basis, "Should get same basis")
+    assert_eq(instance.basis(expected_basis), expected_basis, "Buffer should not change Basis")
+    instance.free()
 
 func test_should_return_right_color():
-	var instance = CoreTypesIdentityTest.new()
-	var expected_color = Color(0.1, 0.2, 0.3, 0.4)
-	assert_eq(instance.color, expected_color, "Should get same color")
-	assert_eq(instance.color(expected_color), expected_color, "Buffer should not change Color")
-	instance.free()
+    var instance = CoreTypesIdentityTest.new()
+    var expected_color = Color(0.1, 0.2, 0.3, 0.4)
+    assert_eq(instance.color, expected_color, "Should get same color")
+    assert_eq(instance.color(expected_color), expected_color, "Buffer should not change Color")
+    instance.free()
 
 func test_should_return_right_plane():
-	var instance = CoreTypesIdentityTest.new()
-	var expected_plane = Plane(1, 2, 3, 4)
-	assert_eq(instance.plane, expected_plane, "Should get same plane")
-	assert_eq(instance.plane(expected_plane), expected_plane, "Buffer should not change Plane")
-	instance.free()
+    var instance = CoreTypesIdentityTest.new()
+    var expected_plane = Plane(1, 2, 3, 4)
+    assert_eq(instance.plane, expected_plane, "Should get same plane")
+    assert_eq(instance.plane(expected_plane), expected_plane, "Buffer should not change Plane")
+    instance.free()
 
 func test_should_return_right_quat():
-	var instance = CoreTypesIdentityTest.new()
-	var expected_quat = Quaternion(1, 2, 3, 4)
-	assert_eq(instance.quaternion, expected_quat, "Should get same quat")
-	assert_eq(instance.quat(expected_quat), expected_quat, "Buffer should not change Quat")
-	instance.free()
+    var instance = CoreTypesIdentityTest.new()
+    var expected_quat = Quaternion(1, 2, 3, 4)
+    assert_eq(instance.quaternion, expected_quat, "Should get same quat")
+    assert_eq(instance.quat(expected_quat), expected_quat, "Buffer should not change Quat")
+    instance.free()
 
 func test_should_return_right_rect2():
-	var instance = CoreTypesIdentityTest.new()
-	var expected_rect2 = Rect2(1.0, 2.0, 3.0, 4.0)
-	assert_eq(instance.rect2, expected_rect2, "Should get same rect2")
-	assert_eq(instance.rect2(expected_rect2), expected_rect2, "Buffer should not change Rect2")
-	instance.free()
+    var instance = CoreTypesIdentityTest.new()
+    var expected_rect2 = Rect2(1.0, 2.0, 3.0, 4.0)
+    assert_eq(instance.rect2, expected_rect2, "Should get same rect2")
+    assert_eq(instance.rect2(expected_rect2), expected_rect2, "Buffer should not change Rect2")
+    instance.free()
 
 func test_should_return_right_transform():
-	var instance = CoreTypesIdentityTest.new()
-	var expected_transform = Transform3D(Vector3(0, 1, 2), Vector3(3, 4, 5), Vector3(6, 7, 8), Vector3(9, 10, 11))
-	assert_eq(instance.transform3_d, expected_transform, "Should get same transform")
-	assert_eq(instance.transform(expected_transform), expected_transform, "Buffer should not change Transform")
-	instance.free()
+    var instance = CoreTypesIdentityTest.new()
+    var expected_transform = Transform3D(Vector3(0, 1, 2), Vector3(3, 4, 5), Vector3(6, 7, 8), Vector3(9, 10, 11))
+    assert_eq(instance.transform3_d, expected_transform, "Should get same transform")
+    assert_eq(instance.transform(expected_transform), expected_transform, "Buffer should not change Transform")
+    instance.free()
 
 func test_should_return_right_transform2d():
-	var instance = CoreTypesIdentityTest.new()
-	var expected_transform2d = Transform2D(Vector2(0, 1), Vector2(2, 3), Vector2(4, 5))
-	assert_eq(instance.transform2_d, expected_transform2d, "Should get same transform2d")
-	assert_eq(instance.transform2_d(expected_transform2d), expected_transform2d, "Buffer should not change Transform2D")
-	instance.free()
+    var instance = CoreTypesIdentityTest.new()
+    var expected_transform2d = Transform2D(Vector2(0, 1), Vector2(2, 3), Vector2(4, 5))
+    assert_eq(instance.transform2_d, expected_transform2d, "Should get same transform2d")
+    assert_eq(instance.transform2_d(expected_transform2d), expected_transform2d, "Buffer should not change Transform2D")
+    instance.free()
 
 func test_should_return_right_vector2():
-	var instance = CoreTypesIdentityTest.new()
-	var expected_vector2 = Vector2(1, 2)
-	assert_eq(instance.vector2, expected_vector2, "Should get same vector2")
-	assert_eq(instance.vector2(expected_vector2), expected_vector2, "Buffer should not change Vector2")
-	instance.free()
+    var instance = CoreTypesIdentityTest.new()
+    var expected_vector2 = Vector2(1, 2)
+    assert_eq(instance.vector2, expected_vector2, "Should get same vector2")
+    assert_eq(instance.vector2(expected_vector2), expected_vector2, "Buffer should not change Vector2")
+    instance.free()
 
 func test_should_return_right_vector3():
-	var instance = CoreTypesIdentityTest.new()
-	var expected_vector3 = Vector3(1, 2, 3)
-	assert_eq(instance.vector3, expected_vector3, "Should get same vector3")
-	assert_eq(instance.vector3(expected_vector3), expected_vector3, "Buffer should not change Vector3")
-	instance.free()
+    var instance = CoreTypesIdentityTest.new()
+    var expected_vector3 = Vector3(1, 2, 3)
+    assert_eq(instance.vector3, expected_vector3, "Should get same vector3")
+    assert_eq(instance.vector3(expected_vector3), expected_vector3, "Buffer should not change Vector3")
+    instance.free()

From 6c121c387d015e6b0a35aca3e28c90fe20bf376c Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sun, 13 Oct 2024 12:02:41 +0200
Subject: [PATCH 06/18] Make notification an api member

---
 .../kotlin/godot/tests/inheritance/ClassInheritanceChild.kt     | 1 -
 .../kotlin/godot/tests/inheritance/ClassInheritanceParent.kt    | 1 -
 kt/godot-library/src/main/kotlin/godot/core/KtObject.kt         | 2 ++
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt
index 5d837bdf94..3c6384b38d 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt
@@ -24,7 +24,6 @@ class ClassInheritanceChild : ClassInheritanceParent() {
         childOpenFunctionHasBeenCalled = true
     }
 
-    @GodotMember
     override fun _notification() = godotNotification {
         GD.print("Called ClassInheritanceChild::_notification on $this with $it")
         notificationCallBitFlag += notificationCallBitFlag or 2
diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
index 1146e1ec8b..c04de81f6e 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
@@ -44,7 +44,6 @@ open class ClassInheritanceParent : Node() {
     @GodotMember
     var notificationCallBitFlag = 0
 
-    @GodotMember
     override fun _notification(): GodotNotification = godotNotification {
         GD.print("Called ClassInheritanceParent::_notification on $this with $it")
         notificationCallBitFlag = notificationCallBitFlag or 1
diff --git a/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt b/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt
index 000cb99961..6f2d81f39a 100644
--- a/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt
+++ b/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt
@@ -5,6 +5,7 @@ import godot.common.interop.ObjectID
 import godot.common.interop.VoidPtr
 import godot.common.interop.nullObjectID
 import godot.common.interop.nullptr
+import godot.annotation.GodotApiMember
 import godot.core.memory.MemoryManager
 import godot.core.memory.TransferContext
 import kotlincompile.definitions.GodotJvmBuildConfig
@@ -80,6 +81,7 @@ abstract class KtObject: IdentityPointer {
     }
 
     @Suppress("FunctionName")
+    @GodotApiMember
     open fun _notification(): GodotNotification = godotNotification {}
 
     @Suppress("UNCHECKED_CAST")

From 926b544756215c4b2d167558f6f67a932ec8d65d Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sun, 13 Oct 2024 12:04:33 +0200
Subject: [PATCH 07/18] Make onDestroy an api member

---
 kt/godot-library/src/main/kotlin/godot/core/KtObject.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt b/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt
index 6f2d81f39a..b31f60e496 100644
--- a/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt
+++ b/kt/godot-library/src/main/kotlin/godot/core/KtObject.kt
@@ -96,6 +96,7 @@ abstract class KtObject: IdentityPointer {
      * By the time a RefCounted counter reaches 0, its JVM instance has already being GCed and can't be used anymore.
      */
     @Suppress("FunctionName")
+    @GodotApiMember
     open fun _onDestroy() = Unit
 
     fun free() {

From e2ceb306daf9508eaeeff05f43f499ab25135b20 Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sun, 13 Oct 2024 12:17:49 +0200
Subject: [PATCH 08/18] Fix on destroy registration

---
 harness/tests/scripts/godot/tests/Invocation.gdj             | 1 +
 .../kotlin/godot/codegen/services/impl/GenerationService.kt  | 5 ++++-
 .../src/main/kotlin/godot/gen/godot/RefCounted.kt            | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/harness/tests/scripts/godot/tests/Invocation.gdj b/harness/tests/scripts/godot/tests/Invocation.gdj
index 5b9a840ac7..ad8ec0b91c 100644
--- a/harness/tests/scripts/godot/tests/Invocation.gdj
+++ b/harness/tests/scripts/godot/tests/Invocation.gdj
@@ -82,6 +82,7 @@ functions = [
     init_nullables,
     _enter_tree,
     _ready,
+    _on_destroy,
     get_rid_id,
     get_nav_mesh_rid,
     append_to_any_dict,
diff --git a/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt b/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt
index 125c31328c..c5af47b7fe 100644
--- a/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt
+++ b/kt/api-generator/src/main/kotlin/godot/codegen/services/impl/GenerationService.kt
@@ -43,7 +43,6 @@ import godot.codegen.services.IEnumService
 import godot.codegen.services.IGenerationService
 import godot.codegen.traits.CallableTrait
 import godot.codegen.traits.addKdoc
-import godot.tools.common.constants.TO_GODOT_NAME_UTIL_FUNCTION
 import godot.tools.common.constants.CORE_TYPE_HELPER
 import godot.tools.common.constants.CORE_TYPE_LOCAL_COPY
 import godot.tools.common.constants.GENERATED_COMMENT
@@ -53,6 +52,7 @@ import godot.tools.common.constants.GODOT_ERROR
 import godot.tools.common.constants.GodotKotlinJvmTypes
 import godot.tools.common.constants.GodotTypes
 import godot.tools.common.constants.KT_OBJECT
+import godot.tools.common.constants.TO_GODOT_NAME_UTIL_FUNCTION
 import godot.tools.common.constants.TRANSFER_CONTEXT
 import godot.tools.common.constants.TYPE_MANAGER
 import godot.tools.common.constants.VARIANT_CASTER_ANY
@@ -674,6 +674,9 @@ class GenerationService(
         addFunction(
             FunSpec.builder("_onDestroy")
                 .addModifiers(KModifier.OVERRIDE, KModifier.FINAL)
+                // needed as we override the base function.
+                // in order for the entry gen to detect that this is not a user override, we need to declare this override an api member
+                .addAnnotation(GODOT_API_MEMBER)
                 .returns(Unit::class)
                 .addStatement("")
                 .build()
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt
index 0de853f8d7..074858be64 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt
@@ -6,7 +6,8 @@
 
 package godot
 
-import godot.`annotation`.GodotBaseType
+import godot.annotation.GodotApiMember
+import godot.annotation.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.TypeManager
 import godot.core.VariantParser.BOOL
@@ -17,6 +18,7 @@ import kotlin.Int
 import kotlin.Long
 import kotlin.Suppress
 import kotlin.Unit
+import godot.util.VoidPtr
 
 /**
  * Base class for any object that keeps a reference count. [Resource] and many other helper objects
@@ -43,6 +45,7 @@ public open class RefCounted : Object() {
     callConstructor(ENGINECLASS_REFCOUNTED, scriptIndex)
   }
 
+  @GodotApiMember
   public final override fun _onDestroy(): Unit {
 
   }

From d7113e6140b58095eccf8a91022545c2be44a9bf Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sun, 13 Oct 2024 12:35:03 +0200
Subject: [PATCH 09/18] Fix constructor registration

---
 .../generator/ConstructorRegistrationGenerator.kt        | 3 ---
 .../src/main/kotlin/godot/gen/godot/RefCounted.kt        | 9 +++++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/ConstructorRegistrationGenerator.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/ConstructorRegistrationGenerator.kt
index 318b4d7d73..3c6ba78814 100644
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/ConstructorRegistrationGenerator.kt
+++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/generator/ConstructorRegistrationGenerator.kt
@@ -12,9 +12,6 @@ object ConstructorRegistrationGenerator {
     fun generate(registeredClass: RegisteredClass, className: ClassName, registerClassControlFlow: FunSpec.Builder) {
         registeredClass
             .constructors
-            .filter { registeredConstructor ->
-                registeredConstructor.parameters.isEmpty()
-            }
             .forEach { registeredConstructor ->
                 val ctorParamsCount = registeredConstructor.parameters.size
 
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt
index 074858be64..6b73b8f52d 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt
@@ -6,8 +6,8 @@
 
 package godot
 
-import godot.annotation.GodotApiMember
-import godot.annotation.GodotBaseType
+import godot.`annotation`.GodotApiMember
+import godot.`annotation`.GodotBaseType
 import godot.common.interop.VoidPtr
 import godot.core.TypeManager
 import godot.core.VariantParser.BOOL
@@ -19,6 +19,11 @@ import kotlin.Long
 import kotlin.Suppress
 import kotlin.Unit
 import godot.util.VoidPtr
+import kotlin.Boolean
+import kotlin.Int
+import kotlin.Long
+import kotlin.Suppress
+import kotlin.Unit
 
 /**
  * Base class for any object that keeps a reference count. [Resource] and many other helper objects

From 4b445e622e3c10accc1e593d5ff530e9331c2ca8 Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sun, 13 Oct 2024 14:17:14 +0200
Subject: [PATCH 10/18] Fix line marker

---
 .../src/main/kotlin/godot/tests/Invocation.kt |  18 +--
 .../annotator/clazz/RegisterClassAnnotator.kt |   2 +-
 .../godot/intellij/plugin/extension/ktPsi.kt  |   4 +-
 .../plugin/extension/psiElementExt.kt         | 129 +++++++++++++++++-
 .../linemarker/RegisteredNameLineMarker.kt    | 123 ++---------------
 5 files changed, 138 insertions(+), 138 deletions(-)

diff --git a/harness/tests/src/main/kotlin/godot/tests/Invocation.kt b/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
index 458b082109..5b14bc6746 100644
--- a/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
@@ -177,39 +177,30 @@ class Invocation : Node3D() {
     @Export
     var packedVector3Array = PackedVector3Array()
 
-    @Export
     @IntRange(1, 2)
     var p1 = 1
 
-    @Export
     @LongRange(1L, 2L)
     var p1_1 = 1L
 
-    @Export
     @FloatRange(1f, 2f)
     var p2 = 1f
 
-    @Export
     @DoubleRange(1.0, 2.0)
     var p3 = 1.0
 
-    @Export
     @DoubleRange(min = 1.0, max = 2.0, step = 0.1, or = Range.OR_GREATER, hideSlider = true, isDegrees = true, suffix = "MyCoolSuffix")
     var p4 = 1.0
 
-    @Export
     @FloatRange(1f, 2f)
     var p5 = 1f
 
-    @Export
     @EnumTypeHint
     var p6 = TestEnum.ENUM_1
 
-    @Export
     @ExpEasing
     var p7 = 1f
 
-    @Export
     @ExpEasing
     var p8 = 1.0
 
@@ -217,27 +208,21 @@ class Invocation : Node3D() {
     @EnumFlag
     var p9 = setOf(TestEnum.ENUM_1)
 
-    @Export
     @EnumFlag
     var p10 = mutableSetOf(TestEnum.ENUM_1)
 
-    @Export
     @EnumFlag
     var p11 = mutableSetOf<TestEnum>()
 
-    @Export
     @IntFlag
     var p12 = 1 or 2 and 3
 
-    @Export
     @File
     var p13 = "someFile"
 
-    @Export
     @Dir
     var p14 = "someDir"
 
-    @Export
     @MultilineText
     var p15 = """
 		some
@@ -245,11 +230,9 @@ class Invocation : Node3D() {
 		text
 	""".trimIndent()
 
-    @Export
     @PlaceHolderText
     var p16 = "some placeholderText"
 
-    @Export
     @ColorNoAlpha
     var p17 = Color()
 
@@ -306,6 +289,7 @@ class Invocation : Node3D() {
         println("CustomName is $customName")
     }
 
+    
     override fun _ready() {
         val formerName = name
         println("Name is: $name")
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt
index b917933d3c..2c4332c67d 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt
@@ -32,7 +32,7 @@ class RegisterClassAnnotator : BaseAnnotator {
     override fun checkElement(element: PsiElement, holder: AnnotationHolder) {
         when(element) {
             is PsiClass -> {
-                if (!element.isRegistered()) {
+                if (!element.isRegistered() || element.isAnnotationType) {
                     val errorLocation = element.nameIdentifier ?: element.navigationElement
                     if (element.getAnnotation(TOOL_ANNOTATION) != null) {
                         holder.registerProblem(
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktPsi.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktPsi.kt
index 1caaa4c5ff..b7c0857695 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktPsi.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktPsi.kt
@@ -16,8 +16,8 @@ fun KtProperty.type(): KotlinType? = (this.resolveToDescriptorIfAny() as? Callab
 
 fun PsiElement.isSignal(): Boolean {
     return when(this) {
-        is KtProperty -> this.type()?.getKotlinTypeFqName(false) == "$godotCorePackage.${GodotKotlinJvmTypes.signal}"
-        is PsiField -> this.type.canonicalText == "$godotCorePackage.${GodotKotlinJvmTypes.signal}"
+        is KtProperty -> this.type()?.getKotlinTypeFqName(false)?.startsWith("$godotCorePackage.${GodotKotlinJvmTypes.signal}") == true
+        is PsiField -> this.type.canonicalText.startsWith("$godotCorePackage.${GodotKotlinJvmTypes.signal}")
         else -> false
     }
 }
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
index 5e4ae33a94..ca45470fbc 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
@@ -1,19 +1,142 @@
 package godot.intellij.plugin.extension
 
 import com.intellij.psi.PsiAnnotation
+import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiField
+import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiModifierListOwner
+import godot.intellij.plugin.data.model.GODOT_API_MEMBER_ANNOTATION
+import godot.intellij.plugin.data.model.GODOT_MEMBER_ANNOTATION
 import godot.tools.common.constants.GodotKotlinJvmTypes
 import godot.tools.common.constants.godotAnnotationPackage
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.descriptors.PropertyDescriptor
+import org.jetbrains.kotlin.idea.caches.resolve.analyze
+import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.psi.KtAnnotated
+import org.jetbrains.kotlin.psi.KtAnnotationEntry
+import org.jetbrains.kotlin.psi.KtClass
+import org.jetbrains.kotlin.psi.KtElement
+import org.jetbrains.kotlin.psi.KtFunction
+import org.jetbrains.kotlin.psi.KtProperty
+import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration
+import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
 
 fun PsiElement.isRegistered(): Boolean {
-    if (this !is PsiModifierListOwner) return false
+    return when (this) {
+        is KtAnnotated -> when (this) {
+            is KtClass -> hasRegistrationAnnotation()
+            is KtProperty -> hasRegistrationAnnotation() || isSignal() || overridesRegistered()
+            is KtFunction -> hasRegistrationAnnotation() || overridesGodotApiFunction() || overridesRegistered()
+            else -> false
+        }
+
+        is PsiModifierListOwner -> when(this) {
+            is PsiClass -> hasRegistrationAnnotation()
+            is PsiField -> hasRegistrationAnnotation() || isSignal() || overridesRegistered()
+            is PsiMethod -> hasRegistrationAnnotation() || overridesGodotApiFunction() || overridesRegistered()
+            else -> false
+        }
+
+        else -> return false
+    }
+}
+
+private fun KtProperty.overridesRegistered(): Boolean {
+    return (this.descriptor as? PropertyDescriptor)?.overriddenDescriptors?.any { overriddenDescriptor ->
+        overriddenDescriptor.annotations.hasAnnotation(FqName(GODOT_API_MEMBER_ANNOTATION))
+    } ?: false
+}
+
+private fun KtFunction.overridesRegistered(): Boolean {
+    return (this.descriptor as? FunctionDescriptor)?.overriddenDescriptors?.any { overriddenDescriptor ->
+        overriddenDescriptor.annotations.hasAnnotation(FqName(GODOT_MEMBER_ANNOTATION))
+    } ?: false
+}
+
+private fun KtAnnotated.hasRegistrationAnnotation(): Boolean {
+    return this.resolveAllAnnotationsRecursively().any {
+        it.fqName?.asString() == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotMember}"
+            || it.fqName?.asString() == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotScript}"
+    }
+}
+
+private fun KtFunction.overridesGodotApiFunction(): Boolean {
+    return (this.descriptor as? FunctionDescriptor)?.overriddenDescriptors?.any { overriddenDescriptor ->
+        overriddenDescriptor.annotations.hasAnnotation(FqName(GODOT_API_MEMBER_ANNOTATION))
+    } ?: false
+}
+
+private fun KtAnnotated.resolveAllAnnotationsRecursively(): List<KtClass> {
+    return annotationEntries.mapNotNull { it.toAnnotationClass()?.first }.flatMap { listOf(it) + it.resolveAllAnnotationsRecursively() }
+}
+
+private fun KtAnnotationEntry.toAnnotationClass(): Pair<KtClass, ClassDescriptor>? {
+    val context = (this as KtElement).analyze(BodyResolveMode.PARTIAL)
+    val annotationDescriptor = context.get(BindingContext.ANNOTATION, this) ?: return null
+
+    val classDescriptor = annotationDescriptor.type.constructor.declarationDescriptor as? ClassDescriptor ?: return null
+    val ktClass = descriptorToDeclaration(classDescriptor) as? KtClass ?: return null
+
+    return if (ktClass.isAnnotation() && ktClass.isWritable) {
+        ktClass to classDescriptor
+    } else {
+        null
+    }
+}
+
+private fun PsiModifierListOwner.hasRegistrationAnnotation(): Boolean {
     return this.annotations.any { it.isRegistrationAnnotation() }
 }
 
-private fun PsiAnnotation.isRegistrationAnnotation(): Boolean {
+private fun PsiAnnotation.isRegistrationAnnotation(alreadyResolvedAnnotations: MutableList<PsiAnnotation> = mutableListOf()): Boolean {
     return this.qualifiedName == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotScript}" ||
         this.qualifiedName == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotMember}" ||
-        this.resolveAnnotationType()?.annotations?.any { it.isRegistrationAnnotation() } == true
+        run {
+            val annotationsOnAnnotation = this.resolveAnnotationType()?.annotations ?: return false
+            annotationsOnAnnotation
+                .filter { it !in alreadyResolvedAnnotations }
+                .any { it.isRegistrationAnnotation(alreadyResolvedAnnotations.apply { addAll(annotationsOnAnnotation) }) }
+        }
+}
+
+private fun PsiField.getOverriddenFields(): List<PsiField> {
+    val overriddenFields = mutableListOf<PsiField>()
+    val containingClass = this.containingClass ?: return overriddenFields
+
+    var superClass: PsiClass? = containingClass.superClass
+
+    while (superClass != null) {
+        for (superField in superClass.fields) {
+            if (this.name == superField.name && this.type.isAssignableFrom(superField.type)) {
+                overriddenFields.add(superField)
+            }
+        }
+        superClass = superClass.superClass
+    }
+
+    return overriddenFields
+}
+
+private fun PsiField.overridesRegistered(): Boolean {
+    return getOverriddenFields().any { it.isRegistered() }
+}
+
+private fun PsiMethod.overridesRegistered(): Boolean {
+    val superMethods = this.findSuperMethods()
+
+    return superMethods.any { it.isRegistered() }
+}
+
+private fun PsiMethod.overridesGodotApiFunction(): Boolean {
+    val superMethods = this.findSuperMethods()
+
+    return superMethods.any { superMethod ->
+        superMethod.annotations.any { superMethodAnnotation -> superMethodAnnotation.qualifiedName == GODOT_API_MEMBER_ANNOTATION }
+    }
 }
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/linemarker/RegisteredNameLineMarker.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/linemarker/RegisteredNameLineMarker.kt
index 2783936408..d635ebc815 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/linemarker/RegisteredNameLineMarker.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/linemarker/RegisteredNameLineMarker.kt
@@ -13,29 +13,16 @@ import com.intellij.psi.PsiField
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.impl.source.tree.LeafPsiElement
 import godot.intellij.plugin.GodotPluginBundle
-import godot.intellij.plugin.data.model.GODOT_API_MEMBER_ANNOTATION
-import godot.intellij.plugin.data.model.GODOT_MEMBER_ANNOTATION
-import godot.intellij.plugin.data.model.GODOT_SCRIPT_ANNOTATION
 import godot.intellij.plugin.extension.getRegisteredClassName
 import godot.intellij.plugin.extension.isAbstract
 import godot.intellij.plugin.extension.isInGodotRoot
 import godot.intellij.plugin.extension.isRegistered
-import godot.intellij.plugin.extension.isSignal
 import godot.common.extensions.convertToSnakeCase
-import org.jetbrains.kotlin.backend.jvm.ir.psiElement
-import org.jetbrains.kotlin.descriptors.PropertyDescriptor
-import org.jetbrains.kotlin.idea.base.psi.kotlinFqName
-import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.refactoring.isAbstract
-import org.jetbrains.kotlin.idea.searching.inheritors.findAllOverridings
-import org.jetbrains.kotlin.idea.util.findAnnotation
 import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.KtProperty
-import org.jetbrains.kotlin.resolve.DescriptorUtils
-import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import java.awt.datatransfer.StringSelection
 import javax.swing.Icon
 
@@ -55,7 +42,7 @@ class RegisteredNameLineMarker : LineMarkerProvider {
         }
 
         val lineMarkerData = when (val parent = element.parent) {
-            is KtClass -> if (parent.findAnnotation(FqName(GODOT_SCRIPT_ANNOTATION)) != null) {
+            is KtClass -> if (parent.isRegistered()) {
                 val name = if (parent.isAbstract()) {
                     GodotPluginBundle.message(
                         "linemarker.registeredName.notRegisteredBecauseIsAbstract.text"
@@ -70,7 +57,7 @@ class RegisteredNameLineMarker : LineMarkerProvider {
                 )
             } else null
 
-            is PsiClass -> if (parent.getAnnotation(GODOT_SCRIPT_ANNOTATION) != null) {
+            is PsiClass -> if (parent.isRegistered()) {
                 val name = if (parent.isAbstract) {
                     GodotPluginBundle.message(
                         "linemarker.registeredName.notRegisteredBecauseIsAbstract.text"
@@ -87,44 +74,16 @@ class RegisteredNameLineMarker : LineMarkerProvider {
             } else null
 
             is PsiMethod -> when {
-                parent.getAnnotation(GODOT_MEMBER_ANNOTATION) != null -> LineMarkerData(
+                parent.isRegistered() -> LineMarkerData(
                     identifier = parent.nameIdentifier ?: parent.navigationElement,
                     convertedName = parent.name.convertToSnakeCase(),
                     gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_method.svg", this::class.java)
                 )
-
-                else -> {
-                    val superMethods = parent.findSuperMethods()
-
-                    val isAnySuperMethodAApiMethod = superMethods.any { superMethod ->
-                        superMethod.annotations.any { superMethodAnnotation -> superMethodAnnotation.qualifiedName == GODOT_API_MEMBER_ANNOTATION }
-                    }
-                    val isAnySuperMethodRegistered = superMethods.any { it.isRegistered() }
-
-                    if (isAnySuperMethodAApiMethod || isAnySuperMethodRegistered) {
-                        LineMarkerData(
-                            identifier = parent.nameIdentifier ?: parent.navigationElement,
-                            convertedName = parent.name.convertToSnakeCase(),
-                            gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_method.svg", this::class.java)
-                        )
-                    } else null
-                }
+                else -> null
             }
 
             is PsiField -> when {
-                parent.getAnnotation(GODOT_MEMBER_ANNOTATION) != null -> LineMarkerData(
-                    identifier = parent.nameIdentifier,
-                    convertedName = parent.name.convertToSnakeCase(),
-                    gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_property.svg", this::class.java)
-                )
-
-                parent.isSignal() -> LineMarkerData(
-                    identifier = parent.nameIdentifier,
-                    convertedName = parent.name.convertToSnakeCase(),
-                    gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_signal.svg", this::class.java)
-                )
-
-                parent.getOverriddenFields().any { it.isRegistered() } -> LineMarkerData(
+                parent.isRegistered() -> LineMarkerData(
                     identifier = parent.nameIdentifier,
                     convertedName = parent.name.convertToSnakeCase(),
                     gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_property.svg", this::class.java)
@@ -134,24 +93,7 @@ class RegisteredNameLineMarker : LineMarkerProvider {
             }
 
             is KtProperty -> when {
-                parent.findAnnotation(FqName(GODOT_MEMBER_ANNOTATION)) != null ||
-                    parent.findAllOverridings().any { it.isRegistered() } -> parent.name?.let { name ->
-                    LineMarkerData(
-                        identifier = parent.nameIdentifier ?: parent.navigationElement,
-                        convertedName = name.convertToSnakeCase(),
-                        gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_property.svg", this::class.java)
-                    )
-                }
-
-                parent.isSignal() -> parent.name?.let { name ->
-                    LineMarkerData(
-                        identifier = parent.nameIdentifier ?: parent.navigationElement,
-                        convertedName = name.convertToSnakeCase(),
-                        gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_signal.svg", this::class.java)
-                    )
-                }
-
-                parent.getOverriddenProperties().any { it.isRegistered() } -> parent.name?.let { name ->
+                parent.isRegistered() -> parent.name?.let { name ->
                     LineMarkerData(
                         identifier = parent.nameIdentifier ?: parent.navigationElement,
                         convertedName = name.convertToSnakeCase(),
@@ -163,7 +105,7 @@ class RegisteredNameLineMarker : LineMarkerProvider {
             }
 
             is KtFunction -> when {
-                parent.findAnnotation(FqName(GODOT_MEMBER_ANNOTATION)) != null -> parent.name?.let { name ->
+                parent.isRegistered() -> parent.name?.let { name ->
                     LineMarkerData(
                         identifier = parent.nameIdentifier ?: parent.navigationElement,
                         convertedName = name.convertToSnakeCase(),
@@ -171,24 +113,7 @@ class RegisteredNameLineMarker : LineMarkerProvider {
                     )
                 }
 
-                else -> {
-                    val superMethods = parent.findAllOverridings().filterIsInstance<KtFunction>()
-
-                    val isAnySuperMethodAApiMethod = superMethods.any { superMethod ->
-                        superMethod.annotations.any { superMethodAnnotation -> superMethodAnnotation.kotlinFqName?.asString() == GODOT_API_MEMBER_ANNOTATION }
-                    }
-                    val isAnySuperMethodRegistered = superMethods.any { it.isRegistered() }
-
-                    if (isAnySuperMethodAApiMethod || isAnySuperMethodRegistered) {
-                        parent.name?.let { name ->
-                            LineMarkerData(
-                                identifier = parent.nameIdentifier ?: parent.navigationElement,
-                                convertedName = name.convertToSnakeCase(),
-                                gutterIcon = IconLoader.getIcon("/linemarkerIcons/icon_member_method.svg", this::class.java)
-                            )
-                        }
-                    } else null
-                }
+                else -> null
             }
 
             else -> null
@@ -211,35 +136,3 @@ class RegisteredNameLineMarker : LineMarkerProvider {
         } else null
     }
 }
-
-
-fun PsiField.getOverriddenFields(): List<PsiField> {
-    val overriddenFields = mutableListOf<PsiField>()
-    val containingClass = this.containingClass ?: return overriddenFields
-
-    var superClass: PsiClass? = containingClass.superClass
-
-    while (superClass != null) {
-        for (superField in superClass.fields) {
-            if (this.name == superField.name && this.type.isAssignableFrom(superField.type)) {
-                overriddenFields.add(superField)
-            }
-        }
-        superClass = superClass.superClass
-    }
-
-    return overriddenFields
-}
-
-fun KtProperty.getOverriddenProperties(): List<KtProperty> {
-    // Resolve the property to a PropertyDescriptor
-    val propertyDescriptor = this.resolveToDescriptorIfAny(BodyResolveMode.FULL) as? PropertyDescriptor
-        ?: return emptyList()
-
-    // Get overridden properties
-    return DescriptorUtils
-        .getAllOverriddenDescriptors(propertyDescriptor)
-        .filterIsInstance<PropertyDescriptor>()
-        .mapNotNull { it.psiElement }
-        .filterIsInstance<KtProperty>()
-}

From 854a8f366fe02e7a407ae3b788637c14fccc3739 Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sun, 13 Oct 2024 14:45:46 +0200
Subject: [PATCH 11/18] Cleanup code

---
 .../kotlin/godot/annotation/GodotScript.kt    |  5 +-
 .../src/main/kotlin/godot/annotation/Tool.kt  |  1 +
 .../annotator/clazz/RegisterClassAnnotator.kt | 55 +++++--------------
 .../property/RegisterPropertiesAnnotator.kt   | 51 +++++++++++------
 .../intellij/plugin/extension/psiClass.kt     | 41 +++++++-------
 .../plugin/extension/psiElementExt.kt         |  4 +-
 .../messages/generalLabels.properties         |  5 +-
 7 files changed, 76 insertions(+), 86 deletions(-)

diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/GodotScript.kt b/kt/godot-library/src/main/kotlin/godot/annotation/GodotScript.kt
index b0edab1589..e8c7c6baf1 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/GodotScript.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/GodotScript.kt
@@ -5,6 +5,9 @@ package godot.annotation
  *
  * @param customName Register the class name with this string rather than with `fully_qualified_ClassName`. **Note:** If this class name is already registered, a compilation error will be thrown! So make sure your custom class name is unique!
  */
-@Target(AnnotationTarget.CLASS)
+@Target(
+    AnnotationTarget.CLASS,
+    AnnotationTarget.ANNOTATION_CLASS
+)
 @Retention(AnnotationRetention.RUNTIME)
 annotation class GodotScript(val customName: String = "")
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt b/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt
index 35f3bfd300..2fa7c784d0 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt
@@ -8,4 +8,5 @@ package godot.annotation
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
+@GodotScript
 annotation class Tool
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt
index 2c4332c67d..662e5aa5d5 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/clazz/RegisterClassAnnotator.kt
@@ -6,25 +6,19 @@ import com.intellij.psi.PsiElement
 import godot.intellij.plugin.GodotPluginBundle
 import godot.intellij.plugin.annotator.base.BaseAnnotator
 import godot.intellij.plugin.annotator.general.checkNotGeneric
-import godot.intellij.plugin.data.model.GODOT_MEMBER_ANNOTATION
 import godot.intellij.plugin.data.model.GODOT_SCRIPT_ANNOTATION
-import godot.intellij.plugin.data.model.TOOL_ANNOTATION
-import godot.intellij.plugin.extension.anyFunctionHasAnnotation
-import godot.intellij.plugin.extension.anyPropertyHasAnnotation
+import godot.intellij.plugin.extension.extendsGodotType
 import godot.intellij.plugin.extension.getRegisteredClassName
+import godot.intellij.plugin.extension.hasDefaultConstructor
 import godot.intellij.plugin.extension.isAbstract
+import godot.intellij.plugin.extension.isAnyMemberRegistered
 import godot.intellij.plugin.extension.isRegistered
 import godot.intellij.plugin.extension.registerProblem
 import godot.intellij.plugin.extension.registeredClassNameCache
-import godot.intellij.plugin.extension.resolveToDescriptor
 import godot.intellij.plugin.quickfix.ClassAlreadyRegisteredQuickFix
 import godot.intellij.plugin.quickfix.ClassNotRegisteredQuickFix
 import godot.common.constants.Constraints
-import godot.tools.common.constants.GodotKotlinJvmTypes
-import godot.tools.common.constants.godotCorePackage
 import org.jetbrains.kotlin.idea.base.util.module
-import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
-import org.jetbrains.kotlin.resolve.descriptorUtil.getAllSuperclassesWithoutAny
 
 class RegisterClassAnnotator : BaseAnnotator {
     private val classNotRegisteredQuickFix by lazy { ClassNotRegisteredQuickFix() }
@@ -32,32 +26,12 @@ class RegisterClassAnnotator : BaseAnnotator {
     override fun checkElement(element: PsiElement, holder: AnnotationHolder) {
         when(element) {
             is PsiClass -> {
-                if (!element.isRegistered() || element.isAnnotationType) {
+                if (!element.isRegistered()) {
                     val errorLocation = element.nameIdentifier ?: element.navigationElement
-                    if (element.getAnnotation(TOOL_ANNOTATION) != null) {
-                        holder.registerProblem(
-                            GodotPluginBundle.message("problem.class.notRegistered.butHasToolAnnotation"),
-                            errorLocation,
-                            classNotRegisteredQuickFix
-                        )
-                    }
-                    if (!element.isAbstract && element.anyPropertyHasAnnotation(GODOT_MEMBER_ANNOTATION)) {
-                        holder.registerProblem(
-                            GodotPluginBundle.message("problem.class.notRegistered.properties"),
-                            errorLocation,
-                            classNotRegisteredQuickFix
-                        )
-                    }
-                    if (!element.isAbstract && element.anyPropertyHasAnnotation(GODOT_MEMBER_ANNOTATION)) {
-                        holder.registerProblem(
-                            GodotPluginBundle.message("problem.class.notRegistered.signals"),
-                            errorLocation,
-                            classNotRegisteredQuickFix
-                        )
-                    }
-                    if (!element.isAbstract && element.anyFunctionHasAnnotation(GODOT_MEMBER_ANNOTATION)) {
+
+                    if (!element.isAbstract && element.isAnyMemberRegistered()) {
                         holder.registerProblem(
-                            GodotPluginBundle.message("problem.class.notRegistered.functions"),
+                            GodotPluginBundle.message("problem.class.notRegistered.members"),
                             errorLocation,
                             classNotRegisteredQuickFix
                         )
@@ -75,17 +49,16 @@ class RegisterClassAnnotator : BaseAnnotator {
     }
 
     private fun checkExtendsGodotType(psiClass: PsiClass, holder: AnnotationHolder) {
-        if (psiClass.resolveToDescriptor()?.getAllSuperclassesWithoutAny()?.any { it.fqNameSafe.asString() == "$godotCorePackage.${GodotKotlinJvmTypes.ktObject}" } != true) {
+        if (!psiClass.extendsGodotType()) {
             holder.registerProblem(
-                GodotPluginBundle.message("problem.class.inheritance.notInheritingGodotObject"),
-                psiClass.nameIdentifier
-                    ?: psiClass.navigationElement
+                message = GodotPluginBundle.message("problem.class.inheritance.notInheritingGodotObject"),
+                errorLocation = psiClass.nameIdentifier ?: psiClass.navigationElement
             )
         }
     }
 
     private fun checkDefaultConstructorExistence(psiClass: PsiClass, holder: AnnotationHolder) {
-        if (psiClass.constructors.isNotEmpty() && psiClass.constructors.filter { constructor -> !constructor.hasParameters() }.size != 1) {
+        if (!psiClass.hasDefaultConstructor()) {
             // TODO: create quick fix (not trivial to create a secondary constructor from a primary one, i failed miserably)
             holder.registerProblem(
                 GodotPluginBundle.message("problem.class.constructor.defaultConstructorMissing"),
@@ -98,7 +71,7 @@ class RegisterClassAnnotator : BaseAnnotator {
     private fun checkConstructorParameterCount(psiClass: PsiClass, holder: AnnotationHolder) {
         psiClass
             .constructors
-            .filter { it.getAnnotation(GODOT_MEMBER_ANNOTATION) != null }
+            .filter { it.isRegistered() }
             .forEach { ktConstructor ->
                 if (ktConstructor.parameterList.parametersCount > Constraints.MAX_CONSTRUCTOR_ARG_COUNT) {
                     holder.registerProblem(
@@ -112,10 +85,10 @@ class RegisterClassAnnotator : BaseAnnotator {
     private fun checkConstructorOverloading(psiClass: PsiClass, holder: AnnotationHolder) {
         val constructors = psiClass
             .constructors
-            .filter { it.getAnnotation(GODOT_MEMBER_ANNOTATION) != null }
+            .filter { it.isRegistered() }
 
         val constructorsByArgCount = constructors
-            .filter { it.getAnnotation(GODOT_MEMBER_ANNOTATION) != null }
+            .filter { it.isRegistered() }
             .groupBy { it.parameterList.parametersCount }
 
         if (constructorsByArgCount.size != constructors.size) {
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/RegisterPropertiesAnnotator.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/RegisterPropertiesAnnotator.kt
index 534441f4c4..e6fc917b09 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/RegisterPropertiesAnnotator.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/RegisterPropertiesAnnotator.kt
@@ -3,6 +3,8 @@ package godot.intellij.plugin.annotator.property
 import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.lang.annotation.Annotator
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiField
+import com.intellij.psi.PsiTypeParameterListOwner
 import godot.intellij.plugin.GodotPluginBundle
 import godot.intellij.plugin.annotator.general.checkNotGeneric
 import godot.intellij.plugin.extension.isCoreType
@@ -37,26 +39,43 @@ class RegisterPropertiesAnnotator : Annotator {
     override fun annotate(element: PsiElement, holder: AnnotationHolder) {
         if (!element.isInGodotRoot()) return
 
-        if (element is KtProperty) {
-            if (element.isRegistered()) {
-                checkNotGeneric(element.toLightElements().firstIsInstance(), holder)
-                checkMutability(element, holder)
-                checkRegisteredType(element, holder)
-                lateinitChecks(element, holder)
-                nullableChecks(element, holder)
+        when(element) {
+            is KtProperty -> {
+                if (element.isRegistered()) {
+                    checkNotGeneric(element.toLightElements().firstIsInstance(), holder)
+                    checkMutability(element, holder)
+                    checkRegisteredType(element, holder)
+                    lateinitChecks(element, holder)
+                    nullableChecks(element, holder)
+                }
+                // outside to check if the property is also registered
+                propertyHintAnnotationChecker.checkPropertyHintAnnotations(element, holder)
+            }
+            is PsiField -> {
+                if (element.isRegistered()) {
+                    (element as? PsiTypeParameterListOwner)?.let { checkNotGeneric(it, holder) }
+                    checkMutability(element, holder)
+                }
             }
-            // outside to check if the property is also registered
-            propertyHintAnnotationChecker.checkPropertyHintAnnotations(element, holder)
         }
     }
 
-    private fun checkMutability(ktProperty: KtProperty, holder: AnnotationHolder) {
-        if (!ktProperty.isVar) {
-            holder.registerProblem(
-                GodotPluginBundle.message("problem.property.mutability"),
-                ktProperty.valOrVarKeyword,
-                mutabilityQuickFix
-            )
+    private fun checkMutability(psiElement: PsiElement, holder: AnnotationHolder) {
+        when(psiElement) {
+            is KtProperty -> if (!psiElement.isVar) {
+                holder.registerProblem(
+                    GodotPluginBundle.message("problem.property.mutability"),
+                    psiElement.valOrVarKeyword,
+                    mutabilityQuickFix
+                )
+            }
+            is PsiField -> if (psiElement.modifierList?.hasModifierProperty("final") == true) {
+                holder.registerProblem(
+                    GodotPluginBundle.message("problem.property.mutability"),
+                    psiElement.modifierList?.children?.firstOrNull { it.text.contains("final") } ?: psiElement
+                )
+            }
+            else -> return
         }
     }
 
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiClass.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiClass.kt
index 048a14cdde..9fce4ad054 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiClass.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiClass.kt
@@ -1,17 +1,16 @@
 package godot.intellij.plugin.extension
 
 import com.intellij.psi.PsiClass
-import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiModifier
-import godot.intellij.plugin.data.model.GODOT_SCRIPT_ANNOTATION
-import org.jetbrains.kotlin.asJava.classes.KtUltraLightClass
+import godot.tools.common.constants.GodotKotlinJvmTypes
+import godot.tools.common.constants.godotCorePackage
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaClassDescriptor
-import org.jetbrains.kotlin.idea.util.findAnnotation
-import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.psiUtil.isAbstract
+import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
+import org.jetbrains.kotlin.resolve.descriptorUtil.getAllSuperclassesWithoutAny
 
 val PsiClass.isAbstract: Boolean
     get() = when(this) {
@@ -19,27 +18,25 @@ val PsiClass.isAbstract: Boolean
         else -> isInterface || modifierList?.hasModifierProperty(PsiModifier.ABSTRACT) ?: false
     }
 
-fun PsiClass.anyFunctionHasAnnotation(annotationFqName: String) = this
-    .methods
-    .filterIsInstance<PsiMethod>()
-    .any { declaration ->
-        declaration.getAnnotation(annotationFqName) != null
-    }
-
-fun PsiClass.anyPropertyHasAnnotation(annotationFqName: String) = when(this) {
-    is KtUltraLightClass -> (this.kotlinOrigin as? KtClass)?.getProperties()?.any { property -> property.findAnnotation(FqName(annotationFqName)) != null } == true
-    else -> this
-        .fields
-        .any { declaration ->
-            declaration.getAnnotation(annotationFqName) != null
-        }
+fun PsiClass.isAnyMemberRegistered(): Boolean {
+    return this.methods.any { it.isRegistered() } || this.methods.any { it.isRegistered() }
 }
 
-val PsiClass.isRegistered: Boolean
-    get() = getAnnotation(GODOT_SCRIPT_ANNOTATION) != null
+fun PsiClass.extendsGodotType(): Boolean {
+    return this
+        .resolveToDescriptor()
+        ?.getAllSuperclassesWithoutAny()
+        ?.any { it.fqNameSafe.asString() == "$godotCorePackage.${GodotKotlinJvmTypes.ktObject}" } == true
+}
 
+fun PsiClass.hasDefaultConstructor(): Boolean {
+    return when(this) {
+        is KtClass -> this.constructors.any { it.parameters.isEmpty() }
+        else -> this.constructors.isEmpty() || this.constructors.any { it.parameters.isEmpty() }
+    }
+}
 
-fun PsiClass.resolveToDescriptor(): ClassDescriptor? {
+private fun PsiClass.resolveToDescriptor(): ClassDescriptor? {
     return when(this) {
         is KtClass -> resolveToDescriptorIfAny()
         else -> getJavaClassDescriptor()
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
index ca45470fbc..1eb08e2eba 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
@@ -30,14 +30,14 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 fun PsiElement.isRegistered(): Boolean {
     return when (this) {
         is KtAnnotated -> when (this) {
-            is KtClass -> hasRegistrationAnnotation()
+            is KtClass -> hasRegistrationAnnotation() && !this.isAnnotation()
             is KtProperty -> hasRegistrationAnnotation() || isSignal() || overridesRegistered()
             is KtFunction -> hasRegistrationAnnotation() || overridesGodotApiFunction() || overridesRegistered()
             else -> false
         }
 
         is PsiModifierListOwner -> when(this) {
-            is PsiClass -> hasRegistrationAnnotation()
+            is PsiClass -> hasRegistrationAnnotation() && !this.isAnnotationType
             is PsiField -> hasRegistrationAnnotation() || isSignal() || overridesRegistered()
             is PsiMethod -> hasRegistrationAnnotation() || overridesGodotApiFunction() || overridesRegistered()
             else -> false
diff --git a/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties b/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
index 198484bfd2..2b7e812313 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
+++ b/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
@@ -29,10 +29,7 @@ wizard.projectSettings.buildSettings.graalvm.windowsDeveloperVCVarsPath=WindowsD
 wizard.projectSettings.buildSettings.graalvm.windowsDeveloperVCVarsPath.browseDialogTitle=WindowsDeveloper VC vars path
 wizard.projectSettings.buildSettings.graalvm.windowsDeveloperVCVarsPath.comment=Absolute path to WindowsDeveloper VC vars path
 wizard.projectSettings.buildSettings.graalvm.isIOSEnabled=IOS enabled:
-problem.class.notRegistered.butHasToolAnnotation=This class is marked as tool class but not registered with @RegisterClass
-problem.class.notRegistered.properties=This class contains registered properties but is not registered
-problem.class.notRegistered.functions=This class contains registered functions but is not registered
-problem.class.notRegistered.signals=This class contains registered signals but is not registered
+problem.class.notRegistered.members=This class contains registered members but is not registered
 problem.class.inheritance.notInheritingGodotObject=Registered class not inheriting godot type
 problem.class.constructor.defaultConstructorMissing=There is no default constructor defined. Godot needs a default constructor (no args)
 problem.class.constructor.toManyParams=Godot cannot handle constructors for registered classes with more than {0} parameters. Reduce your parameter count

From 60913dee22efbf22273b22f4695e0becbf58f717 Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sun, 13 Oct 2024 14:52:38 +0200
Subject: [PATCH 12/18] Fix trigger

---
 .github/workflows/trigger_dev.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/trigger_dev.yml b/.github/workflows/trigger_dev.yml
index 228c7fc29e..6c9dc03621 100644
--- a/.github/workflows/trigger_dev.yml
+++ b/.github/workflows/trigger_dev.yml
@@ -108,4 +108,5 @@ jobs:
       - build-linux
     with:
       godot-version: ${{ needs.setup-build-variables.outputs['godot-version'] }}
-      jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
\ No newline at end of file
+      jvm-version: ${{ needs.setup-build-variables.outputs['jvm-version'] }}
+      build-version: ${{ needs.setup-build-variables.outputs['build-version'] }}
\ No newline at end of file

From 367b46d6ea77d49e075918ef8ba75794e42d415f Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sun, 13 Oct 2024 15:22:49 +0200
Subject: [PATCH 13/18] Fix registration of overridden functions, annotation
 classes and fix recursive registration annotations resolving

---
 .../tests/scripts/godot/tests/Invocation.gdj  | 294 +++++++++---------
 .../processor/ext/ksAnnotatedExt.kt           |  10 +-
 .../processor/ext/ksClassDeclarationExt.kt    |   9 +-
 3 files changed, 161 insertions(+), 152 deletions(-)

diff --git a/harness/tests/scripts/godot/tests/Invocation.gdj b/harness/tests/scripts/godot/tests/Invocation.gdj
index ad8ec0b91c..5dd455bb1c 100644
--- a/harness/tests/scripts/godot/tests/Invocation.gdj
+++ b/harness/tests/scripts/godot/tests/Invocation.gdj
@@ -7,159 +7,159 @@ relativeSourcePath = src/main/kotlin/godot/tests/Invocation.kt
 baseType = Node3D
 supertypes = [
     godot.Node3D,
-    godot.Node,
-    godot.Object,
-    godot.core.KtObject,
-    kotlin.Any
+	godot.Node,
+	godot.Object,
+	godot.core.KtObject,
+	kotlin.Any
 ]
 signals = [
     
 ]
 properties = [
     button,
-    enum_list,
-    vector_list,
-    enum_list_mutable,
-    register_object,
-    register_object_nullable,
-    register_object_nullable_pre_init,
-    register_object_non_nullable_pre_init,
-    vector,
-    x,
-    y,
-    z,
-    custom_name,
-    invocation,
-    enum_test,
-    resource_test,
-    jvm_id,
-    test_array_any,
-    nav_meshes,
-    nullable_array,
-    any_to_any_dictionary,
-    nav_meshes_dictionary,
-    nullable_dictionary,
-    color,
-    rid,
-    packed_byte_array,
-    packed_int32_array,
-    packed_float64_array,
-    packed_color_array,
-    packed_string_array,
-    packed_vector2_array,
-    packed_vector3_array,
-    p1,
-    p1_1,
-    p2,
-    p3,
-    p4,
-    p5,
-    p6,
-    p7,
-    p8,
-    p9,
-    p10,
-    p11,
-    p12,
-    p13,
-    p14,
-    p15,
-    p16,
-    p17,
-    stringtemplation,
-    test_string,
-    ascii_string,
-    utf8_string
+	enum_list,
+	vector_list,
+	enum_list_mutable,
+	register_object,
+	register_object_nullable,
+	register_object_nullable_pre_init,
+	register_object_non_nullable_pre_init,
+	vector,
+	x,
+	y,
+	z,
+	custom_name,
+	invocation,
+	enum_test,
+	resource_test,
+	jvm_id,
+	test_array_any,
+	nav_meshes,
+	nullable_array,
+	any_to_any_dictionary,
+	nav_meshes_dictionary,
+	nullable_dictionary,
+	color,
+	rid,
+	packed_byte_array,
+	packed_int32_array,
+	packed_float64_array,
+	packed_color_array,
+	packed_string_array,
+	packed_vector2_array,
+	packed_vector3_array,
+	p1,
+	p1_1,
+	p2,
+	p3,
+	p4,
+	p5,
+	p6,
+	p7,
+	p8,
+	p9,
+	p10,
+	p11,
+	p12,
+	p13,
+	p14,
+	p15,
+	p16,
+	p17,
+	stringtemplation,
+	test_string,
+	ascii_string,
+	utf8_string
 ]
 functions = [
     int_value,
-    long_value,
-    float_value,
-    double_value,
-    boolean_value,
-    string_value,
-    int_addition,
-    init_nullables,
-    _enter_tree,
-    _ready,
-    _on_destroy,
-    get_rid_id,
-    get_nav_mesh_rid,
-    append_to_any_dict,
-    remove_from_any_dict,
-    get_from_any_dict,
-    any_dict_size,
-    append_to_string_nav_mesh_dict,
-    remove_from_string_nav_mesh_dict,
-    get_from_string_nav_mesh_dict,
-    string_nav_mesh_dict_size,
-    append_to_string_nav_mesh_nullable_dict,
-    remove_from_string_nav_mesh_nullable_dict,
-    string_nav_mesh_nullable_dict_size,
-    append_nullable_standard_nav_mesh,
-    append_nullable_nav_mesh,
-    remove_nullable_nav_mesh,
-    remove_nullable_nav_mesh_with_index,
-    nullable_nav_meshes_size,
-    append_standard_nav_mesh,
-    append_nav_mesh,
-    remove_nav_mesh,
-    remove_nav_mesh_with_index,
-    get_nav_mesh_from_array,
-    nav_meshes_size,
-    append_any_to_array,
-    remove_any_from_array,
-    get_any_from_array,
-    array_any_size,
-    count_namesh_instance,
-    get_nav_mesh_count,
-    parent_is_node3_d,
-    is_object_node3_d,
-    other_jvm_id,
-    has_camera_node,
-    add_byte_to_packed_array,
-    add_byte_array_to_packed_array,
-    delete_byte_from_packed_array,
-    get_byte_from_packed_array,
-    set_byte_in_packed_array,
-    resize_byte_packed_array,
-    add_color_to_packed_array,
-    add_color_array_to_packed_array,
-    delete_color_from_packed_array,
-    get_color_from_packed_array,
-    set_color_in_packed_array,
-    resize_color_packed_array,
-    add_int_to_packed_array,
-    add_int_array_to_packed_array,
-    delete_int_from_packed_array,
-    get_int_from_packed_array,
-    set_int_in_packed_array,
-    resize_int_packed_array,
-    add_real_to_packed_array,
-    add_real_array_to_packed_array,
-    read_string_from_byte_array,
-    delete_real_from_packed_array,
-    get_real_from_packed_array,
-    set_real_in_packed_array,
-    resize_real_packed_array,
-    add_string_to_packed_array,
-    add_string_array_to_packed_array,
-    delete_string_from_packed_array,
-    get_string_from_packed_array,
-    set_string_in_packed_array,
-    resize_string_packed_array,
-    add_vector2_to_packed_array,
-    add_vector2_array_to_packed_array,
-    delete_vector2_from_packed_array,
-    get_vector2_from_packed_array,
-    set_vector2_in_packed_array,
-    resize_vector2_packed_array,
-    add_vector3_to_packed_array,
-    add_vector3_array_to_packed_array,
-    delete_vector3_from_packed_array,
-    get_vector3_from_packed_array,
-    set_vector3_in_packed_array,
-    resize_vector3_packed_array,
-    is_sent_xr_same_instance_as_jvm_singleton,
-    create_variant_array_of_user_type
-]
+	long_value,
+	float_value,
+	double_value,
+	boolean_value,
+	string_value,
+	int_addition,
+	init_nullables,
+	_enter_tree,
+	_ready,
+	_on_destroy,
+	get_rid_id,
+	get_nav_mesh_rid,
+	append_to_any_dict,
+	remove_from_any_dict,
+	get_from_any_dict,
+	any_dict_size,
+	append_to_string_nav_mesh_dict,
+	remove_from_string_nav_mesh_dict,
+	get_from_string_nav_mesh_dict,
+	string_nav_mesh_dict_size,
+	append_to_string_nav_mesh_nullable_dict,
+	remove_from_string_nav_mesh_nullable_dict,
+	string_nav_mesh_nullable_dict_size,
+	append_nullable_standard_nav_mesh,
+	append_nullable_nav_mesh,
+	remove_nullable_nav_mesh,
+	remove_nullable_nav_mesh_with_index,
+	nullable_nav_meshes_size,
+	append_standard_nav_mesh,
+	append_nav_mesh,
+	remove_nav_mesh,
+	remove_nav_mesh_with_index,
+	get_nav_mesh_from_array,
+	nav_meshes_size,
+	append_any_to_array,
+	remove_any_from_array,
+	get_any_from_array,
+	array_any_size,
+	count_namesh_instance,
+	get_nav_mesh_count,
+	parent_is_node3_d,
+	is_object_node3_d,
+	other_jvm_id,
+	has_camera_node,
+	add_byte_to_packed_array,
+	add_byte_array_to_packed_array,
+	delete_byte_from_packed_array,
+	get_byte_from_packed_array,
+	set_byte_in_packed_array,
+	resize_byte_packed_array,
+	add_color_to_packed_array,
+	add_color_array_to_packed_array,
+	delete_color_from_packed_array,
+	get_color_from_packed_array,
+	set_color_in_packed_array,
+	resize_color_packed_array,
+	add_int_to_packed_array,
+	add_int_array_to_packed_array,
+	delete_int_from_packed_array,
+	get_int_from_packed_array,
+	set_int_in_packed_array,
+	resize_int_packed_array,
+	add_real_to_packed_array,
+	add_real_array_to_packed_array,
+	read_string_from_byte_array,
+	delete_real_from_packed_array,
+	get_real_from_packed_array,
+	set_real_in_packed_array,
+	resize_real_packed_array,
+	add_string_to_packed_array,
+	add_string_array_to_packed_array,
+	delete_string_from_packed_array,
+	get_string_from_packed_array,
+	set_string_in_packed_array,
+	resize_string_packed_array,
+	add_vector2_to_packed_array,
+	add_vector2_array_to_packed_array,
+	delete_vector2_from_packed_array,
+	get_vector2_from_packed_array,
+	set_vector2_in_packed_array,
+	resize_vector2_packed_array,
+	add_vector3_to_packed_array,
+	add_vector3_array_to_packed_array,
+	delete_vector3_from_packed_array,
+	get_vector3_from_packed_array,
+	set_vector3_in_packed_array,
+	resize_vector3_packed_array,
+	is_sent_xr_same_instance_as_jvm_singleton,
+	create_variant_array_of_user_type
+]
\ No newline at end of file
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt
index 259cc15d96..0500d29e0a 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt
@@ -19,12 +19,16 @@ fun <T : Annotation> KSAnnotated.hasAnnotation(annotationClass: KClass<T>): Bool
         }
 }
 
-fun <T : Annotation> KSAnnotation.hasAnnotation(annotationClass: KClass<T>): Boolean {
-    return this.fqNameUnsafe == annotationClass.qualifiedName || this
+fun <T : Annotation> KSAnnotation.hasAnnotation(annotationClass: KClass<T>, alreadyEvaluated: MutableList<KSAnnotation> = mutableListOf()): Boolean {
+    val annotationsOnAnnotation = this
         .annotationType
+        .resolve()
+        .declaration
         .annotations
+        .filterNot { alreadyEvaluated.contains(it) }
         .toList()
-        .any { it.hasAnnotation(annotationClass) }
+
+    return this.fqNameUnsafe == annotationClass.qualifiedName || annotationsOnAnnotation.any { it.hasAnnotation(annotationClass, alreadyEvaluated.apply { add(this@hasAnnotation) }) }
 }
 
 fun KSAnnotated.hasRegistrationAnnotation(): Boolean {
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
index c213cdaf5a..5a6aa384dd 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
@@ -5,6 +5,7 @@ import com.google.devtools.ksp.getConstructors
 import com.google.devtools.ksp.getDeclaredProperties
 import com.google.devtools.ksp.isAbstract
 import com.google.devtools.ksp.isPublic
+import com.google.devtools.ksp.symbol.ClassKind
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSFunctionDeclaration
 import com.google.devtools.ksp.symbol.KSPropertyDeclaration
@@ -38,7 +39,7 @@ internal fun KSClassDeclaration.mapToClazz(
 
     val registeredFunctions = getAllFunctions()
         .filter { function ->
-            function.hasAnnotation(GodotMember::class) || function.overridesApiFunction()
+            function.hasAnnotation(GodotMember::class) || function.overridesApiFunction() || function.overridesRegisteredFunction()
         }
         .mapNotNull { it.mapToRegisteredFunction(this, settings) }
         .toList()
@@ -67,7 +68,7 @@ internal fun KSClassDeclaration.mapToClazz(
         .map { it.mapToRegisteredSignal(declaredProperties.toList(), settings) }
         .toList()
 
-    val shouldBeRegistered = hasRegistrationAnnotation() ||
+    val shouldBeRegistered = (classKind != ClassKind.ANNOTATION_CLASS && hasRegistrationAnnotation()) ||
         isAbstractAndContainsRegisteredMembers(registeredFunctions, registeredProperties, registeredSignals) ||
         isAbstractAndInheritsGodotBaseClass()
 
@@ -152,6 +153,10 @@ private fun KSFunctionDeclaration.overridesApiFunction(isOveridee: Boolean = fal
     }
 }
 
+private fun KSFunctionDeclaration.overridesRegisteredFunction(): Boolean {
+    return hasAnnotation(GodotMember::class) || (findOverridee() as? KSFunctionDeclaration)?.overridesRegisteredFunction() == true
+}
+
 private fun KSPropertyDeclaration.overridesRegisteredProperty(): Boolean {
     return hasAnnotation(GodotMember::class) || findOverridee()?.overridesRegisteredProperty() == true
 }

From 762b2b165a97690d2e5d23c4b5421c687cadc63f Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Mon, 14 Oct 2024 08:00:29 +0200
Subject: [PATCH 14/18] Update bunnymark to new benchmarks

---
 .../bunnymark/BunnymarkV1DrawTexture.kt       | 21 +++++--------
 .../benchmark/bunnymark/BunnymarkV1Sprites.kt | 31 ++++++++++---------
 .../godot/benchmark/bunnymark/BunnymarkV2.kt  | 31 ++++++++++---------
 .../godot/benchmark/bunnymark/BunnymarkV3.kt  | 26 ++++++++--------
 .../godot/benchmark/bunnymark/v3/Bunny.kt     |  7 ++---
 5 files changed, 55 insertions(+), 61 deletions(-)

diff --git a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1DrawTexture.kt b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1DrawTexture.kt
index 3122b0b837..4d8328b510 100644
--- a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1DrawTexture.kt
+++ b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1DrawTexture.kt
@@ -4,17 +4,15 @@ import godot.Node2D
 import godot.RandomNumberGenerator
 import godot.ResourceLoader
 import godot.Texture2D
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterSignal
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.core.Vector2
-import godot.signals.signal
+import godot.core.signal1
 
-@RegisterClass("BunnymarkV1DrawTexture")
+@GodotScript("BunnymarkV1DrawTexture")
 class BunnymarkV1DrawTexture : Node2D() {
 
-	@RegisterSignal
-	val benchmarkFinished by signal<Int>("bunnyCount")
+	val benchmarkFinished by signal1<Int>("bunnyCount")
 
 	data class Bunny(var position: Vector2, var speed: Vector2)
 
@@ -25,19 +23,16 @@ class BunnymarkV1DrawTexture : Node2D() {
 
 	private lateinit var screenSize: Vector2
 
-	@RegisterFunction
 	override fun _ready() {
 		randomNumberGenerator.randomize()
 	}
 
-	@RegisterFunction
 	override fun _draw() {
 		for (bunny in bunnies) {
 			drawTexture(bunnyTexture, bunny.position)
 		}
 	}
 
-	@RegisterFunction
 	override fun _process(delta: Double) {
 		screenSize = getViewportRect().size
 
@@ -80,7 +75,7 @@ class BunnymarkV1DrawTexture : Node2D() {
 		queueRedraw()
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun addBunny() {
 		bunnies.add(
 			Bunny(
@@ -90,13 +85,13 @@ class BunnymarkV1DrawTexture : Node2D() {
 		)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun removeBunny() {
 		if (bunnies.size == 0) return
 		bunnies.removeAt(bunnies.size - 1)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun finish() {
         benchmarkFinished.emit(bunnies.size)
 	}
diff --git a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1Sprites.kt b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1Sprites.kt
index 8845872151..cda7e451bb 100644
--- a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1Sprites.kt
+++ b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV1Sprites.kt
@@ -1,17 +1,20 @@
 package godot.benchmark.bunnymark
 
-import godot.core.*
-import godot.*
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterSignal
-import godot.signals.signal
-
-@RegisterClass("BunnymarkV1Sprites")
+import godot.Node2D
+import godot.RandomNumberGenerator
+import godot.ResourceLoader
+import godot.Sprite2D
+import godot.Texture2D
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
+import godot.core.Vector2
+import godot.core.signal1
+
+
+@GodotScript("BunnymarkV1Sprites")
 class BunnymarkV1Sprites : Node2D() {
 
-	@RegisterSignal
-	val benchmarkFinished by signal<Int>("bunnyCount")
+	val benchmarkFinished by signal1<Int>("bunnyCount")
 
 	private data class Bunny(var sprite: Sprite2D, var speed: Vector2)
 
@@ -22,12 +25,10 @@ class BunnymarkV1Sprites : Node2D() {
 
 	private lateinit var screenSize: Vector2
 
-	@RegisterFunction
 	override fun _ready() {
 		randomNumberGenerator.randomize()
 	}
 
-	@RegisterFunction
 	override fun _process(delta: Double) {
 		screenSize = getViewportRect().size
 
@@ -69,7 +70,7 @@ class BunnymarkV1Sprites : Node2D() {
 		}
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun addBunny() {
 		val bunny = Sprite2D()
 		bunny.texture = bunnyTexture
@@ -83,7 +84,7 @@ class BunnymarkV1Sprites : Node2D() {
 		)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun removeBunny() {
 		if (bunnies.size == 0) return
 		val bunny = bunnies[bunnies.size - 1]
@@ -92,7 +93,7 @@ class BunnymarkV1Sprites : Node2D() {
         bunny.sprite.queueFree()
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun finish() {
         benchmarkFinished.emit(bunnies.size)
 	}
diff --git a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV2.kt b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV2.kt
index 392b881356..85e6fa370b 100644
--- a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV2.kt
+++ b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV2.kt
@@ -1,17 +1,20 @@
 package godot.benchmark.bunnymark
 
-import godot.core.*
-import godot.*
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterSignal
-import godot.signals.signal
-
-@RegisterClass("BunnymarkV2")
+import godot.Label
+import godot.Node2D
+import godot.RandomNumberGenerator
+import godot.ResourceLoader
+import godot.Sprite2D
+import godot.Texture2D
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
+import godot.core.Vector2
+import godot.core.signal1
+
+@GodotScript("BunnymarkV2")
 class BunnymarkV2 : Node2D() {
 
-	@RegisterSignal
-	val benchmarkFinished by signal<Int>("bunnyCount")
+	val benchmarkFinished by signal1<Int>("bunnyCount")
 
 	private val gravity = 500
 	private val bunnySpeeds = mutableListOf<Vector2>()
@@ -22,7 +25,6 @@ class BunnymarkV2 : Node2D() {
 
 	private lateinit var screenSize: Vector2
 
-	@RegisterFunction
 	override fun _ready() {
 		randomNumberGenerator.randomize()
 		addChild(bunnies)
@@ -30,7 +32,6 @@ class BunnymarkV2 : Node2D() {
 		addChild(label)
 	}
 
-	@RegisterFunction
 	override fun _process(delta: Double) {
 		screenSize = getViewportRect().size
 		label.text = "Bunnies: " + bunnies.getChildCount().toString()
@@ -75,7 +76,7 @@ class BunnymarkV2 : Node2D() {
 		}
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun addBunny() {
 		val bunny = Sprite2D()
 		bunny.texture = bunnyTexture
@@ -86,7 +87,7 @@ class BunnymarkV2 : Node2D() {
 		)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun removeBunny() {
 		val childCount = bunnies.getChildCount()
 		if (childCount == 0) return
@@ -99,7 +100,7 @@ class BunnymarkV2 : Node2D() {
 		bunnySpeeds.removeAt(childCount.toInt() - 1)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun finish() {
         benchmarkFinished.emit(bunnySpeeds.size)
 	}
diff --git a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV3.kt b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV3.kt
index 70eca09c41..0f00923941 100644
--- a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV3.kt
+++ b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/BunnymarkV3.kt
@@ -1,18 +1,20 @@
 package godot.benchmark.bunnymark
 
-import godot.*
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterSignal
+import godot.Label
+import godot.Node2D
+import godot.RandomNumberGenerator
+import godot.ResourceLoader
+import godot.Texture2D
+import godot.annotation.GodotMember
+import godot.annotation.GodotScript
 import godot.benchmark.bunnymark.v3.Bunny
 import godot.core.Vector2
-import godot.signals.signal
+import godot.core.signal1
 
-@RegisterClass("BunnymarkV3")
+@GodotScript("BunnymarkV3")
 class BunnymarkV3 : Node2D() {
 
-	@RegisterSignal
-	val benchmarkFinished by signal<Int>("bunnyCount")
+	val benchmarkFinished by signal1<Int>("bunnyCount")
 
 	private val randomNumberGenerator = RandomNumberGenerator()
 	private val bunnyTexture = ResourceLoader.load("res://images/godot_bunny.png") as Texture2D
@@ -21,7 +23,6 @@ class BunnymarkV3 : Node2D() {
 
 	private lateinit var screenSize: Vector2
 
-	@RegisterFunction
 	override fun _ready() {
         randomNumberGenerator.randomize()
 		addChild(bunnies)
@@ -30,13 +31,12 @@ class BunnymarkV3 : Node2D() {
 		addChild(label)
 	}
 
-	@RegisterFunction
 	override fun _process(delta: Double) {
 		screenSize = getViewportRect().size
 		label.text = "Bunnies ${bunnies.getChildCount()}"
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun addBunny() {
 		val bunny = Bunny()
 		bunny.texture = bunnyTexture
@@ -45,7 +45,7 @@ class BunnymarkV3 : Node2D() {
 		bunny.speed = Vector2(randomNumberGenerator.randi() % 200 + 50, randomNumberGenerator.randi() % 200 + 50)
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun removeBunny() {
 		val childCount = bunnies.getChildCount()
 		if (childCount != 0) {
@@ -55,7 +55,7 @@ class BunnymarkV3 : Node2D() {
 		}
 	}
 
-	@RegisterFunction
+	@GodotMember
 	fun finish() {
         benchmarkFinished.emit(bunnies.getChildCount())
 	}
diff --git a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/v3/Bunny.kt b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/v3/Bunny.kt
index 33c491e58d..aa14b31391 100644
--- a/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/v3/Bunny.kt
+++ b/harness/bunnymark/src/main/kotlin/godot/benchmark/bunnymark/v3/Bunny.kt
@@ -2,11 +2,10 @@ package godot.benchmark.bunnymark.v3
 
 import godot.RandomNumberGenerator
 import godot.Sprite2D
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotScript
 import godot.core.Vector2
 
-@RegisterClass
+@GodotScript
 class Bunny : Sprite2D() {
 
 	var speed = Vector2()
@@ -15,12 +14,10 @@ class Bunny : Sprite2D() {
 	private lateinit var screenSize: Vector2
 	private val randomNumberGenerator = RandomNumberGenerator()
 
-    @RegisterFunction
     override fun _ready() {
         randomNumberGenerator.randomize()
     }
 
-	@RegisterFunction
 	override fun _process(delta: Double) {
 		screenSize = getViewportRect().size
 		val pos = position

From 63ff19f9b88c8765b4bf54547c5ce0c3a802c45e Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Mon, 14 Oct 2024 09:26:55 +0200
Subject: [PATCH 15/18] Update documentation and templates

---
 .../doc/getting-started/your-first-class.md   |  8 +++---
 docs/src/doc/index.md                         |  2 +-
 .../user-guide/advanced/abstract-classes.md   | 17 +++++-------
 docs/src/doc/user-guide/api-differences.md    |  3 +--
 docs/src/doc/user-guide/classes.md            | 26 +++++++++----------
 docs/src/doc/user-guide/functions.md          | 20 +++++---------
 docs/src/doc/user-guide/properties.md         | 18 ++++++-------
 .../doc/user-guide/signals_and_callables.md   | 21 ++++++---------
 .../src/main/kotlin/godot/benchmark/Memory.kt | 20 +++++++-------
 .../src/main/kotlin/godot/benchmark/Simple.kt | 20 +++++++-------
 .../otherSourceDir/CoreTypePropertyChecks.kt  |  3 +--
 .../main/java/godot/tests/JavaTestClass.java  |  1 -
 .../src/main/kotlin/godot/tests/Invocation.kt |  6 ++---
 .../kotlin/godot/gradle/GodotExtension.kt     |  2 +-
 .../signal/RegisterSignalAnnotator.kt         | 12 ---------
 .../plugin/extension/ktClassExtensions.kt     |  4 +--
 .../messages/generalLabels.properties         | 15 +++++------
 .../template/Simple.kt.intellij_template      |  6 ++---
 .../kotlin/godot/HelloGodot.kt.godot_template |  8 ++----
 src/language/java_language.cpp                |  7 ++---
 src/language/kotlin_language.cpp              |  7 ++---
 21 files changed, 87 insertions(+), 139 deletions(-)

diff --git a/docs/src/doc/getting-started/your-first-class.md b/docs/src/doc/getting-started/your-first-class.md
index 6a96520cb7..a328f9f30b 100644
--- a/docs/src/doc/getting-started/your-first-class.md
+++ b/docs/src/doc/getting-started/your-first-class.md
@@ -4,21 +4,19 @@ Let's create a file `src/main/kotlin/com/yourcompany/game/Simple.kt` with the fo
 package com.yourcompany.game
 
 import godot.Node3D
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotScript
 import godot.global.GD
 
-@RegisterClass
+@GodotScript
 class Simple: Node3D() {
 
-    @RegisterFunction
     override fun _ready() {
         GD.print("Hello world!")
     }
 }
 ```
 
-The [classes](../user-guide/classes.md) section covers in details what we did here, but for now `@RegisterClass` will register the class to Godot. Now we can trigger a build.
+The [classes](../user-guide/classes.md) section covers in details what we did here, but for now `@GodotScript` will register the class to Godot. Now we can trigger a build.
 
 ```shell
 ./gradlew build
diff --git a/docs/src/doc/index.md b/docs/src/doc/index.md
index 405986f440..f26369a6e0 100644
--- a/docs/src/doc/index.md
+++ b/docs/src/doc/index.md
@@ -37,7 +37,7 @@ Also consider the [API Differences](user-guide/api-differences.md) section for g
 and limitations which will not be or cannot be adressed in the near forseable future or ever.
 
 - Each registered constructor must have a unique number of arguments, constructor overloading is not yet supported.
-- No tool mode (you can set it already in the `@RegisterClass` annotation but it has no effect yet).
+- No tool mode (you can already use the `@Tool` annotation, but it has no effect yet).
 - No addon support, you cannot use Godot Kotlin/JVM to write plugins and addons yet (you can however [write libraries](develop-libraries/introduction.md) with godot specific code).
 - Web is currently not supported. See [Supported platforms](#supported-platforms) to see what platforms we currently support
 
diff --git a/docs/src/doc/user-guide/advanced/abstract-classes.md b/docs/src/doc/user-guide/advanced/abstract-classes.md
index 16fa2c276a..ececd06b02 100644
--- a/docs/src/doc/user-guide/advanced/abstract-classes.md
+++ b/docs/src/doc/user-guide/advanced/abstract-classes.md
@@ -7,7 +7,7 @@ You can define a abstract class and register it's members the same way as you do
 Under the hood, we only register your normal classes, and let them register all members your abstract class defines.
 
 !!! info
-    For this reason, the `@RegisterClass` annotation is optional for abstract classes.
+    For this reason, the `@GodotScript` annotation is optional for abstract classes.
 
 !!! warning
     As in Kotlin, you cannot instantiate abstract classes directly from any other scripting language like GDScript! In fact, godot does not even know (or care) that your abstract class exists.
@@ -17,22 +17,20 @@ Under the hood, we only register your normal classes, and let them register all
 Abstract class definition:
 
 ```kotlin
-// register class annotation is optional for abstract classes
+// @GodotScript annotation is optional for abstract classes
 abstract class AbstractClassInheritanceParent: Node() {
 
     @Export
-    @RegisterProperty
     var registeredExportedPropertyInAbstractClass = false
 
-    @RegisterSignal
     val signalInAbstractClass by signal<String>("blubb")
 
-    @RegisterFunction
+    @GodotMember
     fun functionInAbstractClassWithDefaultImplementation() {
         // some implementation
     }
 
-    @RegisterFunction
+    @GodotMember
     abstract fun abstractFunction()
 }
 ```
@@ -40,14 +38,11 @@ abstract class AbstractClassInheritanceParent: Node() {
 Child class definition:
 
 ```kotlin
-@RegisterClass
+@GodotScript
 class AbstractClassInheritanceChild: AbstractClassInheritanceParent() {
-    @RegisterFunction
+    // registered automatically as the abstract class already defines the annotation
     override fun abstractFunction() {
         // some implementation
     }
 }
 ```
-
-!!! warning "Registration of overridden members"
-    As you can see in the example; you need to explicitly register any member in the child class which you override from the abstract parent class. Otherwise they will not be registered and thus are not known to godot.
\ No newline at end of file
diff --git a/docs/src/doc/user-guide/api-differences.md b/docs/src/doc/user-guide/api-differences.md
index c3147f20b7..644b7e7e33 100644
--- a/docs/src/doc/user-guide/api-differences.md
+++ b/docs/src/doc/user-guide/api-differences.md
@@ -152,12 +152,11 @@ You can implement [_notification](https://docs.godotengine.org/en/stable/classes
 and have class hierarchy notification call without using `super` call, as in GDScript and C++. However, the syntax is a bit different:
 
 ```kotlin
-@RegisterFunction
 override fun _notification() = godotNotification {
   // ...
 }
 ```  
-Currently this feature except abstract classes.  
+Currently, this feature does not work for abstract classes.  
 
 ## StringName and NodePath
 
diff --git a/docs/src/doc/user-guide/classes.md b/docs/src/doc/user-guide/classes.md
index 9d2d393387..08b78ea0a4 100644
--- a/docs/src/doc/user-guide/classes.md
+++ b/docs/src/doc/user-guide/classes.md
@@ -1,7 +1,7 @@
-To expose a class written in Kotlin it needs to extend `godot.Object` (or any of its subtype) and must be annotated with `@RegisterClass`.
+To expose a class written in Kotlin it needs to extend `godot.Object` (or any of its subtype) and must be annotated with `@GodotScript`.
 
 ```kt
-@RegisterClass
+@GodotScript
 class RotatingCube: Node3D() {
     // ...
 }
@@ -13,7 +13,7 @@ Each registered classes will generate its own .gdj files. For more information,
 
 Classes need to be registered with a unique name as Godot does not support namespaces (or packages in this case) for script classes.
 
-By default, we register your classes with the name you give them. While beign a simple approach and enough in most cases,
+By default, we register your classes with the name you give them. While being a simple approach and enough in most cases,
 this can lead to naming conflicts if you have classes in different packages with the same name. For example:
 
 - `com.package.a.MyClass`
@@ -25,7 +25,7 @@ So you are responsible for making sure that classes have a unique name.
 We do however provide you with some assistance:
 
 - We have compile time checks in place which should let the *build fail* if classes would end up having the same name.
-- The `@RegisterClass` annotation lets you define a custom registration name: `@RegisterClass("CustomRegistrationName")`.
+- The `@GodotScript` annotation lets you define a custom registration name: `@GodotScript("CustomRegistrationName")`.
 - Register the class names with the fully qualified name: `com.mygame.MyClass` will be registered as: `com_mygame_MyClass`. This can be configured with:
     ```kotlin
     godot {
@@ -93,7 +93,7 @@ If you want to be notified when initialization and destruction of your class' in
 and override the `_onDestroy` function respectively.
 
 ```kt
-@RegisterClass
+@GodotScript
 class RotatingCube: Node3D() {
     init {
         println("Initializing RotatingCube!")
@@ -110,7 +110,6 @@ class RotatingCube: Node3D() {
 Checking if an object is an instance of a particular type can be done via the `is` operator.
 
 ```kt
-@RegisterFunction
 override fun _ready() {
     val parent = getParent()
     if (parent is CollisionShape) {
@@ -128,7 +127,6 @@ This also works for any type you define.
     If you are sure that an object is always an instance of some type, then you can take advantage of Kotlin's [contracts](https://kotlinlang.org/docs/reference/whatsnew13.html#contracts) feature. This allows you to avoid having nested `if`s.
 
     ```kt
-    @RegisterFunction
     override fun _ready() {
         val parent = getParent()
         require(parent is CollisionShape)
@@ -140,7 +138,7 @@ This also works for any type you define.
 ## Constructors
 
 Godot requires you to have a default constructor on your classes.
-You can define additional constructors but you have to register them by annothing them with `@RegisterConstructor`.
+You can define additional constructors, but you have to register them by annotating them with `@GodotMember`.
 Default constructors, on the other hand, are always registered automatically.
 
 Constructors can also have **a maximum of 8 arguments** and must have a unique argument count as constructor overloading is not yet supported.
@@ -148,7 +146,7 @@ This limitation is only for registered constructors.
 
 ### Instantiate Kotlin script classes in GDScript
 
-From GDScript it is possible to create an instance of a Kotlin class using the default constructor:
+From GDScript, it is possible to create an instance of a Kotlin class using the default constructor:
 
 ```kt
 var instance := YourKotlinClass.new()
@@ -161,24 +159,24 @@ var instance := load("res://gdj/YourClass.gdj").new(oneArg, anotherArg)
 ```
 
 !!! info
-    The limitation of max 16 arguments for constructors is arbitrary. We decided to introduce this limitation to prevent performance bottlenecks for creating objects as each argument passed to a constructor needs to be unpacked by the binding. The more arguments, the more unpacking is needed which means more overhead.
+    The limitation of max 8 arguments for constructors is arbitrary. We decided to introduce this limitation to prevent performance bottlenecks for creating objects as each argument passed to a constructor needs to be unpacked by the binding. The more arguments, the more unpacking is needed which means more overhead.
 
 
 ## Customization
 
 You can customize to some extent how your class should be registered in Godot.
 
-The `@RegisterClass` annotation takes only one argument:
+The `@GodotScript` annotation takes only one argument:
 
-- **className**: If set, the class will be registered with the provided name.
+- **customName**: If set, the class will be registered with the provided name.
 
 !!! warning "Unique class names"
-    If you specify the `className` in the annotation, you have to make sure that this name is unique! We implemented compilation checks to make sure the compilation fails if more than two classes are registered with the same name, but we cannot check class names from other scripting languages like GDScript or C#! It is also recommended installing our intellij plugin as it shows duplicated registered class names in the editor as an error.
+    If you specify the `customName` in the annotation, you have to make sure that this name is unique! We implemented compilation checks to make sure the compilation fails if more than two classes are registered with the same name, but we cannot check class names from other scripting languages like GDScript or C#! It is also recommended installing our intellij plugin as it shows duplicated registered class names in the editor as an error.
 
 
 ## Tool Mode
 
-Annotate your class with `@Tool` to make it a tool class (note that `@RegisterClass` is required for this annotation to take effect).
+Annotate your class with `@Tool` to make it a tool class.
 
 !!! Caution
     This is currently not implemented.
\ No newline at end of file
diff --git a/docs/src/doc/user-guide/functions.md b/docs/src/doc/user-guide/functions.md
index aa5e8c4a04..3104510075 100644
--- a/docs/src/doc/user-guide/functions.md
+++ b/docs/src/doc/user-guide/functions.md
@@ -1,12 +1,12 @@
 Any Kotlin function can be registered as long as its parameters and return type can be converted to a `Variant`.
-To register a function annotate it with `@RegisterFunction`.
+To register a function annotate it with `@GodotMember`.
 
 ```kotlin
-@RegisterClass
+@GodotScript
 class RotatingCube: Node3D() {
-    @RegisterFunction
-    override fun _ready() {
-        println("I am ready!")
+    @GodotMember
+    fun myFunction() {
+        println("Hello")
     }
 }
 ```
@@ -21,17 +21,11 @@ Therefore, a function called `doSomething()` in Kotlin is usable in GDScript as
 
 Virtual functions (like `_ready`, `_process` and `_physics_process`) are declared as overridable functions.
 The default implementation throws a `NotImplementedException`, so you have to override it if you plan to expose
-a virtual function to Godot. Remember, just overriding is not enough to use that function - you have to explicitly
-register it as well with `@RegisterFunction`.
+a virtual function to Godot. Virtual functions are registered automatically and do not require an explicit `@GodotMember`
+annotation.
 
 ## Arguments count
 
 Godot limits the allowed argument count of functions to `16`. Thus, this binding also has this limitation.
 If you want to pass more than 16 parameters in a function, you need to wrap them in a container
 (like a custom container class or a `VariantArray` or `Dictionary`).
-
-## Customization
-
-You can customize to some extent how your functions should be registered in Godot. The `@RegisterFunction` annotation takes one argument:
-
-- **rpcMode**: Default: `RPCMode.DISABLED`
diff --git a/docs/src/doc/user-guide/properties.md b/docs/src/doc/user-guide/properties.md
index 701221ab6a..37961acbf2 100644
--- a/docs/src/doc/user-guide/properties.md
+++ b/docs/src/doc/user-guide/properties.md
@@ -1,13 +1,13 @@
 Any property of a registered class can be registered as long as it is public, mutable and can be converted to a `Variant`.
-To register a property annotate it with `@RegisterProperty`.
+To register a property annotate it with `@GodotMember`.
 
 ```kotlin
-@RegisterClass
+@GodotScript
 class RotatingCube: Node3D() {
-    @RegisterProperty
+    @GodotMember
     var someString: String = "Hello there :-)"
 
-    @RegisterProperty
+    @GodotMember
     var propertyWithDefaultValue: Float = 2f
 }
 ```
@@ -19,24 +19,22 @@ your properties are actually registered as `snake_case`. So a property `someFlag
 
 ## Core type specifics
 
-Godot core type always need to have a value. Hence you cannot register properties of core types (like `Vector3`) with lateinit.
+Godot core type always need to have a value. Hence, you cannot register properties of core types (like `Vector3`) with lateinit.
 
 ## Exporting properties
 
-A registered property can be exported (a.k.a make it visible in the Godot editor) by annotating it with `@Export`.
+A property can be exported (a.k.a. make it visible in the Godot editor) by annotating it with `@Export`.
 A property can be exported if it is a core type, a primitive or inherits from `godot.RefCounted`.
 
 ```kotlin
-@RegisterClass
+@GodotMember
 class RotatingCube: Node3D() {
     @Export
-    @RegisterProperty
     var speed: Float = 2f
 }
 ```
 
 Exported properties can have default values (`2f` in the example above) which will be used as a default value by the `inspector`.
-A default value can **only** contain compile time constants and only references to compile time constants.
 
 !!! danger
     If you set a default value in code and a different value in the `inspector` the value of the latter will override the value in code after `init` and before `_enter_tree`.
@@ -44,7 +42,7 @@ A default value can **only** contain compile time constants and only references
 ## Type hint registration
 
 This module provides a plethora of annotations for defining property type hints.
-These annotations controls how Godot display the property in the inspector.
+These annotations control how Godot display the property in the inspector.
 Each property hint annotation can only be added to certain types of properties.
 Using the wrong annotation will make the compilation fail. These will only take effect if the property is exported.
 
diff --git a/docs/src/doc/user-guide/signals_and_callables.md b/docs/src/doc/user-guide/signals_and_callables.md
index e4e65809d1..2af3ad1e50 100644
--- a/docs/src/doc/user-guide/signals_and_callables.md
+++ b/docs/src/doc/user-guide/signals_and_callables.md
@@ -14,12 +14,10 @@ In both case, you have to provide the name of the signal parameters as strings f
 
 /// tab | Kotlin
 ```kotlin
-@RegisterClass
+@GodotScript
 class MyScript: Node() {
-    @RegisterSignal
     val mySignal by signal1<Boolean>("reverse")
     
-    @RegisterSignal
     val mySignal = Signal1<Boolean>("mySignal", "reverse")
 }
 ```
@@ -27,9 +25,8 @@ class MyScript: Node() {
 
 /// tab | Java
 ```java
-@RegisterClass
+@GodotScript
 public MyScript extends Node {
-    @RegisterSignal
     public Signal1<Boolean> mySignal = Signal1.create(this, "mySignal", "reverse"); // Only one way to do it in Java.
 }
 ```
@@ -90,17 +87,16 @@ Note that the connected method has to be a registered to Godot.
 
 /// tab | Kotlin
 ```kotlin
-@RegisterClass
+@GodotScript
 class SomeObject: Object() {
-    @RegisterFunction
+    @GodotMember
     fun onReverseChanged(reverse: Boolean) {
         println("Value of reverse has changed: $reverse")
     }
 }
 
-@RegisterClass
+@GodotScript
 class AnotherObject: Object() { 
-    @RegisterSignal
     val mySignal by signal1<Boolean>("reverse")
     
     private val targetObject = SomeObject()
@@ -118,17 +114,16 @@ class AnotherObject: Object() {
 
 /// tab | Java
 ```java
-@RegisterClass
+@GodotScript
 public class SomeObject extends Object {
-    @RegisterFunction
+    @GodotMember
     public void onReverseChanged(boolean reverse) {
         System.out.println("Value of reverse has changed: " + reverse);
     }
 }
 
-@RegisterClass
+@GodotScript
 public class AnotherObject extends Object {
-    @RegisterSignal
     public Signal1<Boolean> mySignal = Signal1.create(this, "mySignal", "reverse");
 
     private SomeObject targetObject = new SomeObject();
diff --git a/harness/benchmarks/src/main/kotlin/godot/benchmark/Memory.kt b/harness/benchmarks/src/main/kotlin/godot/benchmark/Memory.kt
index 17ff83091c..2ca82d8146 100644
--- a/harness/benchmarks/src/main/kotlin/godot/benchmark/Memory.kt
+++ b/harness/benchmarks/src/main/kotlin/godot/benchmark/Memory.kt
@@ -3,12 +3,12 @@ package godot.benchmark
 import godot.Node
 import godot.Object
 import godot.RefCounted
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotScript
+import godot.annotation.GodotMember
 import godot.core.RID
 import godot.core.VariantArray
 
-@RegisterClass
+@GodotScript
 class Memory : Object() {
 
     private val objs = VariantArray<Node>()
@@ -33,7 +33,7 @@ class Memory : Object() {
         cores.clear()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkAccessObj() {
         var obj: Node
         for (i in 0 until accessSize) {
@@ -41,7 +41,7 @@ class Memory : Object() {
         }
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkAccessRef() {
         var ref: RefCounted
         for (i in 0 until accessSize) {
@@ -49,7 +49,7 @@ class Memory : Object() {
         }
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkAccessCore() {
         var core: RID
         for (i in 0 until accessSize) {
@@ -57,7 +57,7 @@ class Memory : Object() {
         }
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkStressObject() {
         var obj: Node
         for (i in 0 until stressSize) {
@@ -66,7 +66,7 @@ class Memory : Object() {
         }
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkStressReference() {
         var ref: RefCounted
         for (i in 0 until stressSize) {
@@ -74,7 +74,7 @@ class Memory : Object() {
         }
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkStressCore() {
         var core: RID?
         for (i in 0 until stressSize) {
@@ -82,7 +82,7 @@ class Memory : Object() {
         }
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkStressZMix() {
         var core: RID?
         var obj: Node
diff --git a/harness/benchmarks/src/main/kotlin/godot/benchmark/Simple.kt b/harness/benchmarks/src/main/kotlin/godot/benchmark/Simple.kt
index 8de6f70387..a25d283b11 100644
--- a/harness/benchmarks/src/main/kotlin/godot/benchmark/Simple.kt
+++ b/harness/benchmarks/src/main/kotlin/godot/benchmark/Simple.kt
@@ -2,23 +2,23 @@ package godot.benchmark
 
 import godot.Node
 import godot.Object
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotScript
+import godot.annotation.GodotMember
 import godot.core.Transform3D
 import godot.core.Vector2
 import godot.core.Vector3
 
-@RegisterClass
+@GodotScript
 class Simple : Object() {
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkSimpleAdd(): Int {
         val a = 1
         val b = 2
         return a + b
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkAvg(): Int {
         val size = 10000
         var total = 0
@@ -28,7 +28,7 @@ class Simple : Object() {
         return total / size
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkVectors(): Vector3 {
         var b = Transform3D()
         b = b.rotated(Vector3.UP, Math.toRadians(60.0))
@@ -44,7 +44,7 @@ class Simple : Object() {
         return s
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkVectors2Only(): Vector2 {
         var s = Vector2()
         for(i in 0 until 1000) {
@@ -55,14 +55,14 @@ class Simple : Object() {
         return s
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkIcall() {
         val node = Node()
         node.getInstanceId()
         node.free()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkIcallWithLoop() {
         val node = Node()
         for (i in 0 until 100) {
@@ -74,7 +74,7 @@ class Simple : Object() {
         node.free()
     }
 
-    @RegisterFunction
+    @GodotMember
     fun benchmarkMethodCall() {
     }
 }
diff --git a/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt b/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt
index f7b0ee0609..1f03f13e3c 100644
--- a/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt
+++ b/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt
@@ -11,7 +11,6 @@ class CoreTypePropertyChecks: Node() {
 
     // not allowed
 //    @Export
-//    @RegisterProperty
 //    lateinit var exportedLateinitCoreType: Vector3
 
     // allowed
@@ -19,7 +18,7 @@ class CoreTypePropertyChecks: Node() {
     var exportedNormalCoreType: Vector3 = Vector3.ZERO
 
     // not allowed
-//    @RegisterProperty
+//    @GodotMember
 //    lateinit var lateinitCoreType: Vector3
 
     // allowed
diff --git a/harness/tests/src/main/java/godot/tests/JavaTestClass.java b/harness/tests/src/main/java/godot/tests/JavaTestClass.java
index 5ddf4511b2..96dca070c3 100644
--- a/harness/tests/src/main/java/godot/tests/JavaTestClass.java
+++ b/harness/tests/src/main/java/godot/tests/JavaTestClass.java
@@ -17,7 +17,6 @@ public class JavaTestClass extends Node {
     public Signal2<String, String> testSignal2 = Signal2.create(this, "test_signal_2", "param1", "param2");
 
     // The following should NOT work as we cannot extract parameter names. The compiler checks should catch that and throw a build error
-//    @RegisterSignal
 //    public Signal testSignal3 = new Signal2<>(this, "name");
 
     @Export
diff --git a/harness/tests/src/main/kotlin/godot/tests/Invocation.kt b/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
index 5b14bc6746..45be0b949c 100644
--- a/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
@@ -64,14 +64,12 @@ class Invocation : Node3D() {
 
     // Can't export nullable coretypes
     //@Export
-    //@RegisterProperty
     //var nullableLong: Long? = null
 
     private var hasInitializedLateInits = false
 
     // Can't export nullable coretypes
     //@Export
-    //@RegisterProperty
     //var lateinitString: String? = null
 
     @GodotMember
@@ -383,7 +381,7 @@ class Invocation : Node3D() {
     }
 
 //	TODO: This will fail to register as we cannot register nullable return type
-//	@RegisterFunction
+//	@GodotMember
 //	fun getFromStringNavMeshNullableDict(key: String) = nullableDictionary[key]
 
     @GodotMember
@@ -402,7 +400,7 @@ class Invocation : Node3D() {
     fun removeNullableNavMeshWithIndex(index: Int) = nullableArray.removeAt(index)
 
 //	TODO: This will fail to register as we cannot register nullable return type
-//	@RegisterFunction
+//	@GodotMember
 //	fun getNullableNavMeshFromArray(index: Int) = nullableArray[index]
 
     @GodotMember
diff --git a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/GodotExtension.kt b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/GodotExtension.kt
index 56679b5440..41e7e94e59 100644
--- a/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/GodotExtension.kt
+++ b/kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/GodotExtension.kt
@@ -47,7 +47,7 @@ open class GodotExtension(objects: ObjectFactory) {
     /**
      * Defines whether classes should be registered with the full fqName or just with their simple name. Defaults to false
      *
-     * **Note:** the custom class name in the `@RegisterClass` annotation takes precedence over this property!
+     * **Note:** the custom class name in the `@GodotScript` annotation takes precedence over this property!
      *
      * Examples:
      *
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/signal/RegisterSignalAnnotator.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/signal/RegisterSignalAnnotator.kt
index 19473f7012..f1f03839d4 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/signal/RegisterSignalAnnotator.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/signal/RegisterSignalAnnotator.kt
@@ -29,7 +29,6 @@ class RegisterSignalAnnotator : Annotator {
         if (element is KtProperty && element.isSignal()) {
             checkNotGeneric(element.toLightElements().firstIsInstance(), holder)
             checkMutability(element, holder)
-            checkRegisteredType(element, holder)
         }
     }
 
@@ -44,17 +43,6 @@ class RegisterSignalAnnotator : Annotator {
         }
     }
 
-    private fun checkRegisteredType(ktProperty: KtProperty, holder: AnnotationHolder) {
-        val type = ktProperty.type() ?: return
-        if (!type.getKotlinTypeFqName(false).startsWith("$godotCorePackage.${GodotKotlinJvmTypes.signal}")) {
-            holder.registerProblem(
-                message = GodotPluginBundle.message("problem.signal.wrongType"),
-                errorLocation = getInitializerProblemLocation(ktProperty),
-                quickFixes = arrayOf(useDelegateQuickFix)
-            )
-        }
-    }
-
     private fun getInitializerProblemLocation(ktProperty: KtProperty) = ktProperty
         .initializer
         ?.psiOrParent
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktClassExtensions.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktClassExtensions.kt
index fb4aef7bc3..76af71da26 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktClassExtensions.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/ktClassExtensions.kt
@@ -12,9 +12,9 @@ import org.jetbrains.kotlin.util.prefixIfNot
 import org.jetbrains.kotlin.util.suffixIfNot
 
 /**
- * Gets custom name defined in `@RegisterClass` annotation if defined, fqName or simple name otherwise
+ * Gets custom name defined in `@GodotScript` annotation if defined, fqName or simple name otherwise
  *
- * @return fqName to registered class name or `null` if not annotated with `@RegisterClass`
+ * @return fqName to registered class name or `null` if not annotated with `@GodotScript`
  */
 fun KtClass.getRegisteredClassName(): Pair<String, String>? = this.toLightClass()?.getRegisteredClassName()
 
diff --git a/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties b/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
index 2b7e812313..1317e7eead 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
+++ b/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
@@ -46,7 +46,6 @@ problem.property.registeredEnumListWithVariantArray=Enum lists can only be regis
 problem.property.lateinit.coreType=Registered property with godot core type cannot be lateinit. Assign a default value
 problem.property.nullable=Registered property which is a Kotlin/Java primitive or Godot core type cannot be nullable. Assign a default value
 problem.signal.mutability=Registered signals have to be immutable
-problem.signal.wrongType=Not of type signal. Properties annotated with @RegisterSignal have to be of type signal. Consider using one of the "by signal" delegates
 problem.signal.connection.connectedFunctionNotRegistered=Function not registered. Functions used as target for signal emission have to be registered
 problem.rpc.calledFunctionNotRegistered=Function not registered. Functions called by rpc have to be registered
 problem.rpc.calledFunctionHasNoRpcAnnotation=Function has no Rpc Annotation. Functions called by rpc have to be configured
@@ -58,23 +57,23 @@ For more information, visit the documentation.\
 This warning is experimental! If you encounter any false positives, please write an issue with a minimal reproduction project.
 quickFix.class.alreadyRegistered.familyName=Show classes registered with same name
 quickFix.class.alreadyRegistered.popup.title=Jump to class
-quickFix.class.notRegistered.familyName=Add @RegisterClass annotation
-quickFix.property.notRegistered.familyName=Add @RegisterProperty annotation
+quickFix.class.notRegistered.familyName=Add @GodotScript annotation
+quickFix.property.notRegistered.familyName=Add @GodotMember annotation
 quickFix.property.notExported.familyName=Add @Export annotation
 quickFix.property.removeExportAnnotation.familyName=Remove @Export annotation
-quickFix.function.notificationFunctionNotRegistered.familyName=Add @RegisterFunction annotation
+quickFix.function.notificationFunctionNotRegistered.familyName=Add @GodotMember annotation
 quickFix.function.rpcTransferModeIgnoresChannel.familyName=Remove channel parameter
-quickFix.function.connectedFunctionNotRegistered.familyName=Add @RegisterFunction annotation
+quickFix.function.connectedFunctionNotRegistered.familyName=Add @GodotMember annotation
 quickFix.function.connectedFunctionHasNoRpcAnnotationRegistered.familyName=Add @Rpc annotation
 quickFix.function.connectedFunctionsRpcAnnotationHasRpcModeDisabled.familyName=Remove RpcMode.DISABLED from target's @Rpc annotation
-quickFix.property.connectedPropertyNotRegistered.familyName=Add @RegisterProperty annotation
+quickFix.property.connectedPropertyNotRegistered.familyName=Add @GodotMember annotation
 quickFix.property.mutability.familyName=Make property mutable
-notification.property.mutability.error.title=@RegisterProperty Quick Fix
+notification.property.mutability.error.title=Property Quick Fix
 notification.property.mutability.error.content=Could not change the mutability of property {0}. Change it manually
 notification.group.error=Error message
 quickFix.signal.initializer.familyName=Use "by signal" delegate
 quickFix.signal.mutability.familyName=Make signal immutable
-notification.signal.mutability.error.title=@RegisterSignal Quick Fix
+notification.signal.mutability.error.title=Signal Quick Fix
 notification.signal.mutability.error.content=Could not change the mutability of signal {0}. Change it manually
 linemarker.registeredName.tooltip=Registered as {0}\nClick to copy registered name
 linemarker.registeredName.notRegisteredBecauseIsAbstract.text=Will not be registered, as it's abstract. Members are registered through inheriting classes
diff --git a/kt/plugins/godot-intellij-plugin/src/main/resources/template/Simple.kt.intellij_template b/kt/plugins/godot-intellij-plugin/src/main/resources/template/Simple.kt.intellij_template
index c0e163b84d..7c8952c420 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/resources/template/Simple.kt.intellij_template
+++ b/kt/plugins/godot-intellij-plugin/src/main/resources/template/Simple.kt.intellij_template
@@ -1,14 +1,12 @@
 package GROUP_ID.ARTEFACT_ID
 
 import godot.Node3D
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
+import godot.annotation.GodotScript
 import godot.global.GD
 
-@RegisterClass
+@GodotScript
 class Simple: Node3D() {
 
-    @RegisterFunction
     override fun _ready() {
         GD.print("Hello world!")
     }
diff --git a/kt/plugins/godot-intellij-plugin/src/main/resources/template/src/main/kotlin/godot/HelloGodot.kt.godot_template b/kt/plugins/godot-intellij-plugin/src/main/resources/template/src/main/kotlin/godot/HelloGodot.kt.godot_template
index 24042e984b..e05e50afc5 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/resources/template/src/main/kotlin/godot/HelloGodot.kt.godot_template
+++ b/kt/plugins/godot-intellij-plugin/src/main/resources/template/src/main/kotlin/godot/HelloGodot.kt.godot_template
@@ -1,19 +1,15 @@
 package godot
 
 import godot.annotation.Export
-import godot.annotation.RegisterClass
-import godot.annotation.RegisterFunction
-import godot.annotation.RegisterProperty
+import godot.annotation.GodotScript
 import godot.global.GD
 
-@RegisterClass
+@GodotScript
 class HelloWorld : Node() {
 
     @Export
-    @RegisterProperty
     var helloString =  "Godot"
 
-    @RegisterFunction
     override fun _ready() {
         GD.print("Hello $helloString !")
     }
diff --git a/src/language/java_language.cpp b/src/language/java_language.cpp
index b6315ba469..08419829d1 100644
--- a/src/language/java_language.cpp
+++ b/src/language/java_language.cpp
@@ -9,10 +9,9 @@ constexpr const char* JAVA_TEMPLATE = PACKAGE_TEMPLATE
   "\n"
   "\n"
   "import " GODOT_KOTLIN_PACKAGE "." BASE_TEMPLATE ";\n"
-  "import godot.annotation.RegisterClass;\n"
-  "import godot.annotation.RegisterFunction;\n"
+  "import godot.annotation.GodotScript;\n"
   "\n"
-  "@RegisterClass\n"
+  "@GodotScript\n"
   "public class " CLASS_TEMPLATE " extends " BASE_TEMPLATE " {\n"
   "\n"
   "    // Declare member variables here. Examples:\n"
@@ -20,14 +19,12 @@ constexpr const char* JAVA_TEMPLATE = PACKAGE_TEMPLATE
   "    // private String b = \"text\";\n"
   "\n"
   "    // Called when the node enters the scene tree for the first time.\n"
-  "    @RegisterFunction\n"
   "    @Override\n"
   "    public void _ready() {\n"
   "        \n"
   "    }\n"
   "\n"
   "    // Called every frame. 'delta' is the elapsed time since the previous frame.\n"
-  "    @RegisterFunction\n"
   "    @Override\n"
   "    public void _process(double delta) {\n"
   "        \n"
diff --git a/src/language/kotlin_language.cpp b/src/language/kotlin_language.cpp
index ce7e886e4e..e088564fd4 100644
--- a/src/language/kotlin_language.cpp
+++ b/src/language/kotlin_language.cpp
@@ -9,10 +9,9 @@ constexpr const char* KOTLIN_TEMPLATE = PACKAGE_TEMPLATE
   "\n"
   "\n"
   "import " GODOT_KOTLIN_PACKAGE "." BASE_TEMPLATE "\n"
-  "import godot.annotation.RegisterClass\n"
-  "import godot.annotation.RegisterFunction\n"
+  "import godot.annotation.GodotScript\n"
   "\n"
-  "@RegisterClass\n"
+  "@GodotScript\n"
   "class " CLASS_TEMPLATE ": " BASE_TEMPLATE "() {\n"
   "\n"
   "    // Declare member variables here. Examples:\n"
@@ -20,13 +19,11 @@ constexpr const char* KOTLIN_TEMPLATE = PACKAGE_TEMPLATE
   "    // val b = \"text\"\n"
   "\n"
   "    // Called when the node enters the scene tree for the first time.\n"
-  "    @RegisterFunction\n"
   "    override fun _ready() {\n"
   "        \n"
   "    }\n"
   "\n"
   "    // Called every frame. 'delta' is the elapsed time since the previous frame.\n"
-  "    @RegisterFunction\n"
   "    override fun _process(delta: Double) {\n"
   "        \n"
   "    }\n"

From 02da47d076f14ac7fadde92f0c880e75e5a08bc3 Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Mon, 14 Oct 2024 09:28:51 +0200
Subject: [PATCH 16/18] Delete todo

---
 TODO.md | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 TODO.md

diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index b01b164c4a..0000000000
--- a/TODO.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Annotations rework
-
-Replace existing annotations with:
-- `GodotScript` -> classes
-- `GodotMember` -> functions, properties (also allow signals but not relevant for them)
-
-Add meta annotation to api signals and overridable api functions: `GodotApiMember`.
-
-# New processing logic
-## Properties
-1. Collect all properties from hierarchy
-2. Filter by existence of `GodotMember` annotation
-
-## Functions
-1. Collect all functions from hierarchy
-2. Filter by existence of `GodotMember` annotation or override function which has the annotation `GodotApiMember`
-
-## Signals
-1. Collect all properties from hierarchy
-2. Filter by type signal
-3. Filter not has annotation `GodotApiMember`
-

From fa83ff9b5e0f49b0a36409924902e1b14f26caba Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Mon, 14 Oct 2024 09:39:30 +0200
Subject: [PATCH 17/18] Update documentation

---
 .../processor/visitor/RegistrationAnnotationVisitor.kt          | 2 +-
 kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt       | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt
index 51a73d2e54..73c1a7dbc0 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt
@@ -13,7 +13,7 @@ import godot.entrygenerator.model.RegisteredClass
 import godot.entrygenerator.model.SourceFile
 
 /**
- * Collects [GodotScript], [RegisterConstructor], [GodotMember], [RegisterProperty], [RegisterSignal] annotations
+ * Collects [GodotScript], [GodotMember] annotations
  * for registrar generation and entry generation
  */
 internal class RegistrationAnnotationVisitor(
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt b/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt
index 2fa7c784d0..270046d51d 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/Tool.kt
@@ -3,8 +3,6 @@ package godot.annotation
 
 /**
  * Mark a class as tool class.
- *
- * The class needs to have the @[GodotScript] annotation added as well
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)

From 76fe8abf58359ac27e2c4a0676b94fca62f7b783 Mon Sep 17 00:00:00 2001
From: chippmann <cedric.hippmann@hotmail.com>
Date: Sat, 2 Nov 2024 14:22:16 +0300
Subject: [PATCH 18/18] Update annotation from @GodotMember to @Member, fix
 supertype metadata including interfaces and fix treating of signals as
 properties when a registration annotation is present

---
 .../godot/tests/library/flattened/Simple.kt   |   4 +-
 .../godot/tests/library/fqname/Simple.kt      |   4 +-
 .../tests/library/hierarchical/Simple.kt      |   4 +-
 .../otherSourceDir/CoreTypePropertyChecks.kt  |   6 +-
 .../otherSourceDir/ScriptInOtherSourceDir.kt  |   4 +-
 .../main/java/godot/tests/JavaTestClass.java  |  14 +-
 .../godot/tests/CoreTypesIdentityTest.kt      |  42 ++--
 .../main/kotlin/godot/tests/FuncRefTest.kt    |  28 +--
 .../src/main/kotlin/godot/tests/Invocation.kt | 194 +++++++++---------
 .../kotlin/godot/tests/LambdaCallableTest.kt  |  20 +-
 .../godot/tests/MultiArgsConstructorTest.kt   |  24 +--
 .../tests/args/ConstructorArgSizeTest.kt      |  20 +-
 .../godot/tests/args/FunctionArgSizeTest.kt   |  36 ++--
 .../kotlin/godot/tests/binding/BindingTest.kt |   4 +-
 .../tests/callable/CallableMethodBindTest.kt  |  14 +-
 .../ConstructorRegistrationTest.kt            |   4 +-
 .../kotlin/godot/tests/coretypes/BasisTest.kt |  12 +-
 .../godot/tests/coretypes/StringTest.kt       |  20 +-
 .../godot/tests/coretypes/Vector3Test.kt      |   6 +-
 .../godot/tests/coroutine/CoroutineTest.kt    |  22 +-
 .../godot/tests/exception/ExceptionTest.kt    |   4 +-
 .../FreeformRegistrationFileTestClass.kt      |   4 +-
 .../AbstractClassInheritanceChild.kt          |   6 +-
 .../AbstractClassInheritanceParent.kt         |  12 +-
 .../inheritance/ClassInheritanceChild.kt      |   6 +-
 .../inheritance/ClassInheritanceParent.kt     |  16 +-
 .../tests/packedarray/PackedArrayTest.kt      |  22 +-
 .../tests/reflection/BaseReflectionTest.kt    |   4 +-
 .../tests/reflection/GH571_ReflectionTest.kt  |   4 +-
 .../kotlin/godot/tests/rpctests/RpcTests.kt   |   6 +-
 .../kotlin/godot/tests/signal/SignalTest.kt   |  10 +-
 .../godot/tests/static/CallStaticTest.kt      |   4 +-
 .../godot/tests/subpackage/OtherScript.kt     |   8 +-
 .../model/GodotMemberAnnotation.kt            |   2 +-
 .../processor/ext/ksAnnotatedExt.kt           |   4 +-
 .../processor/ext/ksAnnotationExt.kt          |  36 ++--
 .../processor/ext/ksClassDeclarationExt.kt    |  34 +--
 .../visitor/RegistrationAnnotationVisitor.kt  |   4 +-
 .../main/kotlin/godot/annotation/Export.kt    |   2 +-
 .../annotation/{GodotMember.kt => Member.kt}  |   2 +-
 .../src/main/kotlin/godot/annotation/Rpc.kt   |   2 +-
 .../main/kotlin/godot/gen/godot/RefCounted.kt |   6 -
 .../intellij/plugin/data/model/annotations.kt |   2 +-
 .../plugin/extension/psiElementExt.kt         |   4 +-
 .../messages/generalLabels.properties         |   8 +-
 .../godot/tools/common/constants/Classes.kt   |   2 +-
 46 files changed, 348 insertions(+), 348 deletions(-)
 rename kt/godot-library/src/main/kotlin/godot/annotation/{GodotMember.kt => Member.kt} (94%)

diff --git a/harness/flattened-library-tests/src/main/kotlin/godot/tests/library/flattened/Simple.kt b/harness/flattened-library-tests/src/main/kotlin/godot/tests/library/flattened/Simple.kt
index f4868950b4..c905ae2cef 100644
--- a/harness/flattened-library-tests/src/main/kotlin/godot/tests/library/flattened/Simple.kt
+++ b/harness/flattened-library-tests/src/main/kotlin/godot/tests/library/flattened/Simple.kt
@@ -2,7 +2,7 @@ package godot.tests.library.flattened
 
 import godot.Node3D
 import godot.annotation.Export
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 
 @GodotScript
@@ -11,6 +11,6 @@ class Simple: Node3D() {
     @Export
     var testProperty = "Hello from flattened-library-test!"
 
-    @GodotMember
+    @Member
     fun provideGreeting(): String = testProperty
 }
diff --git a/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/Simple.kt b/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/Simple.kt
index 10240ffffa..d1f2544f3d 100644
--- a/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/Simple.kt
+++ b/harness/fqname-library-tests/src/main/kotlin/godot/tests/library/fqname/Simple.kt
@@ -2,7 +2,7 @@ package godot.tests.library.fqname
 
 import godot.Node3D
 import godot.annotation.Export
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 
 @GodotScript
@@ -11,6 +11,6 @@ open class Simple: Node3D() {
     @Export
     var testProperty = "Hello from fqname-library-test!"
 
-    @GodotMember
+    @Member
     fun provideGreeting(): String = testProperty
 }
diff --git a/harness/hierarchical-library-tests/src/main/kotlin/godot/tests/library/hierarchical/Simple.kt b/harness/hierarchical-library-tests/src/main/kotlin/godot/tests/library/hierarchical/Simple.kt
index 2f9760e965..b85e8d1734 100644
--- a/harness/hierarchical-library-tests/src/main/kotlin/godot/tests/library/hierarchical/Simple.kt
+++ b/harness/hierarchical-library-tests/src/main/kotlin/godot/tests/library/hierarchical/Simple.kt
@@ -2,7 +2,7 @@ package godot.tests.library.hierarchical
 
 import godot.Node3D
 import godot.annotation.Export
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 
 @GodotScript
@@ -11,6 +11,6 @@ class Simple: Node3D() {
     @Export
     var testProperty = "Hello from hierarchical-library-test!"
 
-    @GodotMember
+    @Member
     fun provideGreeting(): String = testProperty
 }
diff --git a/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt b/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt
index 1f03f13e3c..b79481cad6 100644
--- a/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt
+++ b/harness/tests/otherSourceDir/CoreTypePropertyChecks.kt
@@ -1,6 +1,6 @@
 import godot.Node
 import godot.annotation.Export
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.Vector3
 
@@ -18,10 +18,10 @@ class CoreTypePropertyChecks: Node() {
     var exportedNormalCoreType: Vector3 = Vector3.ZERO
 
     // not allowed
-//    @GodotMember
+//    @Member
 //    lateinit var lateinitCoreType: Vector3
 
     // allowed
-    @GodotMember
+    @Member
     var normalCoreType: Vector3 = Vector3.ZERO
 }
diff --git a/harness/tests/otherSourceDir/ScriptInOtherSourceDir.kt b/harness/tests/otherSourceDir/ScriptInOtherSourceDir.kt
index ce8bc317e1..174d1080cb 100644
--- a/harness/tests/otherSourceDir/ScriptInOtherSourceDir.kt
+++ b/harness/tests/otherSourceDir/ScriptInOtherSourceDir.kt
@@ -1,10 +1,10 @@
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 
 @GodotScript
 class ScriptInOtherSourceDir: Node() {
 
-	@GodotMember
+	@Member
 	fun greeting() = "HelloWorld"
 }
diff --git a/harness/tests/src/main/java/godot/tests/JavaTestClass.java b/harness/tests/src/main/java/godot/tests/JavaTestClass.java
index 96dca070c3..b113a00e1b 100644
--- a/harness/tests/src/main/java/godot/tests/JavaTestClass.java
+++ b/harness/tests/src/main/java/godot/tests/JavaTestClass.java
@@ -5,7 +5,7 @@
 import godot.RenderingServer;
 import godot.annotation.EnumTypeHint;
 import godot.annotation.Export;
-import godot.annotation.GodotMember;
+import godot.annotation.Member;
 import godot.annotation.GodotScript;
 import godot.core.*;
 import org.jetbrains.annotations.NotNull;
@@ -47,18 +47,18 @@ public class JavaTestClass extends Node {
     @Export
     public Button exportedButton;
 
-    @GodotMember
+    @Member
     public String greeting() {
         return "Hello from java";
     }
 
-    @GodotMember
+    @Member
     public boolean signalEmitted = false;
 
-    @GodotMember
+    @Member
     public VariantArray<Integer> variantArray = new VariantArray<>(Integer.class);
 
-    @GodotMember
+    @Member
     public Dictionary<Float, String> dictionary = new Dictionary<>(Float.class, String.class);
 
     public LambdaCallable<Void> lambdaCallable = LambdaCallable0.create(
@@ -79,7 +79,7 @@ public void _ready() {
         RenderingServer.getDefaultClearColor();
     }
 
-    @GodotMember
+    @Member
     public void connectAndTriggerSignal() {
         connect(
                 StringNames.asStringName("test_signal"),
@@ -100,7 +100,7 @@ public GodotNotification _notification() {
         );
     }
 
-    @GodotMember
+    @Member
     public void signalCallback() {
         signalEmitted = true;
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/CoreTypesIdentityTest.kt b/harness/tests/src/main/kotlin/godot/tests/CoreTypesIdentityTest.kt
index ed22301409..e408d2895a 100644
--- a/harness/tests/src/main/kotlin/godot/tests/CoreTypesIdentityTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/CoreTypesIdentityTest.kt
@@ -1,7 +1,7 @@
 package godot.tests
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.AABB
 import godot.core.Basis
@@ -17,64 +17,64 @@ import godot.core.Vector3
 @GodotScript
 class CoreTypesIdentityTest : Node() {
 
-    @GodotMember
+    @Member
     var aabb = AABB(Vector3(1, 1, 1), Vector3(2, 2, 2))
 
-    @GodotMember
+    @Member
     var basis = Basis(Vector3(0, 1, 2), Vector3(3, 4, 5), Vector3(6, 7, 8))
 
-    @GodotMember
+    @Member
     var color = Color(0.1, 0.2, 0.3, 0.4)
 
-    @GodotMember
+    @Member
     var plane = Plane(1, 2, 3, 4)
 
-    @GodotMember
+    @Member
     var quaternion = Quaternion(1, 2, 3, 4)
 
-    @GodotMember
+    @Member
     var rect2 = Rect2(1.0, 2.0, 3.0, 4.0)
 
-    @GodotMember
+    @Member
     var transform3D =
         Transform3D(Vector3(0, 1, 2), Vector3(3, 4, 5), Vector3(6, 7, 8), Vector3(9, 10, 11))
 
-    @GodotMember
+    @Member
     var transform2D = Transform2D(0, 1, 2, 3, 4, 5)
 
-    @GodotMember
+    @Member
     var vector2 = Vector2(1, 2)
 
-    @GodotMember
+    @Member
     var vector3 = Vector3(1, 2, 3)
 
-    @GodotMember
+    @Member
     fun aabb(aabb: AABB) = aabb
 
-    @GodotMember
+    @Member
     fun basis(basis: Basis) = basis
 
-    @GodotMember
+    @Member
     fun color(color: Color) = color
 
-    @GodotMember
+    @Member
     fun plane(plane: Plane) = plane
 
-    @GodotMember
+    @Member
     fun quat(quaternion: Quaternion) = quaternion
 
-    @GodotMember
+    @Member
     fun rect2(rect2: Rect2) = rect2
 
-    @GodotMember
+    @Member
     fun transform(transform3D: Transform3D) = transform3D
 
-    @GodotMember
+    @Member
     fun transform2D(transform2D: Transform2D) = transform2D
 
-    @GodotMember
+    @Member
     fun vector2(vector2: Vector2) = vector2
 
-    @GodotMember
+    @Member
     fun vector3(vector3: Vector3) = vector3
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/FuncRefTest.kt b/harness/tests/src/main/kotlin/godot/tests/FuncRefTest.kt
index d26aed53c6..2a1b89e57a 100644
--- a/harness/tests/src/main/kotlin/godot/tests/FuncRefTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/FuncRefTest.kt
@@ -1,7 +1,7 @@
 package godot.tests
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.annotation.Rpc
 import godot.core.signal0
@@ -13,60 +13,60 @@ class FuncRefTest : Node() {
 
     val test by signal0()
 
-    @GodotMember
+    @Member
     var blubb: Boolean = false
 
-    @GodotMember
+    @Member
     var callFlag = false
 
-    @GodotMember
+    @Member
     var callWithParamFlag = false
 
-    @GodotMember
+    @Member
     var signalCallFlag = false
 
-    @GodotMember
+    @Member
     override fun _ready() {
         test.connect(this, FuncRefTest::testSignalCallback)
     }
 
     @Rpc
-    @GodotMember
+    @Member
     fun testSignalCallback() {
         signalCallFlag = true
     }
 
-    @GodotMember
+    @Member
     fun testSignalCall() {
         test.emit()
     }
 
-    @GodotMember
+    @Member
     fun withoutParamCallback() {
         callFlag = true
     }
 
-    @GodotMember
+    @Member
     fun testCallWithoutParam() {
         call(this::withoutParamCallback)
     }
 
-    @GodotMember
+    @Member
     fun testCallDeferredWithoutParam() {
         callDeferred(this::withoutParamCallback)
     }
 
-    @GodotMember
+    @Member
     fun withParamCallback(flag: Boolean) {
         callWithParamFlag = flag
     }
 
-    @GodotMember
+    @Member
     fun testCallWithParam() {
         call(this::withParamCallback, true)
     }
 
-    @GodotMember
+    @Member
     fun testCallDeferredWithParam() {
         callDeferred(this::withParamCallback, true)
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/Invocation.kt b/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
index 45be0b949c..6a09e47178 100644
--- a/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/Invocation.kt
@@ -14,7 +14,7 @@ import godot.annotation.ExpEasing
 import godot.annotation.Export
 import godot.annotation.File
 import godot.annotation.FloatRange
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.annotation.IntFlag
 import godot.annotation.IntRange
@@ -56,7 +56,7 @@ class Invocation : Node3D() {
     @Export
     var enumList = listOf(TestEnum.ENUM_1)
 
-    @GodotMember
+    @Member
     var vectorList = PackedVector3Array()
 
     @Export
@@ -72,27 +72,27 @@ class Invocation : Node3D() {
     //@Export
     //var lateinitString: String? = null
 
-    @GodotMember
+    @Member
     lateinit var registerObject: OtherScript
 
-    @GodotMember
+    @Member
     var registerObjectNullable: OtherScript? = null
 
-    @GodotMember
+    @Member
     var registerObjectNullablePreInit: OtherScript? = OtherScript()
         set(value) {
             field?.free()
             field = value
         }
 
-    @GodotMember
+    @Member
     var registerObjectNonNullablePreInit: OtherScript = OtherScript()
         set(value) {
             field.free()
             field = value
         }
 
-    @GodotMember
+    @Member
     var vector = Vector3()
 
     @Export
@@ -111,7 +111,7 @@ class Invocation : Node3D() {
     private val otherScriptReference = OtherScript()
     private fun provideOtherScriptReference() = otherScriptReference
 
-    @GodotMember
+    @Member
     var invocation = provideOtherScriptReference()
 
     @Export
@@ -246,28 +246,28 @@ class Invocation : Node3D() {
     @Export
     var utf8String = ""
 
-    @GodotMember
+    @Member
     fun intValue(value: Int) = value
 
-    @GodotMember
+    @Member
     fun longValue(value: Long) = value
 
-    @GodotMember
+    @Member
     fun floatValue(value: Float) = value
 
-    @GodotMember
+    @Member
     fun doubleValue(value: Double) = value
 
-    @GodotMember
+    @Member
     fun booleanValue(value: Boolean) = value
 
-    @GodotMember
+    @Member
     fun stringValue(value: String) = value
 
-    @GodotMember
+    @Member
     fun intAddition(a: Int, b: Int) = a + b
 
-    @GodotMember
+    @Member
     fun initNullables() {
         registerObject = OtherScript()
         registerObjectNullable = OtherScript()
@@ -332,202 +332,202 @@ class Invocation : Node3D() {
         registerObjectNonNullablePreInit.free()
     }
 
-    @GodotMember
+    @Member
     fun getRidId() = rid.id
 
-    @GodotMember
+    @Member
     fun getNavMeshRid() = resourceTest.getRid()
 
-    @GodotMember
+    @Member
     fun appendToAnyDict(key: Any, value: Any) {
         anyToAnyDictionary[key] = value
     }
 
-    @GodotMember
+    @Member
     fun removeFromAnyDict(key: Any) {
         anyToAnyDictionary.remove(key)
     }
 
-    @GodotMember
+    @Member
     fun getFromAnyDict(key: Any) = anyToAnyDictionary[key]
 
-    @GodotMember
+    @Member
     fun anyDictSize() = anyToAnyDictionary.size
 
-    @GodotMember
+    @Member
     fun appendToStringNavMeshDict(key: String, value: NavigationMesh) {
         navMeshesDictionary[key] = value
     }
 
-    @GodotMember
+    @Member
     fun removeFromStringNavMeshDict(key: String) {
         navMeshesDictionary.remove(key)
     }
 
-    @GodotMember
+    @Member
     fun getFromStringNavMeshDict(key: String) = navMeshesDictionary[key]
 
-    @GodotMember
+    @Member
     fun stringNavMeshDictSize() = navMeshesDictionary.size
 
-    @GodotMember
+    @Member
     fun appendToStringNavMeshNullableDict(key: String, value: NavigationMesh) {
         nullableDictionary[key] = value
     }
 
-    @GodotMember
+    @Member
     fun removeFromStringNavMeshNullableDict(key: String) {
         nullableDictionary.remove(key)
     }
 
 //	TODO: This will fail to register as we cannot register nullable return type
-//	@GodotMember
+//	@Member
 //	fun getFromStringNavMeshNullableDict(key: String) = nullableDictionary[key]
 
-    @GodotMember
+    @Member
     fun stringNavMeshNullableDictSize() = nullableDictionary.size
 
-    @GodotMember
+    @Member
     fun appendNullableStandardNavMesh() = nullableArray.append(NavigationMesh())
 
-    @GodotMember
+    @Member
     fun appendNullableNavMesh(navigationMesh: NavigationMesh?) = nullableArray.append(navigationMesh)
 
-    @GodotMember
+    @Member
     fun removeNullableNavMesh(navigationMesh: NavigationMesh?) = nullableArray.remove(navigationMesh)
 
-    @GodotMember
+    @Member
     fun removeNullableNavMeshWithIndex(index: Int) = nullableArray.removeAt(index)
 
 //	TODO: This will fail to register as we cannot register nullable return type
-//	@GodotMember
+//	@Member
 //	fun getNullableNavMeshFromArray(index: Int) = nullableArray[index]
 
-    @GodotMember
+    @Member
     fun nullableNavMeshesSize() = nullableArray.size
 
-    @GodotMember
+    @Member
     fun appendStandardNavMesh() = navMeshes.append(NavigationMesh())
 
-    @GodotMember
+    @Member
     fun appendNavMesh(navigationMesh: NavigationMesh) = navMeshes.append(navigationMesh)
 
-    @GodotMember
+    @Member
     fun removeNavMesh(navigationMesh: NavigationMesh) = navMeshes.remove(navigationMesh)
 
-    @GodotMember
+    @Member
     fun removeNavMeshWithIndex(index: Int) = navMeshes.removeAt(index)
 
-    @GodotMember
+    @Member
     fun getNavMeshFromArray(index: Int) = navMeshes[index]
 
-    @GodotMember
+    @Member
     fun navMeshesSize() = navMeshes.size
 
-    @GodotMember
+    @Member
     fun appendAnyToArray(any: Any) = testArrayAny.append(any)
 
-    @GodotMember
+    @Member
     fun removeAnyFromArray(any: Any) = testArrayAny.remove(any)
 
-    @GodotMember
+    @Member
     fun getAnyFromArray(index: Int) = testArrayAny[index]
 
-    @GodotMember
+    @Member
     fun arrayAnySize() = testArrayAny.size
 
-    @GodotMember
+    @Member
     fun countNameshInstance(navigationMesh: NavigationMesh) = navMeshes.count(navigationMesh)
 
-    @GodotMember
+    @Member
     fun getNavMeshCount() = navMeshes.count()
 
     //Type cast checks
-    @GodotMember
+    @Member
     fun parentIsNode3D() = getParent() is Node3D
 
-    @GodotMember
+    @Member
     fun isObjectNode3D(obj: Object) = obj is Node3D
 
-    @GodotMember
+    @Member
     fun otherJvmId(invocation: Invocation) = invocation.jvmId
 
-    @GodotMember
+    @Member
     fun hasCameraNode() = getNodeOrNull(NodePath("Camera")) != null
 
-    @GodotMember
+    @Member
     fun addByteToPackedArray(byte: Byte) = packedByteArray.append(byte)
 
-    @GodotMember
+    @Member
     fun addByteArrayToPackedArray(array: PackedByteArray) = packedByteArray.appendArray(array)
 
-    @GodotMember
+    @Member
     fun deleteByteFromPackedArray(index: Int) = packedByteArray.removeAt(index)
 
-    @GodotMember
+    @Member
     fun getByteFromPackedArray(index: Int) = packedByteArray[index]
 
-    @GodotMember
+    @Member
     fun setByteInPackedArray(index: Int, value: Byte) {
         packedByteArray[index] = value
     }
 
-    @GodotMember
+    @Member
     fun resizeBytePackedArray(newSize: Int) {
         packedByteArray.resize(newSize)
     }
 
-    @GodotMember
+    @Member
     fun addColorToPackedArray(color: Color) = packedColorArray.append(color)
 
-    @GodotMember
+    @Member
     fun addColorArrayToPackedArray(colorArray: PackedColorArray) = packedColorArray.appendArray(colorArray)
 
-    @GodotMember
+    @Member
     fun deleteColorFromPackedArray(index: Int) = packedColorArray.removeAt(index)
 
-    @GodotMember
+    @Member
     fun getColorFromPackedArray(index: Int) = packedColorArray[index]
 
-    @GodotMember
+    @Member
     fun setColorInPackedArray(index: Int, color: Color) {
         packedColorArray[index] = color
     }
 
-    @GodotMember
+    @Member
     fun resizeColorPackedArray(newSize: Int) {
         packedColorArray.resize(newSize)
     }
 
-    @GodotMember
+    @Member
     fun addIntToPackedArray(int: Int) = packedInt32Array.append(int)
 
-    @GodotMember
+    @Member
     fun addIntArrayToPackedArray(intArray: PackedInt32Array) = this.packedInt32Array.appendArray(intArray)
 
-    @GodotMember
+    @Member
     fun deleteIntFromPackedArray(index: Int) = packedInt32Array.removeAt(index)
 
-    @GodotMember
+    @Member
     fun getIntFromPackedArray(index: Int) = packedInt32Array[index]
 
-    @GodotMember
+    @Member
     fun setIntInPackedArray(index: Int, value: Int) {
         packedInt32Array[index] = value
     }
 
-    @GodotMember
+    @Member
     fun resizeIntPackedArray(newSize: Int) {
         packedInt32Array.resize(newSize)
     }
 
-    @GodotMember
+    @Member
     fun addRealToPackedArray(realT: RealT) = packedFloat64Array.append(realT)
 
-    @GodotMember
+    @Member
     fun addRealArrayToPackedArray(realArray: PackedFloat64Array) = packedFloat64Array.appendArray(realArray)
 
-    @GodotMember
+    @Member
     fun readStringFromByteArray() {
 
         val asciiArray = testString.toByteArray(Charsets.US_ASCII)
@@ -545,94 +545,94 @@ class Invocation : Node3D() {
         utf8String = packed2.getStringFromUtf8()
     }
 
-    @GodotMember
+    @Member
     fun deleteRealFromPackedArray(index: Int) = packedFloat64Array.removeAt(index)
 
-    @GodotMember
+    @Member
     fun getRealFromPackedArray(index: Int) = packedFloat64Array[index]
 
-    @GodotMember
+    @Member
     fun setRealInPackedArray(index: Int, value: Double) {
         packedFloat64Array[index] = value
     }
 
-    @GodotMember
+    @Member
     fun resizeRealPackedArray(newSize: Int) {
         packedFloat64Array.resize(newSize)
     }
 
-    @GodotMember
+    @Member
     fun addStringToPackedArray(string: String) = packedStringArray.append(string)
 
-    @GodotMember
+    @Member
     fun addStringArrayToPackedArray(stringArray: PackedStringArray) = packedStringArray.appendArray(stringArray)
 
-    @GodotMember
+    @Member
     fun deleteStringFromPackedArray(index: Int) = packedStringArray.removeAt(index)
 
-    @GodotMember
+    @Member
     fun getStringFromPackedArray(index: Int) = packedStringArray[index]
 
-    @GodotMember
+    @Member
     fun setStringInPackedArray(index: Int, value: String) {
         packedStringArray[index] = value
     }
 
-    @GodotMember
+    @Member
     fun resizeStringPackedArray(newSize: Int) {
         packedStringArray.resize(newSize)
     }
 
-    @GodotMember
+    @Member
     fun addVector2ToPackedArray(vector2: Vector2) = packedVector2Array.append(vector2)
 
-    @GodotMember
+    @Member
     fun addVector2ArrayToPackedArray(vector2Array: PackedVector2Array) = packedVector2Array.appendArray(vector2Array)
 
-    @GodotMember
+    @Member
     fun deleteVector2FromPackedArray(index: Int) = packedVector2Array.removeAt(index)
 
-    @GodotMember
+    @Member
     fun getVector2FromPackedArray(index: Int) = packedVector2Array[index]
 
-    @GodotMember
+    @Member
     fun setVector2InPackedArray(index: Int, vector2: Vector2) {
         packedVector2Array[index] = vector2
     }
 
-    @GodotMember
+    @Member
     fun resizeVector2PackedArray(newSize: Int) {
         packedVector2Array.resize(newSize)
     }
 
-    @GodotMember
+    @Member
     fun addVector3ToPackedArray(vector3: Vector3) = packedVector3Array.append(vector3)
 
-    @GodotMember
+    @Member
     fun addVector3ArrayToPackedArray(vector3Array: PackedVector3Array) = packedVector3Array.appendArray(vector3Array)
 
-    @GodotMember
+    @Member
     fun deleteVector3FromPackedArray(index: Int) = packedVector3Array.removeAt(index)
 
-    @GodotMember
+    @Member
     fun getVector3FromPackedArray(index: Int) = packedVector3Array[index]
 
-    @GodotMember
+    @Member
     fun setVector3InPackedArray(index: Int, vector3: Vector3) {
         packedVector3Array[index] = vector3
     }
 
-    @GodotMember
+    @Member
     fun resizeVector3PackedArray(newSize: Int) {
         packedVector3Array.resize(newSize)
     }
 
     // Singleton tests
 
-    @GodotMember
+    @Member
     fun isSentXrSameInstanceAsJvmSingleton(arvrServer: XRServer) =
         XRServer.getInstanceId() == arvrServer.getInstanceId()
 
-    @GodotMember
+    @Member
     fun createVariantArrayOfUserType() = variantArrayOf<OtherScript>()
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/LambdaCallableTest.kt b/harness/tests/src/main/kotlin/godot/tests/LambdaCallableTest.kt
index 23abc95111..86cbde8571 100644
--- a/harness/tests/src/main/kotlin/godot/tests/LambdaCallableTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/LambdaCallableTest.kt
@@ -1,7 +1,7 @@
 package godot.tests
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.Signal3
 import godot.core.asCallable
@@ -14,27 +14,27 @@ class LambdaCallableTest : Node() {
 
     val signalNoParam by signal0()
 
-    @GodotMember
+    @Member
     var hasSignalNoParamBeenTriggered = false
 
     val signalWithParams: Signal3<String, Long, Node> by signal3("str", "long", "node")
 
-    @GodotMember
+    @Member
     var signalString: String = ""
 
-    @GodotMember
+    @Member
     var signalLong: Long = Long.MIN_VALUE
 
-    @GodotMember
+    @Member
     lateinit var signalNode: Node
 
-    @GodotMember
+    @Member
     var ktCallable = { str: String -> ktCallableString = str }.asCallable()
 
-    @GodotMember
+    @Member
     var ktCallableString: String = ""
 
-    @GodotMember
+    @Member
     override fun _ready() {
         signalNoParam.connect {
             hasSignalNoParamBeenTriggered = true
@@ -47,12 +47,12 @@ class LambdaCallableTest : Node() {
         }
     }
 
-    @GodotMember
+    @Member
     fun emitSignalNoParam() {
         signalNoParam.emit()
     }
 
-    @GodotMember
+    @Member
     fun emitSignalWithParam(str: String, long: Long, node: Node) {
         signalWithParams.emit(str, long, node)
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/MultiArgsConstructorTest.kt b/harness/tests/src/main/kotlin/godot/tests/MultiArgsConstructorTest.kt
index 5c756856f6..2a6841df93 100644
--- a/harness/tests/src/main/kotlin/godot/tests/MultiArgsConstructorTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/MultiArgsConstructorTest.kt
@@ -3,44 +3,44 @@ package godot.tests
 import godot.NavigationMesh
 import godot.Node
 import godot.Object
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.VariantArray
 
 @GodotScript
 class MultiArgsConstructorTest : Node {
 
-    @GodotMember
+    @Member
     var defaultConstructorHasBeenCalled = false
 
-    @GodotMember
+    @Member
     var oneArgConstructorHasBeenCalled = false
 
-    @GodotMember
+    @Member
     var threeArgsConstructorHasBeenCalled = false
 
-    @GodotMember
+    @Member
     constructor() : super() {
         defaultConstructorHasBeenCalled = true
     }
 
-    @GodotMember
+    @Member
     constructor(i: Int) : this() {
         oneArgConstructorHasBeenCalled = true
     }
 
-    @GodotMember
+    @Member
     constructor(i: Int, s: String) : this() {
         threeArgsConstructorHasBeenCalled = true
     }
 
-    @GodotMember
+    @Member
     constructor(i: Int, s: String, obj: Object?) : this()
 
-    @GodotMember
+    @Member
     constructor(i: Int, s: String, obj: Object?, variantArray: VariantArray<Any?>) : this()
 
-    @GodotMember
+    @Member
     constructor(i: Int, s: String, obj: Object?, variantArray: VariantArray<Any?>?, navMesh: NavigationMesh) : this()
 
     constructor(
@@ -61,8 +61,8 @@ class MultiArgsConstructorTest : Node {
     ) : this()
 
     // constructors which should fail:
-//    @GodotMember
+//    @Member
 //    constructor(iShouldFailAsOverloadingIsNotSupported: String, s: String, obj: Object?, variantArray: VariantArray<Any?>?, navMesh: NavigationMesh) : this()
-//    @GodotMember
+//    @Member
 //    constructor(i: Int, s: Int, obj: Object?, variantArray: VariantArray<Any?>?, navMesh: NavigationMesh, tooManyArgs: String) : this()
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/args/ConstructorArgSizeTest.kt b/harness/tests/src/main/kotlin/godot/tests/args/ConstructorArgSizeTest.kt
index 95d62b2076..e932883c38 100644
--- a/harness/tests/src/main/kotlin/godot/tests/args/ConstructorArgSizeTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/args/ConstructorArgSizeTest.kt
@@ -1,7 +1,7 @@
 package godot.tests.args
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.VariantArray
 import godot.core.variantArrayOf
@@ -10,14 +10,14 @@ import godot.core.variantArrayOf
 class ConstructorArgSizeTest(): Node() {
     private val receivedConstructorArgs: VariantArray<Any> = variantArrayOf()
 
-    @GodotMember
+    @Member
     constructor(
         p1: String,
     ): this() {
         receivedConstructorArgs.add(p1)
     }
 
-    @GodotMember
+    @Member
     constructor(
         p1: String,
         p2: String,
@@ -28,7 +28,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @GodotMember
+    @Member
     constructor(
         p1: String,
         p2: String,
@@ -41,7 +41,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @GodotMember
+    @Member
     constructor(
         p1: String,
         p2: String,
@@ -56,7 +56,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @GodotMember
+    @Member
     constructor(
         p1: String,
         p2: String,
@@ -73,7 +73,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @GodotMember
+    @Member
     constructor(
         p1: String,
         p2: String,
@@ -92,7 +92,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @GodotMember
+    @Member
     constructor(
         p1: String,
         p2: String,
@@ -113,7 +113,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @GodotMember
+    @Member
     constructor(
         p1: String,
         p2: String,
@@ -136,7 +136,7 @@ class ConstructorArgSizeTest(): Node() {
         }
     }
 
-    @GodotMember
+    @Member
     fun getReceivedConstructorArgs(): VariantArray<Any> {
         return receivedConstructorArgs
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/args/FunctionArgSizeTest.kt b/harness/tests/src/main/kotlin/godot/tests/args/FunctionArgSizeTest.kt
index e4d40574a1..38d2e070d5 100644
--- a/harness/tests/src/main/kotlin/godot/tests/args/FunctionArgSizeTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/args/FunctionArgSizeTest.kt
@@ -1,7 +1,7 @@
 package godot.tests.args
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.VariantArray
 import godot.core.variantArrayOf
@@ -9,12 +9,12 @@ import godot.core.variantArrayOf
 @GodotScript
 class FunctionArgSizeTest : Node() {
 
-    @GodotMember
+    @Member
     fun arg0(): VariantArray<Any> {
         return variantArrayOf()
     }
 
-    @GodotMember
+    @Member
     fun arg1(
         p1: String,
     ): VariantArray<Any> {
@@ -23,7 +23,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg2(
         p1: String,
         p2: String,
@@ -34,7 +34,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg3(
         p1: String,
         p2: String,
@@ -47,7 +47,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg4(
         p1: String,
         p2: String,
@@ -62,7 +62,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg5(
         p1: String,
         p2: String,
@@ -79,7 +79,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg6(
         p1: String,
         p2: String,
@@ -98,7 +98,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg7(
         p1: String,
         p2: String,
@@ -119,7 +119,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg8(
         p1: String,
         p2: String,
@@ -142,7 +142,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg9(
         p1: String,
         p2: String,
@@ -167,7 +167,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg10(
         p1: String,
         p2: String,
@@ -194,7 +194,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg11(
         p1: String,
         p2: String,
@@ -223,7 +223,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg12(
         p1: String,
         p2: String,
@@ -254,7 +254,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg13(
         p1: String,
         p2: String,
@@ -287,7 +287,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg14(
         p1: String,
         p2: String,
@@ -322,7 +322,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg15(
         p1: String,
         p2: String,
@@ -359,7 +359,7 @@ class FunctionArgSizeTest : Node() {
         )
     }
 
-    @GodotMember
+    @Member
     fun arg16(
         p1: String,
         p2: String,
diff --git a/harness/tests/src/main/kotlin/godot/tests/binding/BindingTest.kt b/harness/tests/src/main/kotlin/godot/tests/binding/BindingTest.kt
index 5b9de96b32..2ca349f97f 100644
--- a/harness/tests/src/main/kotlin/godot/tests/binding/BindingTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/binding/BindingTest.kt
@@ -1,12 +1,12 @@
 package godot.tests.binding
 
 import godot.Object
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 
 @GodotScript
 class BindingTest : Object() {
-    @GodotMember
+    @Member
     fun getClassName(obj: Object) = obj::class.simpleName
 }
 
diff --git a/harness/tests/src/main/kotlin/godot/tests/callable/CallableMethodBindTest.kt b/harness/tests/src/main/kotlin/godot/tests/callable/CallableMethodBindTest.kt
index 2475053a36..cf8b767f05 100644
--- a/harness/tests/src/main/kotlin/godot/tests/callable/CallableMethodBindTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/callable/CallableMethodBindTest.kt
@@ -1,7 +1,7 @@
 package godot.tests.callable
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.NativeCallable
 import godot.core.VariantArray
@@ -10,30 +10,30 @@ import godot.global.GD
 
 @GodotScript
 class CallableMethodBindTest: Node() {
-    @GodotMember
+    @Member
     var methodBinds: VariantArray<Int> = variantArrayOf(-1, -1, -1)
 
-    @GodotMember
+    @Member
     fun callWithMethodWithAllBinds() {
         NativeCallable(this, CallableMethodBindTest::readySignalMethodBindTest).bind(1, 2, 3).call()
     }
 
-    @GodotMember
+    @Member
     fun callWithMethodWithTwoBinds() {
         NativeCallable(this, CallableMethodBindTest::readySignalMethodBindTest).bind(2, 3).call(0)
     }
 
-    @GodotMember
+    @Member
     fun callWithMethodWithOneBind() {
         NativeCallable(this, CallableMethodBindTest::readySignalMethodBindTest).bind(3).call(0, 0)
     }
 
-    @GodotMember
+    @Member
     fun callWithMethodWithNoBind() {
         NativeCallable(this, CallableMethodBindTest::readySignalMethodBindTest).bind().call(0, 0, 0)
     }
 
-    @GodotMember
+    @Member
     fun readySignalMethodBindTest(a: Int, b: Int, c: Int) {
         GD.print("Called with args: $a, $b, $c")
         methodBinds = variantArrayOf(a, b, c)
diff --git a/harness/tests/src/main/kotlin/godot/tests/constructor/ConstructorRegistrationTest.kt b/harness/tests/src/main/kotlin/godot/tests/constructor/ConstructorRegistrationTest.kt
index ed74ac295e..e848f11dc3 100644
--- a/harness/tests/src/main/kotlin/godot/tests/constructor/ConstructorRegistrationTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/constructor/ConstructorRegistrationTest.kt
@@ -1,7 +1,7 @@
 package godot.tests.constructor
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.Dictionary
 import godot.core.VariantArray
@@ -9,6 +9,6 @@ import godot.core.VariantArray
 @GodotScript
 class ConstructorRegistrationTest(): Node() {
 
-    @GodotMember
+    @Member
     constructor(param1: Dictionary<Any, Any?>, param2: VariantArray<Long>): this()
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/coretypes/BasisTest.kt b/harness/tests/src/main/kotlin/godot/tests/coretypes/BasisTest.kt
index 14715a9c04..3415aff11f 100644
--- a/harness/tests/src/main/kotlin/godot/tests/coretypes/BasisTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/coretypes/BasisTest.kt
@@ -1,7 +1,7 @@
 package godot.tests.coretypes
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.Basis
 import godot.core.Quaternion
@@ -10,26 +10,26 @@ import godot.core.Vector3
 @GodotScript
 class BasisTest : Node() {
 
-    @GodotMember
+    @Member
     fun getFromBasis(basis: Basis, index: Int) = basis[index]
 
-    @GodotMember
+    @Member
     fun setInBasis(basis: Basis, index: Int, vector3: Vector3): Basis {
         basis[index] = vector3
         return basis
     }
 
-    @GodotMember
+    @Member
     fun getRotationQuat(basis: Basis): Quaternion {
         return basis.getRotationQuaternion()
     }
 
-    @GodotMember
+    @Member
     fun newJvmBasis(): Basis {
         return Basis()
     }
 
-    @GodotMember
+    @Member
     fun isEqualApproxJvm(a: Basis, b: Basis): Boolean {
         return a.isEqualApprox(b)
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/coretypes/StringTest.kt b/harness/tests/src/main/kotlin/godot/tests/coretypes/StringTest.kt
index ce7107ccfc..8e097f81f1 100644
--- a/harness/tests/src/main/kotlin/godot/tests/coretypes/StringTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/coretypes/StringTest.kt
@@ -1,7 +1,7 @@
 package godot.tests.coretypes
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.Vector2
 import godot.core.asStringName
@@ -45,35 +45,35 @@ class StringTest : Node() {
         """.trimIndent()
 
 
-    @GodotMember
+    @Member
     fun identity(str: String) = str
 
-    @GodotMember
+    @Member
     fun fillTheBuffer(str1: String, str2: String, str3: String, str4: String, str5: String): Boolean {
         return true
     }
 
-    @GodotMember
+    @Member
     fun mixStringAndVariant(i1: Int, str1: String, vec: Vector2, str2: String, f1: Float): Boolean {
         return true
     }
 
-    @GodotMember
+    @Member
     fun getShortString() = _shortString
 
-    @GodotMember
+    @Member
     fun getLongestShortString() = _longestShortString
 
-    @GodotMember
+    @Member
     fun getShortestLongString() = _shortestLongString
 
-    @GodotMember
+    @Member
     fun getLongString() = _longString
   
-    @GodotMember
+    @Member
     fun getLength(str: String) = str.length
 
-    @GodotMember
+    @Member
     fun getAsStringName(str: String) = str.asStringName()
 
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/coretypes/Vector3Test.kt b/harness/tests/src/main/kotlin/godot/tests/coretypes/Vector3Test.kt
index c126a31560..d2a3f61f6e 100644
--- a/harness/tests/src/main/kotlin/godot/tests/coretypes/Vector3Test.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/coretypes/Vector3Test.kt
@@ -1,7 +1,7 @@
 package godot.tests.coretypes
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.Vector3
 import godot.common.util.RealT
@@ -9,10 +9,10 @@ import godot.common.util.RealT
 @GodotScript
 class Vector3Test : Node() {
 
-    @GodotMember
+    @Member
     fun getFromVector3(vector3: Vector3, index: Int) = vector3[index]
 
-    @GodotMember
+    @Member
     fun setInVector3(vector3: Vector3, index: Int, realT: RealT): Vector3 {
         vector3[index] = realT
         return vector3
diff --git a/harness/tests/src/main/kotlin/godot/tests/coroutine/CoroutineTest.kt b/harness/tests/src/main/kotlin/godot/tests/coroutine/CoroutineTest.kt
index bcbb84da38..cd0aa008fc 100644
--- a/harness/tests/src/main/kotlin/godot/tests/coroutine/CoroutineTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/coroutine/CoroutineTest.kt
@@ -4,7 +4,7 @@ package godot.tests.coroutine
 import godot.Object
 import godot.PackedScene
 import godot.ResourceLoader
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.Vector2
 import godot.core.signal0
@@ -29,37 +29,37 @@ class CoroutineTest : Object() {
 
     val signalWithManyParameters by signal4<Int, Float, Vector2, String>("int", "float", "vector2", "string")
 
-    @GodotMember
+    @Member
     var step: Int = 0
 
-    @GodotMember
+    @Member
     fun startCoroutineWithoutParameter() = godotCoroutine {
         step = 1
         signalWithoutParameter.await()
         step = 2
     }
 
-    @GodotMember
+    @Member
     fun startCoroutineWithOneParameter() = godotCoroutine {
         step = 3
         step = signalWithOneParameter.await()
     }
 
-    @GodotMember
+    @Member
     fun startCoroutineWithManyParameters() = godotCoroutine {
         step = 5
         val (int, _, _, _) = signalWithManyParameters.await()
         step = int
     }
 
-    @GodotMember
+    @Member
     fun startCoroutineUndispatched() = godotCoroutine(start = CoroutineStart.UNDISPATCHED) {
         step = 7
         signalWithoutParameter.await()
         step = 8
     }
 
-    @GodotMember
+    @Member
     fun startCoroutineWithPhysicsFrame() = godotCoroutine(start = CoroutineStart.UNDISPATCHED) {
         step = 9
         awaitPhysicsFrame {
@@ -67,7 +67,7 @@ class CoroutineTest : Object() {
         }
     }
 
-    @GodotMember
+    @Member
     fun startCoroutineWithProcessFrame() = godotCoroutine(start = CoroutineStart.UNDISPATCHED) {
         step = 11
         awaitProcessFrame {
@@ -75,10 +75,10 @@ class CoroutineTest : Object() {
         }
     }
 
-    @RegisterSignal
+    @Member
     val runOnMainThreadFromBackgroundThreadFinished by signal1<Boolean>("is_test_successful")
 
-    @GodotMember
+    @Member
     fun runOnMainThreadFromBackgroundThread() {
         val thread = Thread.currentThread().name
 
@@ -107,7 +107,7 @@ class CoroutineTest : Object() {
 
     val asyncLoadResourceFinished by signal1<Boolean>("is_test_successful")
 
-    @GodotMember
+    @Member
     fun asyncLoadResource() {
         godotCoroutine {
             val resource = ResourceLoader.awaitLoadAs<PackedScene>("res://Spatial.tscn") { progress ->
diff --git a/harness/tests/src/main/kotlin/godot/tests/exception/ExceptionTest.kt b/harness/tests/src/main/kotlin/godot/tests/exception/ExceptionTest.kt
index e4d35ecec6..d3c401f4ee 100644
--- a/harness/tests/src/main/kotlin/godot/tests/exception/ExceptionTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/exception/ExceptionTest.kt
@@ -1,13 +1,13 @@
 package godot.tests.exception
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 
 @GodotScript
 class ExceptionTest: Node() {
 
-    @GodotMember
+    @Member
     fun throwException() {
         throw RuntimeException("Test exception")
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/freeform/FreeformRegistrationFileTestClass.kt b/harness/tests/src/main/kotlin/godot/tests/freeform/FreeformRegistrationFileTestClass.kt
index 4c88c62a0e..74247c9117 100644
--- a/harness/tests/src/main/kotlin/godot/tests/freeform/FreeformRegistrationFileTestClass.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/freeform/FreeformRegistrationFileTestClass.kt
@@ -1,11 +1,11 @@
 package godot.tests.freeform
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 
 @GodotScript
 class FreeformRegistrationFileTestClass: Node() {
-    @GodotMember
+    @Member
     fun greeting(): String = "Hello from class with freely moved registration file"
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceChild.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceChild.kt
index d9322d08a4..8dcbe63d1d 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceChild.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceChild.kt
@@ -1,6 +1,6 @@
 package godot.tests.inheritance
 
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.signal2
 
@@ -11,14 +11,14 @@ class AbstractClassInheritanceChild : AbstractClassInheritanceParent() {
 
     //---------------- Here to check ------------------
 
-    @GodotMember
+    @Member
     var childOpenFunctionHasBeenCalled = false
 
     //-------------------------------------------------
 
     override var openVar: Int = 100
 
-    @GodotMember
+    @Member
     override fun openFunction() {
         childOpenFunctionHasBeenCalled = true
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceParent.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceParent.kt
index b7e5622739..782e8edaf7 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceParent.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/AbstractClassInheritanceParent.kt
@@ -2,7 +2,7 @@ package godot.tests.inheritance
 
 import godot.Node
 import godot.annotation.Export
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.core.signal1
 import godot.core.signal2
 
@@ -18,22 +18,22 @@ abstract class AbstractClassInheritanceParent : Node() {
 
     //---------------- Here to check ------------------
 
-    @GodotMember
+    @Member
     var closedFunctionHasBeenCalled = false
 
     //-------------------------------------------------
 
-    @GodotMember
+    @Member
     var closedVar = 0
 
-    @GodotMember
+    @Member
     open var openVar = 0
 
-    @GodotMember
+    @Member
     fun closedFunction() {
         closedFunctionHasBeenCalled = true
     }
 
-    @GodotMember
+    @Member
     abstract fun openFunction()
 }
diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt
index 3c6384b38d..cdb9aaa347 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceChild.kt
@@ -1,6 +1,6 @@
 package godot.tests.inheritance
 
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.signal2
 import godot.global.GD
@@ -12,14 +12,14 @@ class ClassInheritanceChild : ClassInheritanceParent() {
 
     //---------------- Here to check ------------------
 
-    @GodotMember
+    @Member
     var childOpenFunctionHasBeenCalled = false
 
     //-------------------------------------------------
 
     override var openVar: Int = 100
 
-    @GodotMember
+    @Member
     override fun openFunction() {
         childOpenFunctionHasBeenCalled = true
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
index c04de81f6e..a8be5e2966 100644
--- a/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/inheritance/ClassInheritanceParent.kt
@@ -1,7 +1,7 @@
 package godot.tests.inheritance
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.GodotNotification
 import godot.core.signal1
@@ -17,31 +17,31 @@ open class ClassInheritanceParent : Node() {
 
     //---------------- Here to check ------------------
 
-    @GodotMember
+    @Member
     var closedFunctionHasBeenCalled = false
 
-    @GodotMember
+    @Member
     var parentOpenFunctionHasBeenCalled = false
 
     //-------------------------------------------------
 
-    @GodotMember
+    @Member
     var closedVar = 0
 
-    @GodotMember
+    @Member
     open var openVar = 0
 
-    @GodotMember
+    @Member
     fun closedFunction() {
         closedFunctionHasBeenCalled = true
     }
 
-    @GodotMember
+    @Member
     open fun openFunction() {
         parentOpenFunctionHasBeenCalled = true
     }
 
-    @GodotMember
+    @Member
     var notificationCallBitFlag = 0
 
     override fun _notification(): GodotNotification = godotNotification {
diff --git a/harness/tests/src/main/kotlin/godot/tests/packedarray/PackedArrayTest.kt b/harness/tests/src/main/kotlin/godot/tests/packedarray/PackedArrayTest.kt
index 0f5e276b24..4249ae3b42 100644
--- a/harness/tests/src/main/kotlin/godot/tests/packedarray/PackedArrayTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/packedarray/PackedArrayTest.kt
@@ -1,7 +1,7 @@
 package godot.tests.packedarray
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.PackedByteArray
 import godot.core.PackedFloat32Array
@@ -12,61 +12,61 @@ import godot.core.PackedInt64Array
 @GodotScript
 class PackedArrayTest : Node() {
 
-    @GodotMember
+    @Member
     fun convertByteArray() : PackedByteArray {
         val arr = byteArrayOf(0, 1, 2, 4, 8, 16, 32, 64, 127)
         return PackedByteArray(arr);
     }
 
-    @GodotMember
+    @Member
     fun convertIntArray() : PackedInt32Array {
         val arr = intArrayOf(0, 1, 2, 4, 8, 16, 32, 64, 127)
         return PackedInt32Array(arr);
     }
 
-    @GodotMember
+    @Member
     fun convertLongArray() : PackedInt64Array {
         val arr = longArrayOf(0L, 1L, 2L, 4L, 8L, 16L, 32L, 64L, 127L)
         return PackedInt64Array(arr);
     }
 
-    @GodotMember
+    @Member
     fun convertFloatArray() : PackedFloat32Array {
         val arr = floatArrayOf(0f, 1f, 2f, 4f, 8f, 16f, 32f, 64f, 127f)
         return PackedFloat32Array(arr);
     }
 
-    @GodotMember
+    @Member
     fun convertDoubleArray() : PackedFloat64Array {
         val arr = doubleArrayOf(0.0, 1.0, 2.0, 4.0, 8.0, 16.0, 32.0, 64.0, 127.0)
         return PackedFloat64Array(arr);
     }
 
-    @GodotMember
+    @Member
     fun getByteArrayValue(arr: PackedByteArray, index: Int) : Byte {
         val kotlinArr = arr.toByteArray()
         return kotlinArr[index];
     }
 
-    @GodotMember
+    @Member
     fun getIntArrayValue(arr: PackedInt32Array, index: Int) : Int {
         val kotlinArr = arr.toIntArray()
         return kotlinArr[index];
     }
 
-    @GodotMember
+    @Member
     fun getLongArrayValue(arr: PackedInt64Array, index: Int) : Long {
         val kotlinArr = arr.toLongArray()
         return kotlinArr[index];
     }
 
-    @GodotMember
+    @Member
     fun getFloatArrayValue(arr: PackedFloat32Array, index: Int) : Float {
         val kotlinArr = arr.toFloatArray()
         return kotlinArr[index];
     }
 
-    @GodotMember
+    @Member
     fun getDoubleArrayValue(arr: PackedFloat64Array, index: Int) : Double {
         val kotlinArr = arr.toDoubleArray()
         return kotlinArr[index];
diff --git a/harness/tests/src/main/kotlin/godot/tests/reflection/BaseReflectionTest.kt b/harness/tests/src/main/kotlin/godot/tests/reflection/BaseReflectionTest.kt
index 5163bea9f3..b75038d46e 100644
--- a/harness/tests/src/main/kotlin/godot/tests/reflection/BaseReflectionTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/reflection/BaseReflectionTest.kt
@@ -1,14 +1,14 @@
 package godot.tests.reflection
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import kotlin.reflect.full.hasAnnotation
 
 @GodotScript
 class BaseReflectionTest: Node() {
 
-    @GodotMember
+    @Member
     fun hasRegisterClassAnnotation(): Boolean {
         return BaseReflectionTest::class.hasAnnotation<GodotScript>()
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/reflection/GH571_ReflectionTest.kt b/harness/tests/src/main/kotlin/godot/tests/reflection/GH571_ReflectionTest.kt
index b333122956..f93fc2a14f 100644
--- a/harness/tests/src/main/kotlin/godot/tests/reflection/GH571_ReflectionTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/reflection/GH571_ReflectionTest.kt
@@ -3,7 +3,7 @@ package godot.tests.reflection
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 
 
@@ -23,7 +23,7 @@ class GH571_ReflectionTest: Node() {
         val data: String,
     )
 
-    @GodotMember
+    @Member
     fun deserializeJson(): String {
         val mapper = jacksonObjectMapper()
         val testClass = mapper.readValue(testJsonString, object : TypeReference<TestClass>() {})
diff --git a/harness/tests/src/main/kotlin/godot/tests/rpctests/RpcTests.kt b/harness/tests/src/main/kotlin/godot/tests/rpctests/RpcTests.kt
index ef6cd14e35..8a54e51530 100644
--- a/harness/tests/src/main/kotlin/godot/tests/rpctests/RpcTests.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/rpctests/RpcTests.kt
@@ -1,7 +1,7 @@
 package godot.tests.rpctests
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.annotation.Rpc
 import godot.annotation.Sync
@@ -9,7 +9,7 @@ import godot.annotation.Sync
 @GodotScript("RPCTests")
 class RpcTests : Node() {
 
-    @GodotMember
+    @Member
     var remoteSyncCalled: Boolean = false
 
     @Rpc(sync = Sync.SYNC)
@@ -17,7 +17,7 @@ class RpcTests : Node() {
         remoteSyncCalled = called
     }
 
-    @GodotMember
+    @Member
     fun triggerFunctionRemoteSyncCall() {
         rpc(::remoteSyncTest, true)
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/signal/SignalTest.kt b/harness/tests/src/main/kotlin/godot/tests/signal/SignalTest.kt
index 277b8a7b61..2c80202030 100644
--- a/harness/tests/src/main/kotlin/godot/tests/signal/SignalTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/signal/SignalTest.kt
@@ -1,7 +1,7 @@
 package godot.tests.signal
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.core.Signal0
 import godot.core.Signal1
@@ -29,7 +29,7 @@ class SignalTest : Node() {
 
     val twoParamSignalField = Signal2<String, SignalTest>("twoParamSignalField","str", "inv")
 
-    @GodotMember
+    @Member
     var otherScript = OtherScript()
 
     override fun _ready() {
@@ -68,10 +68,10 @@ class SignalTest : Node() {
     val signalWithMultipleTargets by signal1<Vector2>("vector2")
 
     //To store values emitted by signals
-    @GodotMember
+    @Member
     var array: VariantArray<Vector2> = VariantArray()
 
-    @GodotMember
+    @Member
     fun targetFunctionOne(vector2: Vector2) {
         array.append(vector2)
         //call GodotAPI to insert different parameters in the stack.
@@ -83,7 +83,7 @@ class SignalTest : Node() {
     }
 
 
-    @GodotMember
+    @Member
     fun targetFunctionTwo(vector2: Vector2) {
         array.append(vector2)
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/static/CallStaticTest.kt b/harness/tests/src/main/kotlin/godot/tests/static/CallStaticTest.kt
index ef643a5215..6b61ae0247 100644
--- a/harness/tests/src/main/kotlin/godot/tests/static/CallStaticTest.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/static/CallStaticTest.kt
@@ -3,13 +3,13 @@ package godot.tests.static
 import godot.DirAccess
 import godot.Node
 import godot.ProjectSettings
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 
 @GodotScript
 class CallStaticTest: Node() {
 
-    @GodotMember
+    @Member
     fun testStaticCall(): Boolean {
         return DirAccess.dirExistsAbsolute(ProjectSettings.globalizePath("res://scripts"))
     }
diff --git a/harness/tests/src/main/kotlin/godot/tests/subpackage/OtherScript.kt b/harness/tests/src/main/kotlin/godot/tests/subpackage/OtherScript.kt
index aebb7f496c..6a3976e891 100644
--- a/harness/tests/src/main/kotlin/godot/tests/subpackage/OtherScript.kt
+++ b/harness/tests/src/main/kotlin/godot/tests/subpackage/OtherScript.kt
@@ -1,22 +1,22 @@
 package godot.tests.subpackage
 
 import godot.Node
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 
 @GodotScript
 class OtherScript : Node() {
-    @GodotMember
+    @Member
     fun hookNoParam() {
         println("Hook was called with no param.")
     }
 
-    @GodotMember
+    @Member
     fun hookOneParam(b: Boolean) {
         println("Hook was called with parameter: $b")
     }
 
-    @GodotMember
+    @Member
     fun hookTwoParam(str: String, inv: Node) {
         println("Hook was called with parameters: $str, $inv")
     }
diff --git a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/GodotMemberAnnotation.kt b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/GodotMemberAnnotation.kt
index 1b51fd98ac..1673bc1193 100644
--- a/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/GodotMemberAnnotation.kt
+++ b/kt/entry-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/model/GodotMemberAnnotation.kt
@@ -1,3 +1,3 @@
 package godot.entrygenerator.model
 
-class GodotMemberAnnotation(override val symbolProcessorSource: Any) : FunctionAnnotation
+class MemberAnnotation(override val symbolProcessorSource: Any) : FunctionAnnotation
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt
index 0500d29e0a..3a906cbb03 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotatedExt.kt
@@ -3,7 +3,7 @@ package godot.annotation.processor.ext
 import com.google.devtools.ksp.isAnnotationPresent
 import com.google.devtools.ksp.symbol.KSAnnotated
 import com.google.devtools.ksp.symbol.KSAnnotation
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import kotlin.reflect.KClass
 
@@ -33,5 +33,5 @@ fun <T : Annotation> KSAnnotation.hasAnnotation(annotationClass: KClass<T>, alre
 
 fun KSAnnotated.hasRegistrationAnnotation(): Boolean {
     return hasAnnotation(GodotScript::class)
-        || hasAnnotation(GodotMember::class)
+        || hasAnnotation(Member::class)
 }
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt
index 2390c384c0..68e056006b 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksAnnotationExt.kt
@@ -12,7 +12,7 @@ import godot.annotation.EnumFlag
 import godot.annotation.EnumTypeHint
 import godot.annotation.ExpEasing
 import godot.annotation.Export
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.annotation.IntFlag
 import godot.annotation.MultilineText
@@ -27,7 +27,7 @@ import godot.entrygenerator.model.ExportAnnotation
 import godot.entrygenerator.model.FileHintAnnotation
 import godot.entrygenerator.model.GodotAnnotation
 import godot.entrygenerator.model.GodotBaseTypeAnnotation
-import godot.entrygenerator.model.GodotMemberAnnotation
+import godot.entrygenerator.model.MemberAnnotation
 import godot.entrygenerator.model.GodotScriptAnnotation
 import godot.entrygenerator.model.IntFlagHintAnnotation
 import godot.entrygenerator.model.MultilineTextHintAnnotation
@@ -92,15 +92,15 @@ internal fun KSAnnotation.mapToAnnotation(parentDeclaration: KSDeclaration): Lis
                 symbolProcessorSource = this
             )
         )
-        GodotMember::class.qualifiedName -> listOf(
-            GodotMemberAnnotation(this)
+        Member::class.qualifiedName -> listOf(
+            MemberAnnotation(this)
         )
         Tool::class.qualifiedName -> listOf(
             ToolAnnotation(this)
         )
         Export::class.qualifiedName -> listOf(
             ExportAnnotation(this),
-            GodotMemberAnnotation(this),
+            MemberAnnotation(this),
         )
         Rpc::class.qualifiedName -> listOf(
             RpcAnnotation(
@@ -110,7 +110,7 @@ internal fun KSAnnotation.mapToAnnotation(parentDeclaration: KSDeclaration): Lis
                 transferChannel = rpcChannel,
                 symbolProcessorSource = this
             ),
-            GodotMemberAnnotation(this),
+            MemberAnnotation(this),
         )
         "godot.annotation.GodotBaseType" -> listOf(
             GodotBaseTypeAnnotation(this) //is internal
@@ -137,7 +137,7 @@ internal fun KSAnnotation.mapToAnnotation(parentDeclaration: KSDeclaration): Lis
             listOf(
                 EnumFlagHintStringAnnotation(enumValueNames = enumValueNames, source = this),
                 ExportAnnotation(this),
-                GodotMemberAnnotation(this),
+                MemberAnnotation(this),
             )
         }
         IntFlag::class.qualifiedName -> listOf(
@@ -147,42 +147,42 @@ internal fun KSAnnotation.mapToAnnotation(parentDeclaration: KSDeclaration): Lis
                 this
             ),
             ExportAnnotation(this),
-            GodotMemberAnnotation(this),
+            MemberAnnotation(this),
         )
         MultilineText::class.qualifiedName -> listOf(
             MultilineTextHintAnnotation(this),
             ExportAnnotation(this),
-            GodotMemberAnnotation(this),
+            MemberAnnotation(this),
         )
         PlaceHolderText::class.qualifiedName -> listOf(
             PlaceHolderTextHintAnnotation(this),
             ExportAnnotation(this),
-            GodotMemberAnnotation(this),
+            MemberAnnotation(this),
         )
         ColorNoAlpha::class.qualifiedName -> listOf(
             ColorNoAlphaHintAnnotation(this),
             ExportAnnotation(this),
-            GodotMemberAnnotation(this),
+            MemberAnnotation(this),
         )
         godot.annotation.IntRange::class.qualifiedName -> listOf(
             provideRangeHintAnnotation(-1),
             ExportAnnotation(this),
-            GodotMemberAnnotation(this),
+            MemberAnnotation(this),
         )
         godot.annotation.LongRange::class.qualifiedName -> listOf(
             provideRangeHintAnnotation(-1L),
             ExportAnnotation(this),
-            GodotMemberAnnotation(this),
+            MemberAnnotation(this),
         )
         godot.annotation.FloatRange::class.qualifiedName -> listOf(
             provideRangeHintAnnotation(-1f),
             ExportAnnotation(this),
-            GodotMemberAnnotation(this),
+            MemberAnnotation(this),
         )
         godot.annotation.DoubleRange::class.qualifiedName -> listOf(
             provideRangeHintAnnotation(-1.0),
             ExportAnnotation(this),
-            GodotMemberAnnotation(this),
+            MemberAnnotation(this),
         )
         EnumTypeHint::class.qualifiedName -> emptyList()
         ExpEasing::class.qualifiedName -> {
@@ -196,7 +196,7 @@ internal fun KSAnnotation.mapToAnnotation(parentDeclaration: KSDeclaration): Lis
                     source = this
                 ),
                 ExportAnnotation(this),
-                GodotMemberAnnotation(this),
+                MemberAnnotation(this),
             )
         }
         godot.annotation.File::class.qualifiedName -> {
@@ -211,7 +211,7 @@ internal fun KSAnnotation.mapToAnnotation(parentDeclaration: KSDeclaration): Lis
                     source = this
                 ),
                 ExportAnnotation(this),
-                GodotMemberAnnotation(this),
+                MemberAnnotation(this),
             )
         }
         Dir::class.qualifiedName -> {
@@ -224,7 +224,7 @@ internal fun KSAnnotation.mapToAnnotation(parentDeclaration: KSDeclaration): Lis
                     source = this
                 ),
                 ExportAnnotation(this),
-                GodotMemberAnnotation(this),
+                MemberAnnotation(this),
             )
         }
         else -> emptyList()
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
index 5a6aa384dd..d5754d456d 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksClassDeclarationExt.kt
@@ -10,7 +10,7 @@ import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSFunctionDeclaration
 import com.google.devtools.ksp.symbol.KSPropertyDeclaration
 import godot.annotation.GodotApiMember
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.processor.Settings
 import godot.entrygenerator.model.ClassAnnotation
 import godot.entrygenerator.model.Clazz
@@ -29,7 +29,8 @@ internal fun KSClassDeclaration.mapToClazz(
         "Qualified name for class declaration of a registered type or it's super types cannot be null! KSClassDeclaration: $this"
     }
     val supertypeDeclarations = getAllSuperTypes()
-        .mapNotNull { it.declaration as? KSClassDeclaration } //we're only interested in classes not interfaces
+        .mapNotNull { it.declaration as? KSClassDeclaration }
+        .filter { it.classKind == ClassKind.CLASS } //we're only interested in classes not interfaces
         .map { it.mapToClazz(settings) }
         .toList()
     val mappedAnnotations = annotations
@@ -39,7 +40,7 @@ internal fun KSClassDeclaration.mapToClazz(
 
     val registeredFunctions = getAllFunctions()
         .filter { function ->
-            function.hasAnnotation(GodotMember::class) || function.overridesApiFunction() || function.overridesRegisteredFunction()
+            function.hasAnnotation(Member::class) || function.overridesApiFunction() || function.overridesRegisteredFunction()
         }
         .mapNotNull { it.mapToRegisteredFunction(this, settings) }
         .toList()
@@ -50,23 +51,19 @@ internal fun KSClassDeclaration.mapToClazz(
         .filter { property ->
             property.hasRegistrationAnnotation() || property.overridesRegisteredProperty()
         }
+        .filter { property -> !property.isSignal() }
         .map {
             it.mapToRegisteredProperty(settings)
         }
         .toList()
     val registeredSignals = allProperties
         .filter { property ->
-            property
-                .type
-                .resolve()
-                .declaration
-                .qualifiedName
-                ?.asString()
-                ?.startsWith("$godotCorePackage.${GodotKotlinJvmTypes.signal}") == true
-                && !property.hasAnnotation(GodotApiMember::class)
+            property.isSignal()
         }
         .map { it.mapToRegisteredSignal(declaredProperties.toList(), settings) }
         .toList()
+        .toList()
+
 
     val shouldBeRegistered = (classKind != ClassKind.ANNOTATION_CLASS && hasRegistrationAnnotation()) ||
         isAbstractAndContainsRegisteredMembers(registeredFunctions, registeredProperties, registeredSignals) ||
@@ -80,7 +77,7 @@ internal fun KSClassDeclaration.mapToClazz(
         val registeredConstructors = getConstructors()
             .filter { it.isPublic() }
             .filter { constructor ->
-                constructor.hasAnnotation(GodotMember::class) ||
+                constructor.hasAnnotation(Member::class) ||
                     constructor.parameters.isEmpty()
             }
             .map { it.mapToRegisteredConstructor(settings) }
@@ -114,6 +111,15 @@ internal fun KSClassDeclaration.mapToClazz(
     }
 }
 
+private fun KSPropertyDeclaration.isSignal() = (this
+    .type
+    .resolve()
+    .declaration
+    .qualifiedName
+    ?.asString()
+    ?.startsWith("$godotCorePackage.${GodotKotlinJvmTypes.signal}") == true
+    && !this.hasAnnotation(GodotApiMember::class))
+
 internal fun KSClassDeclaration.isAbstractAndContainsRegisteredMembers(
     registeredFunctions: List<RegisteredFunction>,
     registeredProperties: List<RegisteredProperty>,
@@ -154,9 +160,9 @@ private fun KSFunctionDeclaration.overridesApiFunction(isOveridee: Boolean = fal
 }
 
 private fun KSFunctionDeclaration.overridesRegisteredFunction(): Boolean {
-    return hasAnnotation(GodotMember::class) || (findOverridee() as? KSFunctionDeclaration)?.overridesRegisteredFunction() == true
+    return hasAnnotation(Member::class) || (findOverridee() as? KSFunctionDeclaration)?.overridesRegisteredFunction() == true
 }
 
 private fun KSPropertyDeclaration.overridesRegisteredProperty(): Boolean {
-    return hasAnnotation(GodotMember::class) || findOverridee()?.overridesRegisteredProperty() == true
+    return hasAnnotation(Member::class) || findOverridee()?.overridesRegisteredProperty() == true
 }
diff --git a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt
index 73c1a7dbc0..250ce840a6 100644
--- a/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt
+++ b/kt/entry-generation/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/visitor/RegistrationAnnotationVisitor.kt
@@ -3,7 +3,7 @@ package godot.annotation.processor.visitor
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSFile
 import com.google.devtools.ksp.symbol.KSVisitorVoid
-import godot.annotation.GodotMember
+import godot.annotation.Member
 import godot.annotation.GodotScript
 import godot.annotation.processor.Settings
 import godot.annotation.processor.ext.hasCompilationErrors
@@ -13,7 +13,7 @@ import godot.entrygenerator.model.RegisteredClass
 import godot.entrygenerator.model.SourceFile
 
 /**
- * Collects [GodotScript], [GodotMember] annotations
+ * Collects [GodotScript], [Member] annotations
  * for registrar generation and entry generation
  */
 internal class RegistrationAnnotationVisitor(
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt b/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt
index c6ef12fb66..9a3a145fb7 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/Export.kt
@@ -14,5 +14,5 @@ package godot.annotation
     AnnotationTarget.ANNOTATION_CLASS,
 )
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Member
 annotation class Export
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/GodotMember.kt b/kt/godot-library/src/main/kotlin/godot/annotation/Member.kt
similarity index 94%
rename from kt/godot-library/src/main/kotlin/godot/annotation/GodotMember.kt
rename to kt/godot-library/src/main/kotlin/godot/annotation/Member.kt
index a3de93f6c4..285d6f02a5 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/GodotMember.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/Member.kt
@@ -14,4 +14,4 @@ package godot.annotation
     AnnotationTarget.ANNOTATION_CLASS
 )
 @Retention(AnnotationRetention.RUNTIME)
-annotation class GodotMember
+annotation class Member
diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/Rpc.kt b/kt/godot-library/src/main/kotlin/godot/annotation/Rpc.kt
index 3f43d53478..37ba7a8527 100644
--- a/kt/godot-library/src/main/kotlin/godot/annotation/Rpc.kt
+++ b/kt/godot-library/src/main/kotlin/godot/annotation/Rpc.kt
@@ -11,7 +11,7 @@ package godot.annotation
  */
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
-@GodotMember
+@Member
 annotation class Rpc(
     val rpcMode: RpcMode = RpcMode.AUTHORITY,
     val sync: Sync = Sync.NO_SYNC,
diff --git a/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt b/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt
index 6b73b8f52d..215d9ef0f6 100644
--- a/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt
+++ b/kt/godot-library/src/main/kotlin/godot/gen/godot/RefCounted.kt
@@ -18,12 +18,6 @@ import kotlin.Int
 import kotlin.Long
 import kotlin.Suppress
 import kotlin.Unit
-import godot.util.VoidPtr
-import kotlin.Boolean
-import kotlin.Int
-import kotlin.Long
-import kotlin.Suppress
-import kotlin.Unit
 
 /**
  * Base class for any object that keeps a reference count. [Resource] and many other helper objects
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/data/model/annotations.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/data/model/annotations.kt
index a9acaf01e7..6a752e45a7 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/data/model/annotations.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/data/model/annotations.kt
@@ -5,7 +5,7 @@ import godot.tools.common.constants.godotAnnotationPackage
 
 const val GODOT_SCRIPT_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotScript}"
 const val TOOL_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.tool}"
-const val GODOT_MEMBER_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotMember}"
+const val GODOT_MEMBER_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.member}"
 const val GODOT_API_MEMBER_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotApiMemeber}"
 const val EXPORT_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.export}"
 const val CORE_TYPE_LOCAL_COPY_ANNOTATION = "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.coreTypeLocalCopy}"
diff --git a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
index 1eb08e2eba..27485f4bfe 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
+++ b/kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/extension/psiElementExt.kt
@@ -61,7 +61,7 @@ private fun KtFunction.overridesRegistered(): Boolean {
 
 private fun KtAnnotated.hasRegistrationAnnotation(): Boolean {
     return this.resolveAllAnnotationsRecursively().any {
-        it.fqName?.asString() == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotMember}"
+        it.fqName?.asString() == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.member}"
             || it.fqName?.asString() == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotScript}"
     }
 }
@@ -96,7 +96,7 @@ private fun PsiModifierListOwner.hasRegistrationAnnotation(): Boolean {
 
 private fun PsiAnnotation.isRegistrationAnnotation(alreadyResolvedAnnotations: MutableList<PsiAnnotation> = mutableListOf()): Boolean {
     return this.qualifiedName == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotScript}" ||
-        this.qualifiedName == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.godotMember}" ||
+        this.qualifiedName == "$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.member}" ||
         run {
             val annotationsOnAnnotation = this.resolveAnnotationType()?.annotations ?: return false
             annotationsOnAnnotation
diff --git a/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties b/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
index 1317e7eead..af19cd98e0 100644
--- a/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
+++ b/kt/plugins/godot-intellij-plugin/src/main/resources/messages/generalLabels.properties
@@ -58,15 +58,15 @@ This warning is experimental! If you encounter any false positives, please write
 quickFix.class.alreadyRegistered.familyName=Show classes registered with same name
 quickFix.class.alreadyRegistered.popup.title=Jump to class
 quickFix.class.notRegistered.familyName=Add @GodotScript annotation
-quickFix.property.notRegistered.familyName=Add @GodotMember annotation
+quickFix.property.notRegistered.familyName=Add @Member annotation
 quickFix.property.notExported.familyName=Add @Export annotation
 quickFix.property.removeExportAnnotation.familyName=Remove @Export annotation
-quickFix.function.notificationFunctionNotRegistered.familyName=Add @GodotMember annotation
+quickFix.function.notificationFunctionNotRegistered.familyName=Add @Member annotation
 quickFix.function.rpcTransferModeIgnoresChannel.familyName=Remove channel parameter
-quickFix.function.connectedFunctionNotRegistered.familyName=Add @GodotMember annotation
+quickFix.function.connectedFunctionNotRegistered.familyName=Add @Member annotation
 quickFix.function.connectedFunctionHasNoRpcAnnotationRegistered.familyName=Add @Rpc annotation
 quickFix.function.connectedFunctionsRpcAnnotationHasRpcModeDisabled.familyName=Remove RpcMode.DISABLED from target's @Rpc annotation
-quickFix.property.connectedPropertyNotRegistered.familyName=Add @GodotMember annotation
+quickFix.property.connectedPropertyNotRegistered.familyName=Add @Member annotation
 quickFix.property.mutability.familyName=Make property mutable
 notification.property.mutability.error.title=Property Quick Fix
 notification.property.mutability.error.content=Could not change the mutability of property {0}. Change it manually
diff --git a/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt b/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt
index 2ee51909b1..104184e1b7 100644
--- a/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt
+++ b/kt/tools-common/src/main/kotlin/godot/tools/common/constants/Classes.kt
@@ -48,7 +48,7 @@ object GodotKotlinJvmTypes {
         const val coreTypeLocalCopy = "CoreTypeLocalCopy"
 
         const val godotScript = "GodotScript"
-        const val godotMember = "GodotMember"
+        const val member = "Member"
 
         const val tool = "Tool"
         const val export = "Export"