Merge pull request #15 from limbonaut/gdextension

Implement GDExtension support

.github/actions/init-version-gdext/action.yml

@@ -0,0 +1,24 @@
+name: Setup version
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set GDEXTENSION_VERSION & LIMBOAI_VERSION
+      shell: bash
+      run: |
+        cd godot-cpp
+        GDEXTENSION_VERSION=$( (git describe --tags --exact-match HEAD || git rev-parse --short HEAD) | sed 's/\(.*\)-\(.*\)/\1/g' )
+
+        if [[ ${GDEXTENSION_VERSION} == godot-* ]]; then
+           GDEXTENSION_VERSION=${GDEXTENSION_VERSION#"godot-"}
+        fi
+
+        echo "GDEXTENSION_VERSION=${GDEXTENSION_VERSION}" >> "$GITHUB_ENV"
+
+        cd ../limboai
+        echo "LIMBOAI_VERSION=$( (git describe --tags --exact-match HEAD || git rev-parse --short HEAD) | sed 's/\(.*\)-\(.*\)/\1/g' )" >> "$GITHUB_ENV"
+
+    - name: Set NAME_PREFIX
+      shell: bash
+      run: echo "NAME_PREFIX=gdextension-${GDEXTENSION_VERSION}.limboai+${LIMBOAI_VERSION}" >> "$GITHUB_ENV"
+

.github/workflows/gdextension.yml

@@ -0,0 +1,209 @@
+name: 🔌 GDExtension
+on:
+  workflow_call:
+    inputs:
+      godot-cpp-treeish:
+        description: A tag, branch or commit hash in the godot-cpp repository.
+        type: string
+        default: 4.2
+      limboai-treeish:
+        description: A tag, branch or commit hash in the LimboAI repository.
+        type: string
+        default: master
+      test-build:
+        description: Should we perform only a limited number of test builds?
+        type: boolean
+        default: false
+
+  workflow_dispatch:
+    inputs:
+      godot-cpp-treeish:
+        description: A tag, branch or commit hash in the godot-cpp repository.
+        type: string
+        default: 4.2
+      limboai-treeish:
+        description: A tag, branch or commit hash in the LimboAI repository.
+        type: string
+        default: master
+      test-build:
+        description: Should we perform only a limited number of test builds?
+        type: boolean
+        default: false
+
+# Global Settings
+env:
+  SCONS_CACHE_LIMIT: 4096
+  SCONSFLAGS: dev_build=no debug_symbols=no
+
+jobs:
+  gdextension:
+    runs-on: ${{ matrix.opts.runner }}
+    name: ${{ matrix.opts.name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        opts:
+          - name: 🐧 Linux (x86_64, release)
+            runner: ubuntu-20.04
+            platform: linux
+            target: template_release
+            arch: x86_64
+            should-build: true
+
+          - name: 🐧 Linux (x86_64, debug)
+            runner: ubuntu-20.04
+            platform: linux
+            target: editor
+            arch: x86_64
+            should-build: true
+
+          - name: 🪟 Windows (x86_64, release)
+            runner: windows-latest
+            platform: windows
+            target: template_release
+            arch: x86_64
+            should-build: true
+
+          - name: 🪟 Windows (x86_64, debug)
+            runner: windows-latest
+            platform: windows
+            target: editor
+            arch: x86_64
+            should-build: true
+
+          - name: 🍎 macOS (universal, release)
+            runner: macos-latest
+            platform: macos
+            target: template_release
+            arch: universal
+            should-build: true
+
+          - name: 🍎 macOS (universal, debug)
+            runner: macos-latest
+            platform: macos
+            target: editor
+            arch: universal
+            should-build: true
+
+        exclude:
+          - { opts: {should-build: false }}
+
+    env:
+      BIN: liblimboai.${{matrix.opts.platform}}.${{matrix.opts.target}}.${{matrix.opts.arch}}
+
+    steps:
+      - name: Clone godot-cpp
+        uses: actions/checkout@v4
+        with:
+          repository: godotengine/godot-cpp
+          fetch-tags: true
+          path: godot-cpp
+          ref: ${{ inputs.godot-cpp-treeish }}
+
+      - name: Clone LimboAI module
+        uses: actions/checkout@v4
+        with:
+          path: limboai
+          fetch-tags: true
+          ref: ${{ inputs.limboai-treeish }}
+
+      # Inits GDEXTENSION_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
+      - uses: ./limboai/.github/actions/init-version-gdext
+
+      - name: Set up Linux buildroot x86_64
+        if: matrix.opts.platform == 'linux' && matrix.opts.arch == 'x86_64'
+        run: |
+          wget https://download.tuxfamily.org/godotengine/toolchains/linux/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
+          tar -xjf x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
+          mv x86_64-godot-linux-gnu_sdk-buildroot buildroot
+          cd buildroot
+          ./relocate-sdk.sh
+          cd ..
+
+      - name: Set up Linux buildroot x86_32
+        if: matrix.opts.platform == 'linux' && matrix.opts.arch == 'x86_32'
+        run: |
+          wget https://download.tuxfamily.org/godotengine/toolchains/linux/i686-godot-linux-gnu_sdk-buildroot.tar.bz2
+          tar -xjf i686-godot-linux-gnu_sdk-buildroot.tar.bz2
+          mv i686-godot-linux-gnu_sdk-buildroot buildroot
+          cd buildroot
+          ./relocate-sdk.sh
+          cd ..
+
+      - name: Set up Python 3.x
+        if: matrix.opts.platform == 'windows' || matrix.opts.platform == 'macos'
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+          architecture: 'x64'
+
+      - name: Set up scons
+        if: matrix.opts.platform == 'windows' || matrix.opts.platform == 'macos'
+        run: |
+          python -c "import sys; print(sys.version)"
+          python -m pip install scons==4.4.0
+          python --version
+          scons --version
+
+      - name: Set up MSVC problem matcher on Windows
+        if: matrix.opts.platform == 'windows'
+        uses: ammaraskar/msvc-problem-matcher@master
+
+      - name: Set up scons cache
+        uses: actions/cache@v3
+        with:
+          path: ${{github.workspace}}/.scons_cache/
+          key: ${{env.BIN}}-${{inputs.godot-cpp-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
+          restore-keys: |
+            ${{env.BIN}}-${{inputs.godot-cpp-treeish}}-${{inputs.limboai-treeish}}-${{env.LIMBOAI_VERSION}}
+            ${{env.BIN}}-${{inputs.godot-cpp-treeish}}-${{inputs.limboai-treeish}}
+            ${{env.BIN}}-${{inputs.godot-cpp-treeish}}
+
+      - name: Setup project structure for GDExtension
+        shell: bash
+        run: |
+          python ./limboai/gdextension/update_icons.py
+          mkdir -p demo/addons/limboai/bin
+          mv limboai/icons demo/addons/limboai/
+          cp limboai/gdextension/SConstruct SConstruct
+          cp limboai/gdextension/limboai.gdextension demo/addons/limboai/bin
+          echo "---"
+          ls -l
+          ls -l -R ./demo/
+
+      - name: Compilation
+        shell: bash
+        env:
+          SCONS_CACHE: ${{github.workspace}}/.scons_cache/
+        run: |
+          PATH=${GITHUB_WORKSPACE}/buildroot/bin:$PATH
+          scons platform=${{matrix.opts.platform}} target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} ${{env.SCONSFLAGS}}
+
+      - name: Prepare artifact
+        shell: bash
+        run: |
+          mkdir out
+          mv demo/addons/ out/
+          rm -f out/addons/limboai/bin/*.{exp,lib,pdb}
+          ls -R out/
+
+      - name: Strip lib
+        if: matrix.opts.platform != 'windows'
+        run: |
+          ls -l -R out/addons/limboai/bin/
+          echo "---"
+          if [ "$RUNNER_OS" == "macOS" ]; then
+            strip -u out/addons/limboai/bin/liblimboai*/liblimboai*
+          else
+            strip out/addons/limboai/bin/liblimboai*
+          fi
+          echo "---"
+          ls -l -R out/addons/limboai/bin/
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        env:
+          NAME: ${{env.NAME_PREFIX}}
+        with:
+          name: ${{ env.NAME }}
+          path: out/*

.github/workflows/test_builds.yml

@@ -10,11 +10,6 @@ on:
       - "**/*.png"
       - "demo/*"
       - "doc/*"
-    inputs:
-      godot-treeish:
-        description: A tag, branch or commit hash in the Godot repository.
-        type: string
-        default: 4.2.1-stable
 
   pull_request:
     branches: [ master ]
@@ -23,11 +18,12 @@ on:
       - "LICENSE"
       - "**/*.png"
       - "demo/*"
-    inputs:
+      - "doc/*"
-      godot-treeish:
+
-        description: A tag, branch or commit hash in the Godot repository.
+# Global Settings.
-        type: string
+env:
-        default: 4.2.1-stable
+  GODOT_REF: "4.2.1-stable"
+  GODOT_CPP_REF: "4.2"
 
 jobs:
   unit-tests:
@@ -45,7 +41,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: godotengine/godot
-          ref: ${{ inputs.godot-treeish }}
+          ref: ${{ env.GODOT_REF }}
 
       - name: Clone LimboAI module
         uses: actions/checkout@v4
@@ -67,11 +63,11 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{env.BIN}}-${{inputs.godot-treeish}}-${{github.ref}}-${{github.sha}}
+          key: ${{env.BIN}}-${{env.GODOT_REF}}-${{github.ref}}-${{github.sha}}
           restore-keys: |
-            ${{env.BIN}}-${{inputs.godot-treeish}}-${{github.ref}}-${{github.sha}}
+            ${{env.BIN}}-${{env.GODOT_REF}}-${{github.ref}}-${{github.sha}}
-            ${{env.BIN}}-${{inputs.godot-treeish}}-${{github.ref}}
+            ${{env.BIN}}-${{env.GODOT_REF}}-${{github.ref}}
-            ${{env.BIN}}-${{inputs.godot-treeish}}
+            ${{env.BIN}}-${{env.GODOT_REF}}
         continue-on-error: true
 
       - name: Set up Python 3.x
@@ -107,26 +103,50 @@ jobs:
         run: |
           bin/${{ env.BIN }} --test --headless
 
+  cache-env:
+    runs-on: ubuntu-latest
+    outputs:
+      godot-ref: ${{ steps.cache-env.outputs.godot-ref }}
+      godot-cpp-ref: ${{ steps.cache-env.outputs.godot-cpp-ref }}
+    steps:
+      - name: Cache env
+        id: cache-env
+        run: |
+          echo "godot-ref=${GODOT_REF}" >> "$GITHUB_OUTPUT"
+          echo "godot-cpp-ref=${GODOT_CPP_REF}" >> "$GITHUB_OUTPUT"
+
   linux-test-build:
-    name: 🐧 Linux test build
+    name: 🐧 Linux
+    needs: cache-env
     uses: ./.github/workflows/linux.yml
     with:
-      godot-treeish: ${{ inputs.godot-treeish }}
+      godot-treeish: ${{ needs.cache-env.outputs.godot-ref }}
       limboai-treeish: ${{ github.sha }}
       test-build: true
 
   windows-test-build:
-    name: 🪟 Windows test build
+    name: 🪟 Windows
+    needs: cache-env
     uses: ./.github/workflows/windows.yml
     with:
-      godot-treeish: ${{ inputs.godot-treeish }}
+      godot-treeish: ${{ needs.cache-env.outputs.godot-ref }}
       limboai-treeish: ${{ github.sha }}
       test-build: true
 
   macos-test-build:
-    name: 🍎 macOS test build
+    name: 🍎 macOS
+    needs: cache-env
     uses: ./.github/workflows/macos.yml
     with:
-      godot-treeish: ${{ inputs.godot-treeish }}
+      godot-treeish: ${{ needs.cache-env.outputs.godot-ref }}
+      limboai-treeish: ${{ github.sha }}
+      test-build: true
+
+  gdextension:
+    name: 🔌 GDExtension
+    needs: cache-env
+    uses: ./.github/workflows/gdextension.yml
+    with:
+      godot-cpp-treeish: ${{ needs.cache-env.outputs.godot-cpp-ref }}
       limboai-treeish: ${{ github.sha }}
       test-build: true

.gitignore

@@ -1,3 +1,7 @@
+# LimboAI-specific
+demo/addons/
+icons/*.import
+
 # Godot auto generated files
 *.gen.*
 .import/

SCsub

@@ -5,6 +5,8 @@ Import("env_modules")
 
 module_env = env.Clone()
 
+module_env.Append(CPPDEFINES = ['LIMBOAI_MODULE'])
+
 module_env.add_source_files(env.modules_sources, "*.cpp")
 module_env.add_source_files(env.modules_sources, "blackboard/*.cpp")
 module_env.add_source_files(env.modules_sources, "blackboard/bb_param/*.cpp")

blackboard/bb_param/bb_aabb.h

@@ -13,7 +13,6 @@
 #define BB_AABB_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBAabb : public BBParam {
 	GDCLASS(BBAabb, BBParam);

blackboard/bb_param/bb_array.h

@@ -13,7 +13,6 @@
 #define BB_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBArray : public BBParam {
 	GDCLASS(BBArray, BBParam);

blackboard/bb_param/bb_basis.h

@@ -13,7 +13,6 @@
 #define BB_BASIS_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBBasis : public BBParam {
 	GDCLASS(BBBasis, BBParam);

blackboard/bb_param/bb_bool.h

@@ -13,7 +13,6 @@
 #define BB_BOOL_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBBool : public BBParam {
 	GDCLASS(BBBool, BBParam);

blackboard/bb_param/bb_byte_array.h

@@ -13,7 +13,6 @@
 #define BB_BYTE_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBByteArray : public BBParam {
 	GDCLASS(BBByteArray, BBParam);

blackboard/bb_param/bb_color.h

@@ -13,7 +13,6 @@
 #define BB_COLOR_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBColor : public BBParam {
 	GDCLASS(BBColor, BBParam);

blackboard/bb_param/bb_color_array.h

@@ -13,7 +13,6 @@
 #define BB_COLOR_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBColorArray : public BBParam {
 	GDCLASS(BBColorArray, BBParam);

blackboard/bb_param/bb_dictionary.h

@@ -13,7 +13,6 @@
 #define BB_DICTIONARY_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBDictionary : public BBParam {
 	GDCLASS(BBDictionary, BBParam);

blackboard/bb_param/bb_float.h

@@ -13,7 +13,6 @@
 #define BB_FLOAT_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBFloat : public BBParam {
 	GDCLASS(BBFloat, BBParam);

blackboard/bb_param/bb_float_array.h

@@ -13,7 +13,6 @@
 #define BB_FLOAT_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBFloatArray : public BBParam {
 	GDCLASS(BBFloatArray, BBParam);

blackboard/bb_param/bb_int.h

@@ -13,7 +13,6 @@
 #define BB_INT_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBInt : public BBParam {
 	GDCLASS(BBInt, BBParam);

blackboard/bb_param/bb_int_array.h

@@ -13,7 +13,6 @@
 #define BB_INT_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBIntArray : public BBParam {
 	GDCLASS(BBIntArray, BBParam);

blackboard/bb_param/bb_node.cpp

@@ -10,9 +10,15 @@
  */
 
 #include "bb_node.h"
+
+#ifdef LIMBOAI_MODULE
 #include "core/error/error_macros.h"
-#include "core/variant/variant.h"
 #include "scene/main/node.h"
+#endif // LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/node.hpp>
+#endif // LIMBOAI_GDEXTENSION
 
 Variant BBNode::get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard, const Variant &p_default) {
 	ERR_FAIL_COND_V(p_agent == nullptr, Variant());
@@ -28,7 +34,7 @@ Variant BBNode::get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard,
 	if (val.get_type() == Variant::NODE_PATH) {
 		Node *agent = Object::cast_to<Node>(p_agent);
 		ERR_FAIL_COND_V_MSG(agent == nullptr, Variant(), "BBNode: p_agent must be a Node.");
-		return agent->get_node(val);
+		return agent->get_node_or_null(val);
 	} else {
 		Object *obj = val;
 		if (unlikely(obj == nullptr && val.get_type() != Variant::NIL)) {

blackboard/bb_param/bb_node.h

@@ -13,7 +13,6 @@
 #define BB_NODE_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBNode : public BBParam {
 	GDCLASS(BBNode, BBParam);

blackboard/bb_param/bb_param.cpp

@@ -11,14 +11,20 @@
 
 #include "bb_param.h"
 
-#include "modules/limboai/util/limbo_utility.h"
+#include "../../util/limbo_utility.h"
 
+#ifdef LIMBOAI_MODULE
 #include "core/core_bind.h"
 #include "core/error/error_macros.h"
 #include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/variant/variant.h"
 #include "core/variant/variant_utility.h"
+#endif // LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+using namespace godot;
+#endif // LIMBOAI_GDEXTENSION
 
 VARIANT_ENUM_CAST(BBParam::ValueSource);
 
@@ -49,18 +55,22 @@ void BBParam::set_variable(const String &p_value) {
 	emit_changed();
 }
 
+#ifdef LIMBOAI_MODULE
 String BBParam::to_string() {
+#elif LIMBOAI_GDEXTENSION
+String BBParam::_to_string() {
+#endif
 	if (value_source == SAVED_VALUE) {
 		String s = saved_value.stringify();
 		switch (get_type()) {
 			case Variant::STRING: {
-				s = s.c_escape().quote();
+				s = "\"" + s.c_escape() + "\"";
 			} break;
 			case Variant::STRING_NAME: {
-				s = "&" + s.c_escape().quote();
+				s = "&\"" + s.c_escape() + "\"";
 			} break;
 			case Variant::NODE_PATH: {
-				s = "^" + s.c_escape().quote();
+				s = "^\"" + s.c_escape() + "\"";
 			} break;
 			default: {
 			} break;

blackboard/bb_param/bb_param.h

@@ -12,13 +12,22 @@
 #ifndef BB_PARAM_H
 #define BB_PARAM_H
 
-#include "modules/limboai/blackboard/blackboard.h"
+#include "../../blackboard/blackboard.h"
-#include "modules/limboai/util/limbo_utility.h"
+#include "../../util/limbo_utility.h"
 
+#ifdef LIMBOAI_MODULE
 #include "core/io/resource.h"
 #include "core/object/object.h"
 #include "core/typedefs.h"
 #include "core/variant/variant.h"
+#endif // LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/object.hpp>
+#include <godot_cpp/classes/resource.hpp>
+#include <godot_cpp/core/type_info.hpp>
+#include <godot_cpp/variant/variant.hpp>
+#endif // LIMBOAI_GDEXTENSION
 
 class BBParam : public Resource {
 	GDCLASS(BBParam, Resource);
@@ -42,8 +51,12 @@ protected:
 	static void _bind_methods();
 
 	_FORCE_INLINE_ void _assign_default_value() {
+#ifdef LIMBOAI_MODULE
 		Callable::CallError err;
 		Variant::construct(get_type(), saved_value, nullptr, 0, err);
+#elif LIMBOAI_GDEXTENSION
+		saved_value.clear();
+#endif
 	}
 
 	void _get_property_list(List<PropertyInfo> *p_list) const;
@@ -60,7 +73,11 @@ public:
 	void set_variable(const String &p_value);
 	String get_variable() const { return variable; }
 
+#ifdef LIMBOAI_MODULE
 	virtual String to_string() override;
+#elif LIMBOAI_GDEXTENSION
+	virtual String _to_string();
+#endif
 
 	virtual Variant get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard, const Variant &p_default = Variant());
 

blackboard/bb_param/bb_plane.h

@@ -13,7 +13,6 @@
 #define BB_PLANE_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBPlane : public BBParam {
 	GDCLASS(BBPlane, BBParam);

blackboard/bb_param/bb_quaternion.h

@@ -13,7 +13,6 @@
 #define BB_QUATERNION_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBQuaternion : public BBParam {
 	GDCLASS(BBQuaternion, BBParam);

blackboard/bb_param/bb_rect2.h

@@ -13,7 +13,6 @@
 #define BB_RECT2_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBRect2 : public BBParam {
 	GDCLASS(BBRect2, BBParam);

blackboard/bb_param/bb_rect2i.h

@@ -13,7 +13,6 @@
 #define BB_RECT2I_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBRect2i : public BBParam {
 	GDCLASS(BBRect2i, BBParam);

blackboard/bb_param/bb_string.h

@@ -13,7 +13,6 @@
 #define BB_STRING_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBString : public BBParam {
 	GDCLASS(BBString, BBParam);

blackboard/bb_param/bb_string_array.h

@@ -13,7 +13,6 @@
 #define BB_STRING_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBStringArray : public BBParam {
 	GDCLASS(BBStringArray, BBParam);

blackboard/bb_param/bb_string_name.h

@@ -13,7 +13,6 @@
 #define BB_STRING_NAME_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBStringName : public BBParam {
 	GDCLASS(BBStringName, BBParam);

blackboard/bb_param/bb_transform2d.h

@@ -13,7 +13,6 @@
 #define BB_TRANSFORM2D_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBTransform2D : public BBParam {
 	GDCLASS(BBTransform2D, BBParam);

blackboard/bb_param/bb_transform3d.h

@@ -13,7 +13,6 @@
 #define BB_TRANSFORM3D_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBTransform3D : public BBParam {
 	GDCLASS(BBTransform3D, BBParam);

blackboard/bb_param/bb_variant.cpp

@@ -10,8 +10,6 @@
  */
 
 #include "bb_variant.h"
-#include "core/object/object.h"
-#include "core/variant/variant.h"
 
 void BBVariant::set_type(Variant::Type p_type) {
 	if (type != p_type) {

blackboard/bb_param/bb_variant.h

@@ -13,8 +13,6 @@
 #define BB_VARIANT_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
-#include "core/variant/variant.h"
 
 class BBVariant : public BBParam {
 	GDCLASS(BBVariant, BBParam);

blackboard/bb_param/bb_vector2.h

@@ -13,7 +13,6 @@
 #define BB_VECTOR2_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBVector2 : public BBParam {
 	GDCLASS(BBVector2, BBParam);

blackboard/bb_param/bb_vector2_array.h

@@ -13,7 +13,6 @@
 #define BB_VECTOR2_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBVector2Array : public BBParam {
 	GDCLASS(BBVector2Array, BBParam);

blackboard/bb_param/bb_vector2i.h

@@ -13,7 +13,6 @@
 #define BB_VECTOR2I_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBVector2i : public BBParam {
 	GDCLASS(BBVector2i, BBParam);

blackboard/bb_param/bb_vector3.h

@@ -13,7 +13,6 @@
 #define BB_VECTOR3_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBVector3 : public BBParam {
 	GDCLASS(BBVector3, BBParam);

blackboard/bb_param/bb_vector3_array.h

@@ -13,7 +13,6 @@
 #define BB_VECTOR3_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBVector3Array : public BBParam {
 	GDCLASS(BBVector3Array, BBParam);

blackboard/bb_param/bb_vector3i.h

@@ -13,7 +13,6 @@
 #define BB_VECTOR3I_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBVector3i : public BBParam {
 	GDCLASS(BBVector3i, BBParam);

blackboard/bb_param/bb_vector4.h

@@ -13,7 +13,6 @@
 #define BB_VECTOR4_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBVector4 : public BBParam {
 	GDCLASS(BBVector4, BBParam);

blackboard/bb_param/bb_vector4i.h

@@ -13,7 +13,6 @@
 #define BB_VECTOR4I_H
 
 #include "bb_param.h"
-#include "core/object/object.h"
 
 class BBVector4i : public BBParam {
 	GDCLASS(BBVector4i, BBParam);

blackboard/blackboard.cpp

@@ -11,9 +11,20 @@
 
 #include "blackboard.h"
 
+#ifdef LIMBOAI_MODULE
 #include "core/error/error_macros.h"
 #include "core/variant/variant.h"
 #include "scene/main/node.h"
+#endif // LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/node.hpp>
+#include <godot_cpp/classes/ref.hpp>
+#include <godot_cpp/classes/ref_counted.hpp>
+#include <godot_cpp/core/object.hpp>
+#include <godot_cpp/variant/dictionary.hpp>
+using namespace godot;
+#endif
 
 Ref<Blackboard> Blackboard::top() const {
 	Ref<Blackboard> bb(this);
@@ -25,7 +36,7 @@ Ref<Blackboard> Blackboard::top() const {
 
 Variant Blackboard::get_var(const Variant &p_key, const Variant &p_default) const {
 	if (data.has(p_key)) {
-		return data.get_valid(p_key);
+		return data.get(p_key, Variant());
 	} else if (parent.is_valid()) {
 		return parent->get_var(p_key, p_default);
 	} else {
@@ -57,7 +68,7 @@ void Blackboard::prefetch_nodepath_vars(Node *p_node) {
 			}
 		}
 	}
-};
+}
 
 void Blackboard::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_data"), &Blackboard::get_data);
@@ -70,4 +81,4 @@ void Blackboard::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("erase_var", "p_key"), &Blackboard::erase_var);
 	ClassDB::bind_method(D_METHOD("prefetch_nodepath_vars", "p_node"), &Blackboard::prefetch_nodepath_vars);
 	ClassDB::bind_method(D_METHOD("top"), &Blackboard::top);
-}
+}

blackboard/blackboard.h

@@ -12,11 +12,22 @@
 #ifndef BLACKBOARD_H
 #define BLACKBOARD_H
 
+#ifdef LIMBOAI_MODULE
 #include "core/object/object.h"
 #include "core/object/ref_counted.h"
 #include "core/variant/dictionary.h"
 #include "core/variant/variant.h"
 #include "scene/main/node.h"
+#endif // LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/node.hpp>
+#include <godot_cpp/classes/ref.hpp>
+#include <godot_cpp/classes/ref_counted.hpp>
+#include <godot_cpp/core/object.hpp>
+#include <godot_cpp/variant/dictionary.hpp>
+using namespace godot;
+#endif // LIMBOAI_GDEXTENSION
 
 class Blackboard : public RefCounted {
 	GDCLASS(Blackboard, RefCounted);

bt/behavior_tree.cpp

@@ -11,10 +11,16 @@
 
 #include "behavior_tree.h"
 
+#ifdef LIMBOAI_MODULE
 #include "core/error/error_macros.h"
 #include "core/object/class_db.h"
 #include "core/templates/list.h"
 #include "core/variant/variant.h"
+#endif // ! LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+#include "godot_cpp/core/error_macros.hpp"
+#endif // ! LIMBOAI_GDEXTENSION
 
 Ref<BehaviorTree> BehaviorTree::clone() const {
 	Ref<BehaviorTree> copy = duplicate(false);
@@ -25,6 +31,12 @@ Ref<BehaviorTree> BehaviorTree::clone() const {
 	return copy;
 }
 
+void BehaviorTree::copy_other(const Ref<BehaviorTree> &p_other) {
+	ERR_FAIL_COND(p_other.is_null());
+	description = p_other->get_description();
+	root_task = p_other->get_root_task();
+}
+
 Ref<BTTask> BehaviorTree::instantiate(Node *p_agent, const Ref<Blackboard> &p_blackboard) const {
 	ERR_FAIL_COND_V_MSG(root_task == nullptr, memnew(BTTask), "Trying to instance a behavior tree with no valid root task.");
 	Ref<BTTask> inst = root_task->clone();
@@ -38,8 +50,9 @@ void BehaviorTree::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_root_task", "p_value"), &BehaviorTree::set_root_task);
 	ClassDB::bind_method(D_METHOD("get_root_task"), &BehaviorTree::get_root_task);
 	ClassDB::bind_method(D_METHOD("clone"), &BehaviorTree::clone);
+	ClassDB::bind_method(D_METHOD("copy_other", "p_other"), &BehaviorTree::copy_other);
 	ClassDB::bind_method(D_METHOD("instantiate", "p_agent", "p_blackboard"), &BehaviorTree::instantiate);
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "description", PROPERTY_HINT_MULTILINE_TEXT), "set_description", "get_description");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "root_task", PROPERTY_HINT_RESOURCE_TYPE, "BTTask", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "set_root_task", "get_root_task");
-}
+}

bt/behavior_tree.h

@@ -12,11 +12,18 @@
 #ifndef BEHAVIOR_TREE_H
 #define BEHAVIOR_TREE_H
 
-#include "core/io/resource.h"
-
-#include "modules/limboai/blackboard/blackboard.h"
 #include "tasks/bt_task.h"
 
+#ifdef LIMBOAI_MODULE
+#include "core/io/resource.h"
+#include "modules/limboai/blackboard/blackboard.h"
+#endif // LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/resource.hpp>
+using namespace godot;
+#endif // LIMBOAI_GDEXTENSION
+
 class BehaviorTree : public Resource {
 	GDCLASS(BehaviorTree, Resource);
 
@@ -28,7 +35,9 @@ protected:
 	static void _bind_methods();
 
 public:
+#ifdef LIMBOAI_MODULE
 	virtual bool editor_can_reload_from_file() override { return false; }
+#endif
 
 	void set_description(String p_value) {
 		description = p_value;
@@ -43,7 +52,8 @@ public:
 	Ref<BTTask> get_root_task() const { return root_task; }
 
 	Ref<BehaviorTree> clone() const;
+	void copy_other(const Ref<BehaviorTree> &p_other);
 	Ref<BTTask> instantiate(Node *p_agent, const Ref<Blackboard> &p_blackboard) const;
 };
 
-#endif // BEHAVIOR_TREE_H
+#endif // BEHAVIOR_TREE_H

bt/bt_player.cpp

@@ -11,10 +11,11 @@
 
 #include "bt_player.h"
 
-#include "modules/limboai/blackboard/blackboard.h"
+#include "../editor/debugger/limbo_debugger.h"
-#include "modules/limboai/editor/debugger/limbo_debugger.h"
+#include "../util/limbo_compat.h"
-#include "modules/limboai/util/limbo_string_names.h"
+#include "../util/limbo_string_names.h"
 
+#ifdef LIMBOAI_MODULE
 #include "core/config/engine.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/error/error_macros.h"
@@ -25,11 +26,26 @@
 #include "core/variant/variant.h"
 #include "main/performance.h"
 
+#define IS_DEBUGGER_ACTIVE() (EngineDebugger::is_active())
+#define GET_TICKS_USEC() (OS::get_singleton()->get_ticks_usec())
+
+#endif // ! LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/engine_debugger.hpp>
+#include <godot_cpp/classes/performance.hpp>
+#include <godot_cpp/classes/time.hpp>
+
+#define IS_DEBUGGER_ACTIVE() (EngineDebugger::get_singleton()->is_active())
+#define GET_TICKS_USEC() (Time::get_singleton()->get_ticks_usec())
+
+#endif // ! LIMBOAI_GDEXTENSION
+
 VARIANT_ENUM_CAST(BTPlayer::UpdateMode);
 
 void BTPlayer::_load_tree() {
 #ifdef DEBUG_ENABLED
-	if (tree_instance.is_valid() && EngineDebugger::is_active()) {
+	if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
 		LimboDebugger::get_singleton()->unregister_bt_instance(tree_instance, get_path());
 	}
 #endif
@@ -41,7 +57,7 @@ void BTPlayer::_load_tree() {
 	}
 	tree_instance = behavior_tree->instantiate(get_owner(), blackboard);
 #ifdef DEBUG_ENABLED
-	if (EngineDebugger::is_active()) {
+	if (IS_DEBUGGER_ACTIVE()) {
 		LimboDebugger::get_singleton()->register_bt_instance(tree_instance, get_path());
 	}
 #endif
@@ -74,7 +90,7 @@ void BTPlayer::update(double p_delta) {
 	}
 
 #ifdef DEBUG_ENABLED
-	double start = OS::get_singleton()->get_ticks_usec();
+	double start = GET_TICKS_USEC();
 #endif
 
 	if (active) {
@@ -86,7 +102,7 @@ void BTPlayer::update(double p_delta) {
 	}
 
 #ifdef DEBUG_ENABLED
-	double end = OS::get_singleton()->get_ticks_usec();
+	double end = GET_TICKS_USEC();
 	update_time_acc += (end - start);
 	update_time_n += 1.0;
 #endif
@@ -113,7 +129,7 @@ void BTPlayer::_set_monitor_performance(bool p_monitor_performance) {
 					String(itos(get_instance_id())).md5_text().substr(0, 4));
 		}
 		if (!perf->has_custom_monitor(monitor_id)) {
-			perf->add_custom_monitor(monitor_id, callable_mp(this, &BTPlayer::_get_mean_update_time_msec), Vector<Variant>());
+			PERFORMANCE_ADD_CUSTOM_MONITOR(monitor_id, callable_mp(this, &BTPlayer::_get_mean_update_time_msec));
 		}
 	} else if (monitor_id != StringName() && perf->has_custom_monitor(monitor_id)) {
 		perf->remove_custom_monitor(monitor_id);
@@ -130,7 +146,7 @@ double BTPlayer::_get_mean_update_time_msec() {
 	return 0.0;
 }
 
-#endif // DEBUG_ENABLED
+#endif // ! DEBUG_ENABLED
 
 void BTPlayer::_notification(int p_notification) {
 	switch (p_notification) {
@@ -155,16 +171,16 @@ void BTPlayer::_notification(int p_notification) {
 		} break;
 #ifdef DEBUG_ENABLED
 		case NOTIFICATION_ENTER_TREE: {
-			if (tree_instance.is_valid() && EngineDebugger::is_active()) {
+			if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
 				LimboDebugger::get_singleton()->register_bt_instance(tree_instance, get_path());
 			}
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
-			if (tree_instance.is_valid() && EngineDebugger::is_active()) {
+			if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
 				LimboDebugger::get_singleton()->unregister_bt_instance(tree_instance, get_path());
 			}
 		} break;
-#endif
+#endif // DEBUG_ENABLED
 	}
 }
 
@@ -205,7 +221,6 @@ void BTPlayer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_set_monitor_performance", "p_value"), &BTPlayer::_set_monitor_performance);
 	ClassDB::bind_method(D_METHOD("_get_monitor_performance"), &BTPlayer::_get_monitor_performance);
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "monitor_performance"), "_set_monitor_performance", "_get_monitor_performance");
-	ADD_PROPERTY_DEFAULT("monitor_performance", false);
 #endif // DEBUG_ENABLED
 }
 

bt/bt_player.h

@@ -12,19 +12,25 @@
 #ifndef BT_PLAYER_H
 #define BT_PLAYER_H
 
-#include "scene/main/node.h"
+#include "../blackboard/blackboard.h"
-
 #include "behavior_tree.h"
-#include "modules/limboai/blackboard/blackboard.h"
 #include "tasks/bt_task.h"
 
+#ifdef LIMBOAI_MODULE
+#include "scene/main/node.h"
+#endif
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/node.hpp>
+#endif
+
 class BTPlayer : public Node {
 	GDCLASS(BTPlayer, Node);
 
 public:
 	enum UpdateMode : unsigned int {
 		IDLE, // automatically call update() during NOTIFICATION_PROCESS
-		PHYSICS, //# automatically call update() during NOTIFICATION_PHYSICS
+		PHYSICS, // automatically call update() during NOTIFICATION_PHYSICS
 		MANUAL, // manually update state machine, user must call update(delta)
 	};
 
@@ -71,8 +77,8 @@ public:
 	BTPlayer();
 	~BTPlayer();
 
-#ifdef DEBUG_ENABLED
+#ifdef DEBUG_ENABLED // Performance monitoring
-	// Performace monitoring.
+
 private:
 	bool monitor_performance = false;
 	StringName monitor_id;
@@ -86,4 +92,4 @@ private:
 #endif // DEBUG_ENABLED
 };
 
-#endif // BT_PLAYER_H
+#endif // BT_PLAYER_H

bt/bt_state.cpp

@@ -11,21 +11,27 @@
 
 #include "bt_state.h"
 
-#include "modules/limboai/editor/debugger/limbo_debugger.h"
+#include "../editor/debugger/limbo_debugger.h"
-#include "modules/limboai/hsm/limbo_state.h"
+#include "../util/limbo_compat.h"
-#include "modules/limboai/util/limbo_string_names.h"
+#include "../util/limbo_string_names.h"
 
+#ifdef LIMBOAI_MODULE
 #include "core/debugger/engine_debugger.h"
 #include "core/error/error_macros.h"
 #include "core/object/class_db.h"
 #include "core/variant/variant.h"
+#endif // LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/engine_debugger.hpp>
+#endif // LIMBOAI_GDEXTENSION
 
 void BTState::_setup() {
 	ERR_FAIL_COND_MSG(behavior_tree.is_null(), "BTState: BehaviorTree is not assigned.");
 	tree_instance = behavior_tree->instantiate(get_agent(), get_blackboard());
 
 #ifdef DEBUG_ENABLED
-	if (tree_instance.is_valid() && EngineDebugger::is_active()) {
+	if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
 		LimboDebugger::get_singleton()->register_bt_instance(tree_instance, get_path());
 	}
 #endif
@@ -51,12 +57,12 @@ void BTState::_update(double p_delta) {
 void BTState::_notification(int p_notification) {
 	switch (p_notification) {
 		case NOTIFICATION_ENTER_TREE: {
-			if (tree_instance.is_valid() && EngineDebugger::is_active()) {
+			if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
 				LimboDebugger::get_singleton()->register_bt_instance(tree_instance, get_path());
 			}
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
-			if (tree_instance.is_valid() && EngineDebugger::is_active()) {
+			if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
 				LimboDebugger::get_singleton()->unregister_bt_instance(tree_instance, get_path());
 			}
 		} break;

bt/bt_state.h

@@ -12,10 +12,10 @@
 #ifndef BT_STATE_H
 #define BT_STATE_H
 
-#include "modules/limboai/hsm/limbo_state.h"
+#include "../hsm/limbo_state.h"
 
-#include "modules/limboai/bt/behavior_tree.h"
+#include "../bt/behavior_tree.h"
-#include "modules/limboai/bt/tasks/bt_task.h"
+#include "../bt/tasks/bt_task.h"
 
 class BTState : public LimboState {
 	GDCLASS(BTState, LimboState);
@@ -30,7 +30,6 @@ protected:
 	static void _bind_methods();
 
 	virtual void _setup() override;
-	// virtual void _enter() override {}
 	virtual void _exit() override;
 	virtual void _update(double p_delta) override;
 
@@ -53,4 +52,4 @@ protected:
 #endif
 };
 
-#endif // BT_STATE_H
+#endif // BT_STATE_H

bt/tasks/blackboard/bt_check_trigger.cpp

@@ -11,16 +11,14 @@
 
 #include "bt_check_trigger.h"
 
-#include "modules/limboai/util/limbo_utility.h"
+#include "../../../util/limbo_utility.h"
-
-#include "core/variant/variant.h"
 
 void BTCheckTrigger::set_variable(String p_variable) {
 	variable = p_variable;
 	emit_changed();
 }
 
-PackedStringArray BTCheckTrigger::get_configuration_warnings() const {
+PackedStringArray BTCheckTrigger::get_configuration_warnings() {
 	PackedStringArray warnings = BTCondition::get_configuration_warnings();
 	if (variable.is_empty()) {
 		warnings.append("Variable is not set.");
@@ -28,7 +26,7 @@ PackedStringArray BTCheckTrigger::get_configuration_warnings() const {
 	return warnings;
 }
 
-String BTCheckTrigger::_generate_name() const {
+String BTCheckTrigger::_generate_name() {
 	if (variable.is_empty()) {
 		return "CheckTrigger ???";
 	}

bt/tasks/blackboard/bt_check_trigger.h

@@ -14,8 +14,6 @@
 
 #include "../bt_condition.h"
 
-#include "core/string/ustring.h"
-
 class BTCheckTrigger : public BTCondition {
 	GDCLASS(BTCheckTrigger, BTCondition);
 	TASK_CATEGORY(Blackboard);
@@ -26,14 +24,14 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const override;
+	virtual String _generate_name() override;
 	virtual Status _tick(double p_delta) override;
 
 public:
 	void set_variable(String p_variable);
 	String get_variable() const { return variable; }
 
-	virtual PackedStringArray get_configuration_warnings() const override;
+	virtual PackedStringArray get_configuration_warnings() override;
 };
 
 #endif // BT_CHECK_TRIGGER

bt/tasks/blackboard/bt_check_var.cpp

@@ -11,10 +11,6 @@
 
 #include "bt_check_var.h"
 
-#include "modules/limboai/util/limbo_utility.h"
-
-#include "core/variant/callable.h"
-
 void BTCheckVar::set_variable(String p_variable) {
 	variable = p_variable;
 	emit_changed();
@@ -29,11 +25,11 @@ void BTCheckVar::set_value(Ref<BBVariant> p_value) {
 	value = p_value;
 	emit_changed();
 	if (Engine::get_singleton()->is_editor_hint() && value.is_valid()) {
-		value->connect(SNAME("changed"), Callable(this, SNAME("emit_changed")));
+		value->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
 	}
 }
 
-PackedStringArray BTCheckVar::get_configuration_warnings() const {
+PackedStringArray BTCheckVar::get_configuration_warnings() {
 	PackedStringArray warnings = BTCondition::get_configuration_warnings();
 	if (variable.is_empty()) {
 		warnings.append("`variable` should be assigned.");
@@ -44,7 +40,7 @@ PackedStringArray BTCheckVar::get_configuration_warnings() const {
 	return warnings;
 }
 
-String BTCheckVar::_generate_name() const {
+String BTCheckVar::_generate_name() {
 	if (variable.is_empty()) {
 		return "CheckVar ???";
 	}

bt/tasks/blackboard/bt_check_var.h

@@ -14,8 +14,8 @@
 
 #include "../bt_condition.h"
 
-#include "modules/limboai/blackboard/bb_param/bb_variant.h"
+#include "../../../blackboard/bb_param/bb_variant.h"
-#include "modules/limboai/util/limbo_utility.h"
+#include "../../../util/limbo_utility.h"
 
 class BTCheckVar : public BTCondition {
 	GDCLASS(BTCheckVar, BTCondition);
@@ -29,11 +29,11 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const override;
+	virtual String _generate_name() override;
 	virtual Status _tick(double p_delta) override;
 
 public:
-	virtual PackedStringArray get_configuration_warnings() const override;
+	virtual PackedStringArray get_configuration_warnings() override;
 
 	void set_variable(String p_variable);
 	String get_variable() const { return variable; }

bt/tasks/blackboard/bt_set_var.cpp

@@ -11,13 +11,7 @@
 
 #include "bt_set_var.h"
 
-#include "modules/limboai/blackboard/bb_param/bb_param.h"
+String BTSetVar::_generate_name() {
-#include "modules/limboai/util/limbo_utility.h"
-
-#include "core/variant/callable.h"
-#include "core/variant/variant.h"
-
-String BTSetVar::_generate_name() const {
 	if (variable.is_empty()) {
 		return "SetVar ???";
 	}
@@ -31,7 +25,7 @@ BT::Status BTSetVar::_tick(double p_delta) {
 	ERR_FAIL_COND_V_MSG(variable.is_empty(), FAILURE, "BTSetVar: `variable` is not set.");
 	ERR_FAIL_COND_V_MSG(!value.is_valid(), FAILURE, "BTSetVar: `value` is not set.");
 	Variant result;
-	Variant error_result = SNAME("Error: BTSetVar failed to get value!");
+	Variant error_result = LW_NAME(error_value);
 	Variant right_value = value->get_value(get_agent(), get_blackboard(), error_result);
 	ERR_FAIL_COND_V_MSG(right_value == error_result, FAILURE, "BTSetVar: Failed to get parameter value. Returning FAILURE.");
 	if (operation == LimboUtility::OPERATION_NONE) {
@@ -55,7 +49,7 @@ void BTSetVar::set_value(Ref<BBVariant> p_value) {
 	value = p_value;
 	emit_changed();
 	if (Engine::get_singleton()->is_editor_hint() && value.is_valid()) {
-		value->connect(SNAME("changed"), Callable(this, SNAME("emit_changed")));
+		value->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
 	}
 }
 
@@ -64,7 +58,7 @@ void BTSetVar::set_operation(LimboUtility::Operation p_operation) {
 	emit_changed();
 }
 
-PackedStringArray BTSetVar::get_configuration_warnings() const {
+PackedStringArray BTSetVar::get_configuration_warnings() {
 	PackedStringArray warnings = BTAction::get_configuration_warnings();
 	if (variable.is_empty()) {
 		warnings.append("`variable` should be assigned.");

bt/tasks/blackboard/bt_set_var.h

@@ -14,10 +14,8 @@
 
 #include "../bt_action.h"
 
-#include "modules/limboai/blackboard/bb_param/bb_variant.h"
+#include "../../../blackboard/bb_param/bb_variant.h"
-#include "modules/limboai/util/limbo_utility.h"
+#include "../../../util/limbo_utility.h"
-
-#include "core/string/ustring.h"
 
 class BTSetVar : public BTAction {
 	GDCLASS(BTSetVar, BTAction);
@@ -31,11 +29,11 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const override;
+	virtual String _generate_name() override;
 	virtual Status _tick(double p_delta) override;
 
 public:
-	virtual PackedStringArray get_configuration_warnings() const override;
+	virtual PackedStringArray get_configuration_warnings() override;
 
 	void set_variable(const String &p_variable);
 	String get_variable() const { return variable; }

bt/tasks/bt_action.cpp

@@ -11,7 +11,7 @@
 
 #include "bt_action.h"
 
-PackedStringArray BTAction::get_configuration_warnings() const {
+PackedStringArray BTAction::get_configuration_warnings() {
 	PackedStringArray warnings = BTTask::get_configuration_warnings();
 	if (get_child_count_excluding_comments() != 0) {
 		warnings.append("Action can't have child tasks.");

bt/tasks/bt_action.h

@@ -18,7 +18,7 @@ class BTAction : public BTTask {
 	GDCLASS(BTAction, BTTask);
 
 public:
-	virtual PackedStringArray get_configuration_warnings() const override;
+	virtual PackedStringArray get_configuration_warnings() override;
 };
 
-#endif // BT_ACTION_H
+#endif // BT_ACTION_H

bt/tasks/bt_comment.cpp

@@ -13,6 +13,11 @@
 
 #include "bt_task.h"
 
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/engine.hpp>
+using namespace godot;
+#endif
+
 Ref<BTTask> BTComment::clone() const {
 	if (Engine::get_singleton()->is_editor_hint()) {
 		return BTTask::clone();
@@ -20,7 +25,7 @@ Ref<BTTask> BTComment::clone() const {
 	return nullptr;
 }
 
-PackedStringArray BTComment::get_configuration_warnings() const {
+PackedStringArray BTComment::get_configuration_warnings() {
 	PackedStringArray warnings = BTTask::get_configuration_warnings();
 	if (get_child_count_excluding_comments() > 0) {
 		warnings.append("Can only have other comment tasks as children.");

bt/tasks/bt_comment.h

@@ -20,7 +20,7 @@ class BTComment : public BTTask {
 
 public:
 	virtual Ref<BTTask> clone() const override;
-	virtual PackedStringArray get_configuration_warnings() const override;
+	virtual PackedStringArray get_configuration_warnings() override;
 };
 
-#endif // BT_COMMENT
+#endif // BT_COMMENT_H

bt/tasks/bt_composite.cpp

@@ -11,7 +11,7 @@
 
 #include "bt_composite.h"
 
-PackedStringArray BTComposite::get_configuration_warnings() const {
+PackedStringArray BTComposite::get_configuration_warnings() {
 	PackedStringArray warnings = BTTask::get_configuration_warnings();
 	if (get_child_count_excluding_comments() < 1) {
 		warnings.append("Composite should have at least one child task.");

bt/tasks/bt_composite.h

@@ -18,7 +18,7 @@ class BTComposite : public BTTask {
 	GDCLASS(BTComposite, BTTask);
 
 public:
-	virtual PackedStringArray get_configuration_warnings() const override;
+	virtual PackedStringArray get_configuration_warnings() override;
 };
 
-#endif // BT_COMPOSITE_H
+#endif // BT_COMPOSITE_H

bt/tasks/bt_condition.cpp

@@ -11,7 +11,7 @@
 
 #include "bt_condition.h"
 
-PackedStringArray BTCondition::get_configuration_warnings() const {
+PackedStringArray BTCondition::get_configuration_warnings() {
 	PackedStringArray warnings = BTTask::get_configuration_warnings();
 	if (get_child_count_excluding_comments() != 0) {
 		warnings.append("Condition task can't have child tasks.");

bt/tasks/bt_condition.h

@@ -18,7 +18,7 @@ class BTCondition : public BTTask {
 	GDCLASS(BTCondition, BTTask);
 
 public:
-	virtual PackedStringArray get_configuration_warnings() const override;
+	virtual PackedStringArray get_configuration_warnings() override;
 };
 
-#endif // BT_CONDITION_H
+#endif // BT_CONDITION_H

bt/tasks/bt_decorator.cpp

@@ -11,7 +11,7 @@
 
 #include "bt_decorator.h"
 
-PackedStringArray BTDecorator::get_configuration_warnings() const {
+PackedStringArray BTDecorator::get_configuration_warnings() {
 	PackedStringArray warnings = BTTask::get_configuration_warnings();
 	if (get_child_count_excluding_comments() != 1) {
 		warnings.append("Decorator should have a single child task.");

bt/tasks/bt_decorator.h

@@ -18,7 +18,7 @@ class BTDecorator : public BTTask {
 	GDCLASS(BTDecorator, BTTask)
 
 public:
-	virtual PackedStringArray get_configuration_warnings() const override;
+	virtual PackedStringArray get_configuration_warnings() override;
 };
 
-#endif // BT_DECORATOR_H
+#endif // BT_DECORATOR_H

bt/tasks/bt_task.cpp

@@ -11,11 +11,12 @@
 
 #include "bt_task.h"
 
+#include "../../blackboard/blackboard.h"
+#include "../../util/limbo_string_names.h"
+#include "../../util/limbo_utility.h"
 #include "bt_comment.h"
-#include "modules/limboai/blackboard/blackboard.h"
-#include "modules/limboai/util/limbo_string_names.h"
-#include "modules/limboai/util/limbo_utility.h"
 
+#ifdef LIMBOAI_MODULE
 #include "core/error/error_macros.h"
 #include "core/io/resource.h"
 #include "core/object/class_db.h"
@@ -25,6 +26,19 @@
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "core/variant/variant.h"
+#endif // LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+#include "godot_cpp/classes/global_constants.hpp"
+#include "godot_cpp/core/class_db.hpp"
+#include "godot_cpp/variant/dictionary.hpp"
+#include "godot_cpp/variant/string_name.hpp"
+#include "godot_cpp/variant/typed_array.hpp"
+#include "godot_cpp/variant/utility_functions.hpp"
+#include "godot_cpp/variant/variant.hpp"
+#include <godot_cpp/classes/ref.hpp>
+#include <godot_cpp/classes/script.hpp>
+#endif // LIMBOAI_GDEXTENSION
 
 void BT::_bind_methods() {
 	BIND_ENUM_CONSTANT(FRESH);
@@ -33,19 +47,21 @@ void BT::_bind_methods() {
 	BIND_ENUM_CONSTANT(SUCCESS);
 }
 
-String BTTask::_generate_name() const {
+String BTTask::_generate_name() {
-	if (get_script_instance()) {
+	String ret;
-		if (get_script_instance()->has_method(LimboStringNames::get_singleton()->_generate_name)) {
+
-			ERR_FAIL_COND_V_MSG(!get_script_instance()->get_script()->is_tool(), "ERROR: not a tool script", "Task script should be a \"tool\" script!");
+	// Generate name based on script path.
-			return get_script_instance()->call(LimboStringNames::get_singleton()->_generate_name);
+	Ref<Script> sc = GET_SCRIPT(this);
-		}
+	if (sc.is_valid() && sc->get_path().is_absolute_path()) {
-		String script_path = get_script_instance()->get_script()->get_path();
+		ret = sc->get_path().get_basename().get_file().to_pascal_case();
-		if (!script_path.is_empty()) {
-			// Generate name based on script file
-			return script_path.get_basename().get_file().trim_prefix("BT").to_pascal_case();
-		}
 	}
-	return get_class().trim_prefix("BT");
+
+	// Generate name based on core class name.
+	if (ret.is_empty()) {
+		ret = get_class();
+	}
+
+	return ret.trim_prefix("BT");
 }
 
 Array BTTask::_get_children() const {
@@ -72,9 +88,20 @@ void BTTask::_set_children(Array p_children) {
 	}
 }
 
-String BTTask::get_task_name() const {
+String BTTask::get_task_name() {
 	if (data.custom_name.is_empty()) {
+#ifdef LIMBOAI_MODULE
+		if (get_script_instance() && get_script_instance()->has_method(LW_NAME(_generate_name))) {
+			if (unlikely(!get_script_instance()->get_script()->is_tool())) {
+				ERR_PRINT(vformat("BTTask: Task script should be a \"tool\" script!"));
+			} else {
+				return get_script_instance()->call(LimboStringNames::get_singleton()->_generate_name);
+			}
+		}
 		return _generate_name();
+#elif LIMBOAI_GDEXTENSION
+		return call(LimboStringNames::get_singleton()->_generate_name);
+#endif
 	}
 	return data.custom_name;
 }
@@ -103,9 +130,7 @@ void BTTask::initialize(Node *p_agent, const Ref<Blackboard> &p_blackboard) {
 		get_child(i)->initialize(p_agent, p_blackboard);
 	}
 
-	if (!GDVIRTUAL_CALL(_setup)) {
+	VCALL_OR_NATIVE(_setup);
-		_setup();
-	}
 }
 
 Ref<BTTask> BTTask::clone() const {
@@ -129,6 +154,7 @@ Ref<BTTask> BTTask::clone() const {
 		inst->data.children.resize(data.children.size() - num_null);
 	}
 
+#ifdef LIMBOAI_MODULE
 	// Make BBParam properties unique.
 	List<PropertyInfo> props;
 	inst->get_property_list(&props);
@@ -154,6 +180,34 @@ Ref<BTTask> BTTask::clone() const {
 			}
 		}
 	}
+#elif LIMBOAI_GDEXTENSION
+	// Make BBParam properties unique.
+	TypedArray<Dictionary> props = inst->get_property_list();
+	HashMap<Ref<Resource>, Ref<Resource>> duplicates;
+	for (int i = 0; i < props.size(); i++) {
+		Dictionary prop = props[i];
+		if (!(int(prop["usage"]) & PROPERTY_USAGE_STORAGE)) {
+			continue;
+		}
+
+		StringName prop_name = prop["name"];
+		Variant v = inst->get(prop_name);
+
+		if (v.get_type() == Variant::OBJECT && int(prop["hint"]) == PROPERTY_HINT_RESOURCE_TYPE) {
+			Ref<RefCounted> ref = v;
+			if (ref.is_valid()) {
+				Ref<Resource> res = ref;
+				if (res.is_valid() && res->is_class("BBParam")) {
+					if (!duplicates.has(res)) {
+						duplicates[res] = res->duplicate();
+					}
+					res = duplicates[res];
+					inst->set(prop_name, res);
+				}
+			}
+		}
+	}
+#endif // LIMBOAI_MODULE & LIMBOAI_GDEXTENSION
 
 	return inst;
 }
@@ -166,21 +220,22 @@ BT::Status BTTask::execute(double p_delta) {
 				data.children.get(i)->abort();
 			}
 		}
-		if (!GDVIRTUAL_CALL(_enter)) {
+
-			_enter();
+		VCALL_OR_NATIVE(_enter);
-		}
 	} else {
 		data.elapsed += p_delta;
 	}
 
+#ifdef LIMBOAI_MODULE
 	if (!GDVIRTUAL_CALL(_tick, p_delta, data.status)) {
 		data.status = _tick(p_delta);
 	}
+#elif LIMBOAI_GDEXTENSION
+	data.status = (Status)(int)call(LimboStringNames::get_singleton()->_tick, p_delta);
+#endif
 
 	if (data.status != RUNNING) {
-		if (!GDVIRTUAL_CALL(_exit)) {
+		VCALL_OR_NATIVE(_exit);
-			_exit();
-		}
 		data.elapsed = 0.0;
 	}
 	return data.status;
@@ -191,9 +246,7 @@ void BTTask::abort() {
 		get_child(i)->abort();
 	}
 	if (data.status == RUNNING) {
-		if (!GDVIRTUAL_CALL(_exit)) {
+		VCALL_OR_NATIVE(_exit);
-			_exit();
-		}
 	}
 	data.status = FRESH;
 	data.elapsed = 0.0;
@@ -202,7 +255,7 @@ void BTTask::abort() {
 int BTTask::get_child_count_excluding_comments() const {
 	int count = 0;
 	for (int i = 0; i < data.children.size(); i++) {
-		if (!data.children[i]->is_class_ptr(BTComment::get_class_ptr_static())) {
+		if (!IS_CLASS(data.children[i], BTComment)) {
 			count += 1;
 		}
 	}
@@ -274,23 +327,28 @@ Ref<BTTask> BTTask::next_sibling() const {
 	return Ref<BTTask>();
 }
 
-PackedStringArray BTTask::get_configuration_warnings() const {
+PackedStringArray BTTask::_get_configuration_warnings() {
+	return PackedStringArray();
+}
+
+PackedStringArray BTTask::get_configuration_warnings() {
 	PackedStringArray ret;
 
 	PackedStringArray warnings;
-	if (GDVIRTUAL_CALL(_get_configuration_warning, warnings)) {
+	VCALL_V(_get_configuration_warnings, warnings); // Get script warnings.
-		ret.append_array(warnings);
+	ret.append_array(warnings);
-	}
 
 	return ret;
 }
 
-void BTTask::print_tree(int p_initial_tabs) const {
+void BTTask::print_tree(int p_initial_tabs) {
 	String tabs = "--";
 	for (int i = 0; i < p_initial_tabs; i++) {
 		tabs += "--";
 	}
-	print_line(vformat("%s Name: %s Instance: %s", tabs, get_task_name(), Ref<BTTask>(this)));
+
+	PRINT_LINE(vformat("%s Name: %s Instance: %s", tabs, get_task_name(), Ref<BTTask>(this)));
+
 	for (int i = 0; i < get_child_count(); i++) {
 		get_child(i)->print_tree(p_initial_tabs + 1);
 	}
@@ -333,17 +391,26 @@ void BTTask::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "custom_name"), "set_custom_name", "get_custom_name");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "agent", PROPERTY_HINT_RESOURCE_TYPE, "Node", PROPERTY_USAGE_NONE), "set_agent", "get_agent");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "blackboard", PROPERTY_HINT_RESOURCE_TYPE, "Blackboard", PROPERTY_USAGE_NONE), "", "get_blackboard");
-	// ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "parent", PROPERTY_HINT_RESOURCE_TYPE, "BTTask", 0), "", "get_parent");
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "children", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_children", "_get_children");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "status", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_status");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "elapsed_time", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_elapsed_time");
 
+#ifdef LIMBOAI_MODULE
 	GDVIRTUAL_BIND(_setup);
 	GDVIRTUAL_BIND(_enter);
 	GDVIRTUAL_BIND(_exit);
 	GDVIRTUAL_BIND(_tick, "p_delta");
 	GDVIRTUAL_BIND(_generate_name);
-	GDVIRTUAL_BIND(_get_configuration_warning);
+	GDVIRTUAL_BIND(_get_configuration_warnings);
+#elif LIMBOAI_GDEXTENSION
+	// TODO: Until virtual functions are implemented in godot-cpp, we do this. Replace this code when possible.
+	ClassDB::bind_method(D_METHOD("_setup"), &BTTask::_setup);
+	ClassDB::bind_method(D_METHOD("_enter"), &BTTask::_enter);
+	ClassDB::bind_method(D_METHOD("_exit"), &BTTask::_exit);
+	ClassDB::bind_method(D_METHOD("_tick", "p_delta"), &BTTask::_tick);
+	ClassDB::bind_method(D_METHOD("_generate_name"), &BTTask::_generate_name);
+	ClassDB::bind_method(D_METHOD("_get_configuration_warnings"), &BTTask::_get_configuration_warnings);
+#endif
 }
 
 BTTask::BTTask() {

bt/tasks/bt_task.h

@@ -9,15 +9,22 @@
  * =============================================================================
  */
 
-#ifndef BTTASK_H
+#ifndef BT_TASK_H
-#define BTTASK_H
+#define BT_TASK_H
 
-#include "modules/limboai/blackboard/blackboard.h"
+#include "../../blackboard/blackboard.h"
-#include "modules/limboai/util/limbo_task_db.h"
+#include "../../util/limbo_compat.h"
+#include "../../util/limbo_string_names.h"
+#include "../../util/limbo_task_db.h"
 
+#ifdef LIMBOAI_MODULE
+#include "core/config/engine.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource.h"
+#include "core/math/math_funcs.h"
 #include "core/object/object.h"
 #include "core/object/ref_counted.h"
+#include "core/os/memory.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
 #include "core/typedefs.h"
@@ -25,6 +32,15 @@
 #include "core/variant/binder_common.h"
 #include "core/variant/dictionary.h"
 #include "scene/resources/texture.h"
+#endif // LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/engine.hpp>
+#include <godot_cpp/classes/resource.hpp>
+#include <godot_cpp/core/object.hpp>
+#include <godot_cpp/templates/vector.hpp>
+using namespace godot;
+#endif // LIMBOAI_GDEXTENSION
 
 /**
  * Base class for BTTask.
@@ -54,7 +70,7 @@ class BTTask : public BT {
 private:
 	friend class BehaviorTree;
 
-	// Avoid namespace pollution in derived classes.
+	// Avoid namespace pollution in the derived classes.
 	struct Data {
 		int index = -1;
 		String custom_name;
@@ -69,37 +85,45 @@ private:
 	Array _get_children() const;
 	void _set_children(Array children);
 
+	PackedStringArray _get_configuration_warnings(); // ! Scripts only.
+
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
+	virtual String _generate_name();
 	virtual void _setup() {}
 	virtual void _enter() {}
 	virtual void _exit() {}
 	virtual Status _tick(double p_delta) { return FAILURE; }
 
+#ifdef LIMBOAI_MODULE
 	GDVIRTUAL0RC(String, _generate_name);
 	GDVIRTUAL0(_setup);
 	GDVIRTUAL0(_enter);
 	GDVIRTUAL0(_exit);
 	GDVIRTUAL1R(Status, _tick, double);
-	GDVIRTUAL0RC(PackedStringArray, _get_configuration_warning);
+	GDVIRTUAL0RC(PackedStringArray, _get_configuration_warnings);
+#endif // LIMBOAI_MODULE
 
 public:
+	// TODO: GDExtension doesn't have this method hmm...
+
+#ifdef LIMBOAI_MODULE
 	virtual bool editor_can_reload_from_file() override { return false; }
+#endif // LIMBOAI_MODULE
 
 	_FORCE_INLINE_ Node *get_agent() const { return data.agent; }
 	void set_agent(Node *p_agent) { data.agent = p_agent; }
 
 	String get_custom_name() const { return data.custom_name; }
 	void set_custom_name(const String &p_name);
-	String get_task_name() const;
+	String get_task_name();
 
 	Ref<BTTask> get_root() const;
 
 	virtual Ref<BTTask> clone() const;
 	virtual void initialize(Node *p_agent, const Ref<Blackboard> &p_blackboard);
-	virtual PackedStringArray get_configuration_warnings() const;
+	virtual PackedStringArray get_configuration_warnings(); // ! Native version.
 
 	Status execute(double p_delta);
 	void abort();
@@ -129,10 +153,10 @@ public:
 	bool is_descendant_of(const Ref<BTTask> &p_task) const;
 	Ref<BTTask> next_sibling() const;
 
-	void print_tree(int p_initial_tabs = 0) const;
+	void print_tree(int p_initial_tabs = 0);
 
 	BTTask();
 	~BTTask();
 };
 
-#endif // BTTASK_H
+#endif // BT_TASK_H

bt/tasks/composites/bt_dynamic_sequence.cpp

@@ -31,4 +31,4 @@ BT::Status BTDynamicSequence::_tick(double p_delta) {
 	}
 	last_running_idx = i;
 	return status;
-}
+}

bt/tasks/composites/bt_dynamic_sequence.h

@@ -26,4 +26,4 @@ protected:
 	virtual Status _tick(double p_delta) override;
 };
 
-#endif // BT_DYNAMIC_SEQUENCE_H
+#endif // BT_DYNAMIC_SEQUENCE_H

bt/tasks/composites/bt_parallel.cpp

@@ -11,8 +11,6 @@
 
 #include "bt_parallel.h"
 
-#include "core/object/class_db.h"
-
 void BTParallel::_enter() {
 	for (int i = 0; i < get_child_count(); i++) {
 		get_child(i)->abort();

bt/tasks/composites/bt_parallel.h

@@ -47,4 +47,4 @@ public:
 	}
 };
 
-#endif // BT_PARALLEL_H
+#endif // BT_PARALLEL_H

bt/tasks/composites/bt_probability_selector.cpp

@@ -11,25 +11,23 @@
 
 #include "bt_probability_selector.h"
 
-#include "modules/limboai/bt/tasks/bt_task.h"
+#include "../../../util/limbo_compat.h"
-
-#include "core/error/error_macros.h"
 
 double BTProbabilitySelector::get_weight(int p_index) const {
 	ERR_FAIL_INDEX_V(p_index, get_child_count(), 0.0);
-	ERR_FAIL_COND_V(get_child(p_index)->is_class_ptr(BTComment::get_class_ptr_static()), 0.0);
+	ERR_FAIL_COND_V(IS_CLASS(get_child(p_index), BTComment), 0.0);
 	return _get_weight(p_index);
 }
 
 void BTProbabilitySelector::set_weight(int p_index, double p_weight) {
 	ERR_FAIL_INDEX(p_index, get_child_count());
-	ERR_FAIL_COND(get_child(p_index)->is_class_ptr(BTComment::get_class_ptr_static()));
+	ERR_FAIL_COND(IS_CLASS(get_child(p_index), BTComment));
 	_set_weight(p_index, p_weight);
 }
 
 double BTProbabilitySelector::get_probability(int p_index) const {
 	ERR_FAIL_INDEX_V(p_index, get_child_count(), 0.0);
-	ERR_FAIL_COND_V(get_child(p_index)->is_class_ptr(BTComment::get_class_ptr_static()), 0.0);
+	ERR_FAIL_COND_V(IS_CLASS(get_child(p_index), BTComment), 0.0);
 	double total = _get_total_weight();
 	return total == 0.0 ? 0.0 : _get_weight(p_index) / total;
 }
@@ -38,7 +36,7 @@ void BTProbabilitySelector::set_probability(int p_index, double p_probability) {
 	ERR_FAIL_INDEX(p_index, get_child_count());
 	ERR_FAIL_COND(p_probability < 0.0);
 	ERR_FAIL_COND(p_probability >= 1.0);
-	ERR_FAIL_COND(get_child(p_index)->is_class_ptr(BTComment::get_class_ptr_static()));
+	ERR_FAIL_COND(IS_CLASS(get_child(p_index), BTComment));
 
 	double others_total = _get_total_weight() - _get_weight(p_index);
 	double others_probability = 1.0 - p_probability;
@@ -52,7 +50,7 @@ void BTProbabilitySelector::set_probability(int p_index, double p_probability) {
 
 bool BTProbabilitySelector::has_probability(int p_index) const {
 	ERR_FAIL_INDEX_V(p_index, get_child_count(), false);
-	return !get_child(p_index)->is_class_ptr(BTComment::get_class_ptr_static());
+	return !IS_CLASS(get_child(p_index), BTComment);
 }
 
 void BTProbabilitySelector::set_abort_on_failure(bool p_abort_on_failure) {
@@ -98,7 +96,7 @@ void BTProbabilitySelector::_select_task() {
 		remaining_tasks_weight -= _get_weight(task);
 	}
 
-	double roll = Math::random(0.0, remaining_tasks_weight);
+	double roll = RAND_RANGE(0.0, remaining_tasks_weight);
 	for (int i = 0; i < get_child_count(); i++) {
 		Ref<BTTask> task = get_child(i);
 		if (failed_tasks.has(task)) {

bt/tasks/composites/bt_probability_selector.h

@@ -12,11 +12,18 @@
 #ifndef BT_PROBABILITY_SELECTOR_H
 #define BT_PROBABILITY_SELECTOR_H
 
-#include "modules/limboai/bt/tasks/bt_comment.h"
+#include "../../../util/limbo_compat.h"
-#include "modules/limboai/bt/tasks/bt_composite.h"
+#include "../bt_comment.h"
+#include "../bt_composite.h"
 
+#ifdef LIMBOAI_MODULE
 #include "core/core_string_names.h"
 #include "core/typedefs.h"
+#endif // LIMBOAI_MODULE
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/templates/hash_set.hpp>
+#endif // LIMBOAI_GDEXTENSION
 
 class BTProbabilitySelector : public BTComposite {
 	GDCLASS(BTProbabilitySelector, BTComposite);
@@ -28,17 +35,17 @@ private:
 	bool abort_on_failure = false;
 
 	void _select_task();
-
+#define SNAME(m_arg) ([]() -> const StringName & { static StringName sname = _scs_create(m_arg, true); return sname; })()
-	_FORCE_INLINE_ double _get_weight(int p_index) const { return get_child(p_index)->get_meta(SNAME("_weight_"), 1.0); }
+	_FORCE_INLINE_ double _get_weight(int p_index) const { return get_child(p_index)->get_meta(LW_NAME(_weight_), 1.0); }
-	_FORCE_INLINE_ double _get_weight(Ref<BTTask> p_task) const { return p_task->get_meta(SNAME("_weight_"), 1.0); }
+	_FORCE_INLINE_ double _get_weight(Ref<BTTask> p_task) const { return p_task->get_meta(LW_NAME(_weight_), 1.0); }
 	_FORCE_INLINE_ void _set_weight(int p_index, double p_weight) {
-		get_child(p_index)->set_meta(SNAME("_weight_"), Variant(p_weight));
+		get_child(p_index)->set_meta(LW_NAME(_weight_), Variant(p_weight));
-		get_child(p_index)->emit_signal(CoreStringNames::get_singleton()->changed);
+		get_child(p_index)->emit_signal(LW_NAME(changed));
 	}
 	_FORCE_INLINE_ double _get_total_weight() const {
 		double total = 0.0;
 		for (int i = 0; i < get_child_count(); i++) {
-			if (!get_child(i)->is_class_ptr(BTComment::get_class_ptr_static())) {
+			if (!IS_CLASS(get_child(i), BTComment)) {
 				total += _get_weight(i);
 			}
 		}

bt/tasks/composites/bt_random_selector.cpp

@@ -16,7 +16,7 @@ void BTRandomSelector::_enter() {
 	if (indicies.size() != get_child_count()) {
 		indicies.resize(get_child_count());
 		for (int i = 0; i < get_child_count(); i++) {
-			indicies.set(i, i);
+			indicies[i] = i;
 		}
 	}
 	indicies.shuffle();
@@ -32,4 +32,4 @@ BT::Status BTRandomSelector::_tick(double p_delta) {
 		}
 	}
 	return status;
-}
+}

bt/tasks/composites/bt_random_selector.h

@@ -14,8 +14,6 @@
 
 #include "../bt_composite.h"
 
-#include "core/templates/vector.h"
-
 class BTRandomSelector : public BTComposite {
 	GDCLASS(BTRandomSelector, BTComposite);
 	TASK_CATEGORY(Composites);
@@ -28,4 +26,5 @@ protected:
 	virtual void _enter() override;
 	virtual Status _tick(double p_delta) override;
 };
-#endif // BT_RANDOM_SELECTOR_H
+
+#endif // BT_RANDOM_SELECTOR_H

bt/tasks/composites/bt_random_sequence.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_random_sequence.cpp
  * =============================================================================
- * Copyright 2021-2023 Serhii Snitsaruk
+ * Copyright 2021-2024 Serhii Snitsaruk
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
@@ -16,7 +16,7 @@ void BTRandomSequence::_enter() {
 	if (indicies.size() != get_child_count()) {
 		indicies.resize(get_child_count());
 		for (int i = 0; i < get_child_count(); i++) {
-			indicies.set(i, i);
+			indicies[i] = i;
 		}
 	}
 	indicies.shuffle();
@@ -32,4 +32,4 @@ BT::Status BTRandomSequence::_tick(double p_delta) {
 		}
 	}
 	return status;
-}
+}

bt/tasks/composites/bt_random_sequence.h

@@ -14,8 +14,6 @@
 
 #include "../bt_composite.h"
 
-#include "core/templates/vector.h"
-
 class BTRandomSequence : public BTComposite {
 	GDCLASS(BTRandomSequence, BTComposite);
 	TASK_CATEGORY(Composites);
@@ -28,4 +26,5 @@ protected:
 	virtual void _enter() override;
 	virtual Status _tick(double p_delta) override;
 };
-#endif // BT_RANDOM_SEQUENCE_H
+
+#endif // BT_RANDOM_SEQUENCE_H

bt/tasks/composites/bt_selector.cpp

@@ -25,4 +25,4 @@ BT::Status BTSelector::_tick(double p_delta) {
 		}
 	}
 	return status;
-}
+}

bt/tasks/decorators/bt_always_fail.h

@@ -22,4 +22,4 @@ protected:
 	virtual Status _tick(double p_delta) override;
 };
 
-#endif // BT_ALWAYS_FAIL_H
+#endif // BT_ALWAYS_FAIL_H

bt/tasks/decorators/bt_always_succeed.h

@@ -22,4 +22,4 @@ protected:
 	virtual Status _tick(double p_delta) override;
 };
 
-#endif // BT_ALWAYS_SUCCEED_H
+#endif // BT_ALWAYS_SUCCEED_H

bt/tasks/decorators/bt_cooldown.cpp

@@ -11,10 +11,13 @@
 
 #include "bt_cooldown.h"
 
-#include "core/math/math_funcs.h"
+#ifdef LIMBOAI_MODULE
-#include "core/object/class_db.h"
-#include "core/variant/array.h"
 #include "scene/main/scene_tree.h"
+#endif
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/scene_tree.hpp>
+#endif
 
 //**** Setters / Getters
 
@@ -45,7 +48,7 @@ void BTCooldown::set_cooldown_state_var(String p_value) {
 
 //**** Task Implementation
 
-String BTCooldown::_generate_name() const {
+String BTCooldown::_generate_name() {
 	return vformat("Cooldown %s sec", Math::snapped(duration, 0.001));
 }
 
@@ -76,8 +79,9 @@ void BTCooldown::_chill() {
 	if (timer.is_valid()) {
 		timer->set_time_left(duration);
 	} else {
-		timer = SceneTree::get_singleton()->create_timer(duration, process_pause);
+		timer = SCENE_TREE()->create_timer(duration, process_pause);
-		timer->connect("timeout", callable_mp(this, &BTCooldown::_on_timeout), CONNECT_ONE_SHOT);
+		ERR_FAIL_NULL(timer);
+		timer->connect(LW_NAME(timeout), callable_mp(this, &BTCooldown::_on_timeout), CONNECT_ONE_SHOT);
 	}
 }
 

bt/tasks/decorators/bt_cooldown.h

@@ -14,7 +14,13 @@
 
 #include "../bt_decorator.h"
 
+#ifdef LIMBOAI_MODULE
 #include "scene/main/scene_tree.h"
+#endif
+
+#ifdef LIMBOAI_GDEXTENSION
+#include <godot_cpp/classes/scene_tree_timer.hpp>
+#endif
 
 class BTCooldown : public BTDecorator {
 	GDCLASS(BTCooldown, BTDecorator);
@@ -35,7 +41,7 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const override;
+	virtual String _generate_name() override;
 	virtual void _setup() override;
 	virtual Status _tick(double p_delta) override;
 
@@ -56,4 +62,4 @@ public:
 	String get_cooldown_state_var() const { return cooldown_state_var; }
 };
 
-#endif // BT_COOLDOWN_H
+#endif // BT_COOLDOWN_H

bt/tasks/decorators/bt_delay.cpp

@@ -11,19 +11,12 @@
 
 #include "bt_delay.h"
 
-#include "core/error/error_macros.h"
-#include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
-#include "core/object/object.h"
-#include "core/variant/array.h"
-#include "core/variant/variant.h"
-
 void BTDelay::set_seconds(double p_value) {
 	seconds = p_value;
 	emit_changed();
 }
 
-String BTDelay::_generate_name() const {
+String BTDelay::_generate_name() {
 	return vformat("Delay %s sec", Math::snapped(seconds, 0.001));
 }
 

bt/tasks/decorators/bt_delay.h

@@ -24,7 +24,7 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const override;
+	virtual String _generate_name() override;
 	virtual Status _tick(double p_delta) override;
 
 public:
@@ -32,4 +32,4 @@ public:
 	double get_seconds() const { return seconds; }
 };
 
-#endif // BT_DELAY_H
+#endif // BT_DELAY_H

bt/tasks/decorators/bt_for_each.cpp

@@ -11,12 +11,12 @@
 
 #include "bt_for_each.h"
 
-#include "modules/limboai/blackboard/blackboard.h"
+#include "../../../blackboard/blackboard.h"
-#include "modules/limboai/util/limbo_utility.h"
+#include "../../../util/limbo_utility.h"
 
+#ifdef LIMBOAI_MODULE
 #include "core/error/error_list.h"
-#include "core/error/error_macros.h"
+#endif
-#include "core/variant/variant.h"
 
 //**** Setters / Getters
 
@@ -32,7 +32,7 @@ void BTForEach::set_save_var(String p_value) {
 
 //**** Task Implementation
 
-String BTForEach::_generate_name() const {
+String BTForEach::_generate_name() {
 	return vformat("ForEach %s in %s",
 			LimboUtility::get_singleton()->decorate_var(save_var),
 			LimboUtility::get_singleton()->decorate_var(array_var));
@@ -51,7 +51,7 @@ BT::Status BTForEach::_tick(double p_delta) {
 	if (arr.size() == 0) {
 		return SUCCESS;
 	}
-	Variant elem = arr.get(current_idx);
+	Variant elem = arr[current_idx];
 	get_blackboard()->set_var(save_var, elem);
 
 	Status status = get_child(0)->execute(p_delta);

bt/tasks/decorators/bt_for_each.h

@@ -27,7 +27,7 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const override;
+	virtual String _generate_name() override;
 	virtual void _enter() override;
 	virtual Status _tick(double p_delta) override;
 
@@ -39,4 +39,4 @@ public:
 	String get_save_var() const { return save_var; }
 };
 
-#endif // BT_FOR_EACH_H
+#endif // BT_FOR_EACH_H

bt/tasks/decorators/bt_invert.cpp

@@ -20,4 +20,4 @@ BT::Status BTInvert::_tick(double p_delta) {
 		status = SUCCESS;
 	}
 	return status;
-}
+}

bt/tasks/decorators/bt_invert.h

@@ -22,4 +22,4 @@ protected:
 	virtual Status _tick(double p_delta) override;
 };
 
-#endif // BT_INVERT_H
+#endif // BT_INVERT_H

bt/tasks/decorators/bt_new_scope.cpp

@@ -11,12 +11,6 @@
 
 #include "bt_new_scope.h"
 
-#include "modules/limboai/blackboard/blackboard.h"
-
-#include "core/error/error_macros.h"
-#include "core/os/memory.h"
-#include "core/string/ustring.h"
-
 void BTNewScope::initialize(Node *p_agent, const Ref<Blackboard> &p_blackboard) {
 	ERR_FAIL_COND(p_agent == nullptr);
 	ERR_FAIL_COND(p_blackboard == nullptr);
@@ -39,4 +33,4 @@ void BTNewScope::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_get_blackboard_data"), &BTNewScope::_get_blackboard_data);
 
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "_blackboard_data"), "_set_blackboard_data", "_get_blackboard_data");
-}
+}

bt/tasks/decorators/bt_new_scope.h

@@ -33,4 +33,4 @@ public:
 	virtual void initialize(Node *p_agent, const Ref<Blackboard> &p_blackboard) override;
 };
 
-#endif // BT_NEW_SCOPE_H
+#endif // BT_NEW_SCOPE_H

bt/tasks/decorators/bt_probability.cpp

@@ -11,18 +11,20 @@
 
 #include "bt_probability.h"
 
+#include "../../../util/limbo_compat.h"
+
 void BTProbability::set_run_chance(float p_value) {
 	run_chance = p_value;
 	emit_changed();
 }
 
-String BTProbability::_generate_name() const {
+String BTProbability::_generate_name() {
 	return vformat("Probability %.1f%%", run_chance);
 }
 
 BT::Status BTProbability::_tick(double p_delta) {
 	ERR_FAIL_COND_V_MSG(get_child_count() == 0, FAILURE, "BT decorator has no child.");
-	if (get_child(0)->get_status() == RUNNING || Math::randf() <= run_chance) {
+	if (get_child(0)->get_status() == RUNNING || RANDF() <= run_chance) {
 		return get_child(0)->execute(p_delta);
 	}
 	return FAILURE;

bt/tasks/decorators/bt_probability.h

@@ -24,7 +24,7 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const override;
+	virtual String _generate_name() override;
 	virtual Status _tick(double p_delta) override;
 
 public:
@@ -32,4 +32,4 @@ public:
 	float get_run_chance() const { return run_chance; }
 };
 
-#endif // BT_PROBABILITY_H
+#endif // BT_PROBABILITY_H

bt/tasks/decorators/bt_repeat.cpp

@@ -11,18 +11,9 @@
 
 #include "bt_repeat.h"
 
-#include "core/object/object.h"
+String BTRepeat::_generate_name() {
-#include "core/string/ustring.h"
-#include "core/variant/variant.h"
-
-static String repeat_forever_str;
-
-String BTRepeat::_generate_name() const {
 	if (forever) {
-		if (repeat_forever_str.is_empty()) {
+		return LW_NAME(repeat_forever);
-			repeat_forever_str.parse_utf8("Repeat ∞");
-		}
-		return repeat_forever_str;
 	}
 	return vformat("Repeat x%s", times);
 }
@@ -81,3 +72,6 @@ void BTRepeat::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "times", PROPERTY_HINT_RANGE, "1,65535", PROPERTY_USAGE_NONE), "set_times", "get_times");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "abort_on_failure", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "set_abort_on_failure", "get_abort_on_failure");
 }
+
+BTRepeat::BTRepeat() {
+}

bt/tasks/decorators/bt_repeat.h

@@ -29,7 +29,7 @@ protected:
 
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 
-	virtual String _generate_name() const override;
+	virtual String _generate_name() override;
 	virtual void _enter() override;
 	virtual Status _tick(double p_delta) override;
 
@@ -42,6 +42,8 @@ public:
 
 	void set_abort_on_failure(bool p_value);
 	bool get_abort_on_failure() const { return abort_on_failure; }
+
+	BTRepeat();
 };
 
-#endif // BT_REPEAT_H
+#endif // BT_REPEAT_H

bt/tasks/decorators/bt_repeat_until_failure.h

@@ -22,4 +22,4 @@ protected:
 	virtual Status _tick(double p_delta) override;
 };
 
-#endif // BT_REPEAT_UNTIL_FAILURE_H
+#endif // BT_REPEAT_UNTIL_FAILURE_H

bt/tasks/decorators/bt_repeat_until_success.h

@@ -22,4 +22,4 @@ protected:
 	virtual Status _tick(double p_delta) override;
 };
 
-#endif // BT_REPEAT_UNTIL_SUCCESS_H
+#endif // BT_REPEAT_UNTIL_SUCCESS_H

bt/tasks/decorators/bt_run_limit.cpp

@@ -16,7 +16,7 @@ void BTRunLimit::set_run_limit(int p_value) {
 	emit_changed();
 }
 
-String BTRunLimit::_generate_name() const {
+String BTRunLimit::_generate_name() {
 	return vformat("RunLimit x%d", run_limit);
 }
 

bt/tasks/decorators/bt_run_limit.h

@@ -25,7 +25,7 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const override;
+	virtual String _generate_name() override;
 	virtual Status _tick(double p_delta) override;
 
 public:
@@ -33,4 +33,4 @@ public:
 	int get_run_limit() const { return run_limit; }
 };
 
-#endif // BT_RUN_LIMIT_H
+#endif // BT_RUN_LIMIT_H

bt/tasks/decorators/bt_subtree.cpp

@@ -11,20 +11,12 @@
 
 #include "bt_subtree.h"
 
-#include "bt_new_scope.h"
-#include "modules/limboai/blackboard/blackboard.h"
-
-#include "core/config/engine.h"
-#include "core/error/error_macros.h"
-#include "core/typedefs.h"
-#include "core/variant/variant.h"
-
 void BTSubtree::set_subtree(const Ref<BehaviorTree> &p_value) {
 	subtree = p_value;
 	emit_changed();
 }
 
-String BTSubtree::_generate_name() const {
+String BTSubtree::_generate_name() {
 	String s;
 	if (subtree.is_null()) {
 		s = "(unassigned)";
@@ -51,7 +43,7 @@ BT::Status BTSubtree::_tick(double p_delta) {
 	return get_child(0)->execute(p_delta);
 }
 
-PackedStringArray BTSubtree::get_configuration_warnings() const {
+PackedStringArray BTSubtree::get_configuration_warnings() {
 	PackedStringArray warnings = BTTask::get_configuration_warnings(); // ! BTDecorator skipped intentionally
 	if (subtree.is_null()) {
 		warnings.append("Subtree needs to be assigned.");

bt/tasks/decorators/bt_subtree.h

@@ -14,7 +14,7 @@
 
 #include "bt_new_scope.h"
 
-#include "modules/limboai/bt/behavior_tree.h"
+#include "../../../bt/behavior_tree.h"
 
 class BTSubtree : public BTNewScope {
 	GDCLASS(BTSubtree, BTNewScope);
@@ -26,7 +26,7 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const override;
+	virtual String _generate_name() override;
 	virtual Status _tick(double p_delta) override;
 
 public:
@@ -34,7 +34,7 @@ public:
 	Ref<BehaviorTree> get_subtree() const { return subtree; }
 
 	virtual void initialize(Node *p_agent, const Ref<Blackboard> &p_blackboard) override;
-	virtual PackedStringArray get_configuration_warnings() const override;
+	virtual PackedStringArray get_configuration_warnings() override;
 };
 
-#endif // BT_SUBTREE_H
+#endif // BT_SUBTREE_H

bt/tasks/decorators/bt_time_limit.cpp

@@ -11,14 +11,12 @@
 
 #include "bt_time_limit.h"
 
-#include "core/math/math_funcs.h"
-
 void BTTimeLimit::set_time_limit(double p_value) {
 	time_limit = p_value;
 	emit_changed();
 }
 
-String BTTimeLimit::_generate_name() const {
+String BTTimeLimit::_generate_name() {
 	return vformat("TimeLimit %s sec", Math::snapped(time_limit, 0.001));
 }