.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,64 +0,0 @@
-name: Bug report
-description: Report a bug in LimboAI
-labels:
-  - bug
-body:
-  - type: markdown
-    attributes:
-      value: |
-        - Write a descriptive title above.
-        - Search [open](https://github.com/limbonaut/limboai/issues) and [closed](https://github.com/limbonaut/limboai/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported.
-
-  - type: input
-    attributes:
-      label: Godot version
-      description: |
-        - Specify the Godot version and hardware information if relevant.
-        - You can copy the version info by clicking on it in the Godot status bar.
-        - Alternatively, you can copy the version and hardware info in Godot using the main menu command "Help -> Copy System Info".
-      placeholder: v4.2.2.limboai+v1.1.0.gha [15073afe3]
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: LimboAI version
-      description: |
-        - Specify the LimboAI version.
-        - You can copy the version info by clicking on it in the toolbar of the LimboAI editor (top-right corner).
-      placeholder: v1.1.0 [8fa609e]
-    validations:
-      required: true
-
-  - type: dropdown
-    id: variant
-    attributes:
-      label: LimboAI variant
-      description: Which variant of our plugin are you running?
-      options:
-        - GDExtension / AssetLib
-        - Module (custom editor or template build)
-      default: 0
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Issue description
-      description: |
-        - Describe your issue in detail. What doesn't work and how do you expect it to work instead?
-        - Provide screenshots and/or a console output if it helps to convey the problem.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: How to reproduce
-      description: |
-        - Provide a list of steps or sample code that reproduces the issue.
-        - You can provide a small Godot project which reproduces the issue, with no unnecessary files included.
-          - Drag and drop a ZIP archive to upload it (10Mb limit).
-          - Don't include the `.godot` folder in the archive.
-          - Redroduction project helps to find the bug more quickly!
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,14 +0,0 @@
-blank_issues_enabled: false
-
-contact_links:
-  - name: Documentation
-    url: https://limboai.readthedocs.io/en/stable/
-    about: Please see our documentation for more information.
-
-  - name: Discussions
-    url: https://github.com/limbonaut/limboai/discussions
-    about: Need help? Ask questions in Discussions or on our Discord server.
-
-  - name: Discord Server
-    url: https://discord.gg/N5MGC95GpP
-    about: Share your experience or get help on our Discord server.

.github/ISSUE_TEMPLATE/feature_proposal.yml

@@ -1,38 +0,0 @@
-name: Feature or improvement proposal
-description: Propose a new feature to be added or improved in LimboAI
-labels:
-  - enhancement
-body:
-  - type: markdown
-    attributes:
-      value: |
-        - Write a descriptive title above.
-        - Search [open](https://github.com/limbonaut/limboai/issues) and [closed](https://github.com/limbonaut/limboai/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported.
-
-  - type: textarea
-    attributes:
-      label: Problem statement
-      description: |
-        - Describe the problem or limitation you're currently facing with the LimboAI plugin.
-        - If it helps, describe the project you're working on and how it relates to the problem or limitation.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Proposed solution
-      description: |
-        - Describe your proposed solution and how it helps to overcome the problem or limitation.
-        - If it helps, show how it will work with code, pseudo-code, mock-ups, and/or diagrams.
-        - You can include any images or videos with drag'n'drop, and sample code blocks with <code>```</code> tags.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Alternatives
-      description: |
-        - Describe alternative solutions and features you've considered.
-        - If this enhancement will not be used often, can it be worked around with a few clicks or lines of code?
-    validations:
-      required: true

.github/actions/build-dotnet-assemblies/action.yml

@@ -1,33 +0,0 @@
-name: Build .NET assemblies
-
-inputs:
-  platform:
-    required: true
-    type: choice
-    options:
-      - linuxbsd
-      - windows
-      - macos
-  bin:
-    required: true
-    type: string
-
-runs:
-  using: "composite"
-  steps:
-    - name: Override GODOT_VERSION_STATUS for NuGet packages
-      shell: bash
-      run: |
-        GODOT_VERSION_STATUS=$(echo "${GODOT_VERSION_STATUS}" | sed "s|+|-|").gha
-        echo "GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS}" >> "$GITHUB_ENV"
-        echo "GODOT_VERSION_STATUS: ${GODOT_VERSION_STATUS}"
-
-    - name: Generate C# glue
-      shell: bash
-      run: |
-        ./bin/${{inputs.bin}} --headless --generate-mono-glue ./modules/mono/glue || true
-
-    - name: Build .NET assemblies
-      shell: bash
-      run: |
-        python ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=${{ inputs.platform }}

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

@@ -15,7 +15,7 @@ runs:
 
         echo "GDEXTENSION_VERSION=${GDEXTENSION_VERSION}" >> "$GITHUB_ENV"
 
-        cd ..
+        cd ../limboai
         echo "LIMBOAI_VERSION=$( (git describe --tags --exact-match HEAD || git rev-parse --short HEAD) | sed 's/\(.*\)-\(.*\)/\1.\2/g' )" >> "$GITHUB_ENV"
 
     - name: Set NAME_PREFIX

.github/actions/setup-linux-toolchain/action.yml

@@ -1,58 +0,0 @@
-name: Setup Linux toolchain
-
-inputs:
-  arch:
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: Set up environment
-      shell: bash
-      run: |
-        # ! Settings:
-        TOOLCHAIN_64_URL=https://github.com/godotengine/buildroot/releases/download/godot-2020.11.x-2/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2
-        TOOLCHAIN_64_SHA=16c8302fcb676c1f0fb9df73d6cff250ba1f4286
-        TOOLCHAIN_32_URL=https://github.com/godotengine/buildroot/releases/download/godot-2020.11.x-2/i686-godot-linux-gnu_sdk-buildroot.tar.bz2
-        TOOLCHAIN_32_SHA=6171652abc54ef219e5187bc53660ee4e2f796f4
-        TOOLCHAIN_ARM64_URL=https://github.com/godotengine/buildroot/releases/download/godot-2023.08.x-3/aarch64-godot-linux-gnu_sdk-buildroot.tar.bz2
-        TOOLCHAIN_ARM64_SHA=73bed3d26b92c8b9a93c0ceb6bcce8fe567d1764
-        TOOLCHAIN_ARM32_URL=https://github.com/godotengine/buildroot/releases/download/godot-2023.08.x-3/arm-godot-linux-gnueabihf_sdk-buildroot.tar.bz2
-        TOOLCHAIN_ARM32_SHA=aa5853fd73faec3837c6127649471275d7e61cb2
-
-        # ! Export variables:
-        if [[ "${{ inputs.arch }}" == "x86_64" ]]; then
-          echo "TOOLCHAIN_URL=${TOOLCHAIN_64_URL}" >> "$GITHUB_ENV"
-          echo "TOOLCHAIN_SHA=${TOOLCHAIN_64_SHA}" >> "$GITHUB_ENV"
-        elif [[ "${{ inputs.arch }}" == "x86_32" ]]; then
-          echo "TOOLCHAIN_URL=${TOOLCHAIN_32_URL}" >> "$GITHUB_ENV"
-          echo "TOOLCHAIN_SHA=${TOOLCHAIN_32_SHA}" >> "$GITHUB_ENV"
-        elif [[ "${{ inputs.arch }}" == "arm64" ]]; then
-          echo "TOOLCHAIN_URL=${TOOLCHAIN_ARM64_URL}" >> "$GITHUB_ENV"
-          echo "TOOLCHAIN_SHA=${TOOLCHAIN_ARM64_SHA}" >> "$GITHUB_ENV"
-        elif [[ "${{ inputs.arch }}" == "arm32" ]]; then
-          echo "TOOLCHAIN_URL=${TOOLCHAIN_ARM32_URL}" >> "$GITHUB_ENV"
-          echo "TOOLCHAIN_SHA=${TOOLCHAIN_ARM32_SHA}" >> "$GITHUB_ENV"
-        fi
-
-    - name: Cache buildroot
-      id: cache-buildroot
-      uses: actions/cache@v4
-      with:
-        path: buildroot
-        key: ${{env.TOOLCHAIN_SHA}}
-
-    - name: Set up buildroot
-      if: steps.cache-buildroot.outputs.cache-hit != 'true'
-      shell: bash
-      run: |
-        mkdir buildroot
-        wget ${TOOLCHAIN_URL} -O buildroot/buildroot.tar.bz2
-        cd buildroot
-        echo "${TOOLCHAIN_SHA}  buildroot.tar.bz2"
-        echo "${TOOLCHAIN_SHA}  buildroot.tar.bz2" | shasum --check
-        tar -xjf buildroot.tar.bz2 --strip-components=1
-        ls -l
-        rm buildroot.tar.bz2
-        ./relocate-sdk.sh
-        cd ..

.github/workflows/all_builds.yml

@@ -5,7 +5,7 @@ on:
       godot-ref:
         description: A tag, branch or commit hash in the Godot repository.
         type: string
-        default: master
+        default: 4.2
       limboai-ref:
         description: A tag, branch or commit hash in the LimboAI repository.
         type: string
@@ -13,7 +13,12 @@ on:
       godot-cpp-ref:
         description: A tag, branch or commit hash in the godot-cpp repository.
         type: string
-        default: master
+        default: 4.2
+
+permissions:
+  actions: write
+  contents: read
+  packages: read
 
 jobs:
   cache-sha:

.github/workflows/android.yml

@@ -29,6 +29,11 @@ env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
 
+permissions:
+  actions: write
+  contents: read
+  packages: read
+
 jobs:
   android-builds:
     runs-on: "ubuntu-20.04"
@@ -37,104 +42,40 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # * Standard arm64
-
           - name: Template (arm64, debug)
             arch: arm64
             target: template_debug
-            dotnet: false
 
           - name: Template (arm64, release)
             arch: arm64
             target: template_release
-            dotnet: false
-
-          # * Standard arm32
 
           - name: Template (arm32, debug)
             arch: arm32
             target: template_debug
-            dotnet: false
 
           - name: Template (arm32, release)
             arch: arm32
             target: template_release
-            dotnet: false
-
-          # * Standard x86_64
 
           - name: Template (x86_64, debug)
             arch: x86_64
             target: template_debug
-            dotnet: false
 
           - name: Template (x86_64, release)
             arch: x86_64
             target: template_release
-            dotnet: false
-
-          # * Standard x86_32
 
           - name: Template (x86_32, debug)
             arch: x86_32
             target: template_debug
-            dotnet: false
 
           - name: Template (x86_32, release)
             arch: x86_32
             target: template_release
-            dotnet: false
-
-          # * .NET arm64
-
-          - name: Template .NET (arm64, debug)
-            arch: arm64
-            target: template_debug
-            dotnet: true
-
-          - name: Template .NET (arm64, release)
-            arch: arm64
-            target: template_release
-            dotnet: true
-
-          # * .NET arm32
-
-          - name: Template .NET (arm32, debug)
-            arch: arm32
-            target: template_debug
-            dotnet: true
-
-          - name: Template .NET (arm32, release)
-            arch: arm32
-            target: template_release
-            dotnet: true
-
-          # * .NET x86_64
-
-          - name: Template .NET (x86_64, debug)
-            arch: x86_64
-            target: template_debug
-            dotnet: true
-
-          - name: Template .NET (x86_64, release)
-            arch: x86_64
-            target: template_release
-            dotnet: true
-
-          # * .NET x86_32
-
-          - name: Template .NET (x86_32, debug)
-            arch: x86_32
-            target: template_debug
-            dotnet: true
-
-          - name: Template .NET (x86_32, release)
-            arch: x86_32
-            target: template_release
-            dotnet: true
 
     env:
-      BIN: godot.linuxbsd.${{matrix.target}}.${{matrix.arch}}${{  matrix.dotnet == true && '.mono' || ''  }}
+      BIN: godot.linuxbsd.${{matrix.target}}.${{matrix.arch}} #${{  matrix.build-mono == true && '.mono' || ''  }}
 
     steps:
       - name: Clone Godot
@@ -165,43 +106,33 @@ jobs:
           python --version
           scons --version
 
-      # ! Note: we stopped using the scons cache in release builds.
-      # - name: Set up scons cache
-      #   uses: actions/cache@v4
-      #   with:
-      #     path: ${{github.workspace}}/.scons_cache/
-      #     key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-      #     restore-keys: |
-      #       ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-      #       ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
-      #       ${{env.BIN}}-${{inputs.godot-ref}}
+      - name: Set up scons cache
+        uses: actions/cache@v4
+        with:
+          path: ${{github.workspace}}/.scons_cache/
+          key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+          restore-keys: |
+            ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+            ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
+            ${{env.BIN}}-${{inputs.godot-ref}}
 
       - name: Compilation
         env:
           SCONS_CACHE: ${{github.workspace}}/.scons_cache/
         run: |
-          scons platform=android target=${{matrix.target}} arch=${{matrix.arch}} module_mono_enabled=${{matrix.dotnet}} ${{env.SCONSFLAGS}}
+          scons platform=android target=${{matrix.target}} arch=${{matrix.arch}} ${{env.SCONSFLAGS}}
           ls platform/android/java/lib/libs/*
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: tmp-android${{matrix.dotnet == true && '-dotnet' || ''}}-templates-${{strategy.job-index}}
+          name: tmp-android-templates-${{strategy.job-index}}
           path: platform/android/java/lib/libs/*
 
   make-android-package:
     runs-on: "ubuntu-20.04"
+    name: Make Android package
     needs: android-builds
-    name: ${{ matrix.name }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: Package Android templates
-            dotnet: false
-          - name: Package Android .NET templates
-            dotnet: true
 
     steps:
       - name: Clone Godot
@@ -222,7 +153,7 @@ jobs:
       - name: Download Android template builds
         uses: actions/download-artifact@v4
         with:
-          pattern: tmp-android${{matrix.dotnet == true && '-dotnet' || ''}}-templates-*
+          pattern: tmp-android-templates-*
           merge-multiple: true
           path: platform/android/java/lib/libs/
 
@@ -254,24 +185,24 @@ jobs:
 
           mkdir -p out/templates/
           mv bin/android_* out/templates/
-          echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}${{matrix.dotnet == true && '.mono' || ''}}" > out/templates/version.txt
+          echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > out/templates/version.txt
           ls -l out/*
 
       - name: Delete Android template builds
-        uses: geekyeggo/delete-artifact@v5
+        uses: geekyeggo/delete-artifact@v4
         with:
-          name: tmp-android${{matrix.dotnet == true && '-dotnet' || ''}}-templates-*
+          name: tmp-android-templates-*
           useGlob: true
           failOnError: false
 
       - name: Upload Android libs
         uses: actions/upload-artifact@v4
         with:
-          name: ${{env.NAME_PREFIX}}${{matrix.dotnet == true && '.dotnet' || ''}}.android-lib
+          name: ${{env.NAME_PREFIX}}.android-lib
           path: bin/godot-lib.*
 
       - name: Upload Android templates
         uses: actions/upload-artifact@v4
         with:
-          name: ${{env.NAME_PREFIX}}${{matrix.dotnet == true && '.dotnet' || ''}}.export-templates.android
+          name: ${{env.NAME_PREFIX}}.export-templates.android
           path: out/*

.github/workflows/demo.yml

@@ -26,16 +26,11 @@ jobs:
           fetch-tags: true
           ref: ${{ inputs.limboai-ref }}
 
-      - name: Init version
-        run: echo "LIMBOAI_VERSION=$( (git describe --tags --exact-match HEAD || git rev-parse --short HEAD) | sed 's/\(.*\)-\(.*\)/\1.\2/g' )" >> "$GITHUB_ENV"
-
       - name: Prepare artifact
         shell: bash
         run: |
+          echo "LIMBOAI_VERSION=$( (git describe --tags --exact-match HEAD || git rev-parse --short HEAD) | sed 's/\(.*\)-\(.*\)/\1.\2/g' )" >> "$GITHUB_ENV"
           cp {README,LICENSE}.md demo/
-          mkdir -p demo/addons/limboai/
-          cp -R icons/ demo/addons/limboai/icons
-          echo "${LIMBOAI_VERSION}" > demo/version.txt
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

.github/workflows/gdextension.yml

@@ -5,17 +5,13 @@ on:
       godot-cpp-ref:
         description: A tag, branch or commit hash in the godot-cpp repository.
         type: string
-        default: godot-4.3-stable
+        default: 4.2
       limboai-ref:
         description: A tag, branch or commit hash in the LimboAI repository.
         type: string
         default: master
       test-build:
-        description: Limit to pre-defined test builds
-        type: boolean
-        default: false
-      debug-symbols:
-        description: Build with debug symbols
+        description: Should we perform only a limited number of test builds?
         type: boolean
         default: false
 
@@ -24,28 +20,22 @@ on:
       godot-cpp-ref:
         description: A tag, branch or commit hash in the godot-cpp repository.
         type: string
-        default: godot-4.3-stable
+        default: 4.2
       limboai-ref:
         description: A tag, branch or commit hash in the LimboAI repository.
         type: string
         default: master
       test-build:
-        description: Limit to pre-defined test builds
-        type: boolean
-        default: false
-      debug-symbols:
-        description: Build with debug symbols
+        description: Should we perform only a limited number of test builds?
         type: boolean
         default: false
 
 # Global Settings
 env:
   SCONS_CACHE_LIMIT: 4096
-  SCONSFLAGS: use_mingw=yes dev_build=no
+  SCONSFLAGS: dev_build=no debug_symbols=no
   EM_VERSION: 3.1.45
   EM_CACHE_FOLDER: "emsdk-cache"
-  GODOT_VERSION: 4.4-beta3
-  GODOT_REPO: godotengine/godot-builds
 
 jobs:
   gdextension:
@@ -104,100 +94,14 @@ jobs:
             platform: web
             target: template_release
             arch: wasm32
-            should-build: ${{ !inputs.test-build }}
+            should-build: true
 
           - name: 🌐 Web (wasm32, debug)
             runner: ubuntu-20.04
             platform: web
-            target: editor
+            target: template_debug
             arch: wasm32
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🤖 Android (arm64, release)
-            runner: ubuntu-20.04
-            platform: android
-            target: template_release
-            arch: arm64
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🤖 Android (arm64, debug)
-            runner: ubuntu-20.04
-            platform: android
-            target: editor
-            arch: arm64
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🤖 Android (arm32, release)
-            runner: ubuntu-20.04
-            platform: android
-            target: template_release
-            arch: arm32
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🤖 Android (arm32, debug)
-            runner: ubuntu-20.04
-            platform: android
-            target: editor
-            arch: arm32
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🤖 Android (x86_64, release)
-            runner: ubuntu-20.04
-            platform: android
-            target: template_release
-            arch: x86_64
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🤖 Android (x86_64, debug)
-            runner: ubuntu-20.04
-            platform: android
-            target: editor
-            arch: x86_64
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🤖 Android (x86_32, release)
-            runner: ubuntu-20.04
-            platform: android
-            target: template_release
-            arch: x86_32
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🤖 Android (x86_32, debug)
-            runner: ubuntu-20.04
-            platform: android
-            target: editor
-            arch: x86_32
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🍏 iOS (arm64, release)
-            runner: macos-latest
-            platform: ios
-            target: template_release
-            arch: arm64
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🍏 iOS (arm64, debug)
-            runner: macos-latest
-            platform: ios
-            target: editor
-            arch: arm64
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🍏 iOS (simulator, release)
-            runner: macos-latest
-            platform: ios
-            target: template_release
-            arch: universal
-            scons-flags: ios_simulator=yes
-            should-build: ${{ !inputs.test-build }}
-
-          - name: 🍏 iOS (simulator, debug)
-            runner: macos-latest
-            platform: ios
-            target: editor
-            arch: universal
-            scons-flags: ios_simulator=yes
-            should-build: ${{ !inputs.test-build }}
+            should-build: true
 
         exclude:
           - { opts: { should-build: false } }
@@ -206,12 +110,6 @@ jobs:
       BIN: liblimboai.${{matrix.opts.platform}}.${{matrix.opts.target}}.${{matrix.opts.arch}}
 
     steps:
-      - name: Clone LimboAI module
-        uses: actions/checkout@v4
-        with:
-          fetch-tags: true
-          ref: ${{ inputs.limboai-ref }}
-
       - name: Clone godot-cpp
         uses: actions/checkout@v4
         with:
@@ -220,18 +118,39 @@ jobs:
           path: godot-cpp
           ref: ${{ inputs.godot-cpp-ref }}
 
+      - name: Clone LimboAI module
+        uses: actions/checkout@v4
+        with:
+          path: limboai
+          fetch-tags: true
+          ref: ${{ inputs.limboai-ref }}
+
       # Inits GDEXTENSION_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
-      - uses: ./.github/actions/init-version-gdext
+      - uses: ./limboai/.github/actions/init-version-gdext
 
       - name: Output NAME_PREFIX
         id: output-name-prefix
         run: echo "name-prefix=${NAME_PREFIX}" >> $GITHUB_OUTPUT
 
-      - name: Setup Linux toolchain
-        if: matrix.opts.platform == 'linux'
-        uses: ./.github/actions/setup-linux-toolchain
-        with:
-          arch: ${{matrix.opts.arch}}
+      - 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'
@@ -260,65 +179,69 @@ jobs:
           emcc -v
 
       - name: Set up scons
-        if: matrix.opts.platform != 'linux'
+        if: matrix.opts.platform == 'windows' || matrix.opts.platform == 'macos' || matrix.opts.platform == 'web'
         run: |
           python -c "import sys; print(sys.version)"
           python -m pip install scons==4.4.0
           python --version
           scons --version
 
-      - name: Set up Java 17
-        if: matrix.opts.platform == 'android'
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - uses: nttld/setup-ndk@v1
-        if: matrix.opts.platform == 'android'
-        id: setup-ndk
-        with:
-          ndk-version: r23c
-          link-to-sdk: true
-
       - name: Set up MSVC problem matcher on Windows
         if: matrix.opts.platform == 'windows'
         uses: ammaraskar/msvc-problem-matcher@master
 
       - name: Set up scons cache
-        if: inputs.test-build # ! Only cache test/PR builds
         uses: actions/cache@v4
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{env.BIN}}-${{inputs.debug-symbols}}-${{inputs.godot-cpp-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+          key: ${{env.BIN}}-${{inputs.godot-cpp-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
           restore-keys: |
-            ${{env.BIN}}-${{inputs.debug-symbols}}-${{inputs.godot-cpp-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-            ${{env.BIN}}-${{inputs.debug-symbols}}-${{inputs.godot-cpp-ref}}-${{inputs.limboai-ref}}
-            ${{env.BIN}}-${{inputs.debug-symbols}}-${{inputs.godot-cpp-ref}}
+            ${{env.BIN}}-${{inputs.godot-cpp-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+            ${{env.BIN}}-${{inputs.godot-cpp-ref}}-${{inputs.limboai-ref}}
+            ${{env.BIN}}-${{inputs.godot-cpp-ref}}
+
+      - name: Setup project structure for GDExtension
+        shell: bash
+        run: |
+          bash ./limboai/gdextension/setup_gdextension.sh --copy-all
+          echo "---"
+          ls -l
+          echo "---"
+          ls -l -R ./demo/
 
       - name: Compilation
         shell: bash
         env:
           SCONS_CACHE: ${{github.workspace}}/.scons_cache/
-          DEBUG_FLAGS: ${{ inputs.debug-symbols && 'debug_symbols=yes symbols_visibility=visible' || 'debug_symbols=no' }}
         run: |
           PATH=${GITHUB_WORKSPACE}/buildroot/bin:$PATH
-          scons platform=${{matrix.opts.platform}} target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} ${{env.DEBUG_FLAGS}} ${{matrix.opts.scons-flags}} ${{env.SCONSFLAGS}}
+          scons platform=${{matrix.opts.platform}} target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} ${{env.SCONSFLAGS}}
 
       - name: Prepare artifact
         shell: bash
         run: |
-          ls -R demo/addons/limboai/
           mkdir out
           mv demo/addons/ out/
-          cp {README,LICENSE,LOGO_LICENSE}.md out/addons/limboai/
-          cp -R demo/demo/ out/demo/
-          cp demo/LICENSE_ASSETS.md out/demo/
+          cp limboai/{README,LICENSE,LOGO_LICENSE}.md out/addons/limboai/
+          cp -R limboai/demo/demo/ out/demo/
+          cp limboai/demo/LICENSE_ASSETS.md out/demo/
           rm -f out/addons/limboai/bin/*.{exp,lib,pdb}
-          echo "${LIMBOAI_VERSION}" > out/addons/limboai/version.txt
           echo "---"
           ls -R out/
 
+      - name: Strip lib
+        if: matrix.opts.platform != 'windows' && matrix.opts.platform != 'web'
+        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@v4
         env:
@@ -327,8 +250,8 @@ jobs:
           name: ${{ env.NAME }}
           path: out/*
 
-  package-extension:
-    name: 📦 Package extension
+  merge-artifacts:
+    name: Merge artifacts
     runs-on: ubuntu-latest
     needs: gdextension
 
@@ -339,48 +262,3 @@ jobs:
           name: ${{needs.gdextension.outputs.name-prefix}}
           pattern: tmp-gdextension.*
           delete-merged: true
-
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{needs.gdextension.outputs.name-prefix}}
-          path: out/
-
-      - name: Setup Godot
-        shell: bash
-        run: |
-          echo "Downloading Godot ${GODOT_VERSION}"
-          mkdir bin
-          cd bin
-          wget "https://github.com/${GODOT_REPO}/releases/download/${GODOT_VERSION}/Godot_v${GODOT_VERSION}_linux.x86_64.zip" -O godot.zip
-          unzip godot.zip
-          rm godot.zip
-          mv Godot_* godot
-          chmod u+x godot
-          ls -l
-          cd ..
-          ./bin/godot --version
-
-      - name: Generate icon .import files
-        shell: bash
-        run: |
-          touch out/project.godot
-          timeout 20s ./bin/godot --headless --editor --path ./out/ || /bin/true
-          rm out/project.godot
-          rm -rf out/.godot/
-
-      - name: Change editor icon import settings
-        shell: bash
-        run: |
-          echo "--- Listing icons dir:"
-          ls out/addons/limboai/icons/
-          echo "--- (end of listing)"
-          sed -i 's|editor/scale_with_editor_scale=false|editor/scale_with_editor_scale=true|' out/addons/limboai/icons/*.import
-          sed -i 's|editor/convert_colors_with_editor_theme=false|editor/convert_colors_with_editor_theme=true|' out/addons/limboai/icons/*.import
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{needs.gdextension.outputs.name-prefix}}
-          path: out/*
-          overwrite: true

.github/workflows/ios.yml

@@ -25,10 +25,15 @@ on:
 # Global Settings
 env:
   SCONS_CACHE_LIMIT: 4096
-  SCONSFLAGS: production=yes tests=no verbose=yes warnings=extra
+  SCONSFLAGS: production=yes tests=no verbose=yes warnings=extra werror=yes
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
 
+permissions:
+  actions: write
+  contents: read
+  packages: read
+
 jobs:
   ios-builds:
     runs-on: "macos-latest"
@@ -42,25 +47,21 @@ jobs:
             target: template_release
             arch: arm64
             ios_simulator: false
-            dotnet: false
 
           - name: Template (arm64, debug)
             target: template_debug
             arch: arm64
             ios_simulator: false
-            dotnet: false
 
-          - name: Simulator (x86_64, release)
+          - name: Simulator Lib (x86_64, release)
             target: template_release
             arch: x86_64
             ios_simulator: true
-            dotnet: false
 
-          - name: Simulator (x86_64, debug)
+          - name: Simulator Lib (x86_64, debug)
             target: template_debug
             arch: x86_64
             ios_simulator: true
-            dotnet: false
 
           # ! Disabled for now as it doesn't work with cctools-port and current LLVM.
           # * See https://github.com/godotengine/build-containers/pull/85.
@@ -74,32 +75,8 @@ jobs:
           #   arch: arm64
           #   ios_simulator: true
 
-          - name: Template .NET (arm64, release)
-            target: template_release
-            arch: arm64
-            ios_simulator: false
-            dotnet: true
-
-          - name: Template .NET (arm64, debug)
-            target: template_debug
-            arch: arm64
-            ios_simulator: false
-            dotnet: true
-
-          - name: Simulator .NET (x86_64, release)
-            target: template_release
-            arch: x86_64
-            ios_simulator: true
-            dotnet: true
-
-          - name: Simulator .NET (x86_64, debug)
-            target: template_debug
-            arch: x86_64
-            ios_simulator: true
-            dotnet: true
-
     env:
-      BIN: godot.ios.${{matrix.target}}.${{matrix.arch}}${{  matrix.dotnet == true && '.mono' || ''  }}
+      BIN: godot.ios.${{matrix.target}}.${{matrix.arch}}
 
     steps:
       - name: Clone Godot
@@ -136,52 +113,35 @@ jobs:
 
       - name: Set up Vulkan SDK
         run: |
-          # ! Note: Vulkan SDK changed packaging, so we need to inline these steps for the time being.
-          #sh misc/scripts/install_vulkan_sdk_macos.sh
+          sh misc/scripts/install_vulkan_sdk_macos.sh
 
-          curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip" -o /tmp/vulkan-sdk.zip
-          unzip /tmp/vulkan-sdk.zip -d /tmp
-          /tmp/InstallVulkan.app/Contents/MacOS/InstallVulkan --accept-licenses --default-answer --confirm-command install
-          rm -Rf /tmp/InstallVulkan.app
-          rm -f /tmp/vulkan-sdk.zip
-
-      # ! Note: we stopped using the scons cache in release builds.
-      # - name: Set up scons cache
-      #   uses: actions/cache@v4
-      #   with:
-      #     path: ${{github.workspace}}/.scons_cache/
-      #     key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-      #     restore-keys: |
-      #       ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-      #       ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
-      #       ${{env.BIN}}-${{inputs.godot-ref}}
+      - name: Set up scons cache
+        uses: actions/cache@v4
+        with:
+          path: ${{github.workspace}}/.scons_cache/
+          key: ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+          restore-keys: |
+            ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+            ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
+            ${{env.BIN}}-${{inputs.godot-ref}}
 
       - name: Compilation
         env:
           SCONS_CACHE: ${{github.workspace}}/.scons_cache/
         run: |
-          scons platform=ios target=${{matrix.target}} arch=${{matrix.arch}} ios_simulator=${{matrix.ios_simulator}} module_mono_enabled=${{matrix.dotnet}} ${{env.SCONSFLAGS}}
+          scons platform=ios target=${{matrix.target}} arch=${{matrix.arch}} ios_simulator=${{matrix.ios_simulator}} ${{env.SCONSFLAGS}}
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: tmp-ios${{matrix.dotnet == true && '-dotnet' || ''}}-templates-${{strategy.job-index}}
+          name: tmp-ios-templates-${{strategy.job-index}}
           path: bin/*
 
   package-ios-templates:
     runs-on: "macos-latest"
-    name: ${{ matrix.name }}
+    name: Package iOS templates
     needs: ios-builds
 
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: Package iOS templates
-            dotnet: false
-          - name: Package iOS .NET templates
-            dotnet: true
-
     steps:
       - name: Clone Godot
         uses: actions/checkout@v4
@@ -200,19 +160,12 @@ jobs:
 
       - name: Set up Vulkan SDK
         run: |
-          # ! Note: Vulkan SDK changed packaging, so we need to inline these steps for the time being.
-          #sh misc/scripts/install_vulkan_sdk_macos.sh
-
-          curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip" -o /tmp/vulkan-sdk.zip
-          unzip /tmp/vulkan-sdk.zip -d /tmp
-          /tmp/InstallVulkan.app/Contents/MacOS/InstallVulkan --accept-licenses --default-answer --confirm-command install
-          rm -Rf /tmp/InstallVulkan.app
-          rm -f /tmp/vulkan-sdk.zip
+          sh misc/scripts/install_vulkan_sdk_macos.sh
 
       - name: Download templates artifact
         uses: actions/download-artifact@v4
         with:
-          pattern: tmp-ios${{matrix.dotnet == true && '-dotnet' || ''}}-templates-*
+          pattern: tmp-ios-templates-*
           merge-multiple: true
           path: bin/
 
@@ -222,6 +175,9 @@ jobs:
           cp -r misc/dist/ios_xcode bin/
           cd bin/
 
+          # --- Note: Doesn't look like libs need stripping ---
+          # strip *.a
+
           mv libgodot.ios.template_debug.arm64.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64/libgodot.a
           # ! lipo -create libgodot.ios.template_debug.arm64.simulator.a libgodot.ios.template_debug.x86_64.simulator.a -output ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
           mv libgodot.ios.template_debug.x86_64.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
@@ -237,19 +193,19 @@ jobs:
           cd ios_xcode
           zip -q -9 -r ${{github.workspace}}/out/templates/ios.zip *
 
-          echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}${{matrix.dotnet == true && '.mono' || ''}}" > ${{github.workspace}}/out/templates/version.txt
+          echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > ${{github.workspace}}/out/templates/version.txt
 
           ls -l ${{github.workspace}}/out/*
 
       - name: Upload template bundle
         uses: actions/upload-artifact@v4
         with:
-          name: ${{env.NAME_PREFIX}}${{matrix.dotnet == true && '.dotnet' || ''}}.export-templates.ios
+          name: ${{env.NAME_PREFIX}}.export-templates.ios
           path: out/*
 
       - name: Delete templates artifact
-        uses: geekyeggo/delete-artifact@v5
+        uses: geekyeggo/delete-artifact@v4
         with:
-          name: tmp-ios${{matrix.dotnet == true && '-dotnet' || ''}}-templates-*
+          name: tmp-ios-templates-*
           useGlob: true
           failOnError: false

.github/workflows/linux.yml

@@ -11,7 +11,7 @@ on:
         type: string
         default: master
       test-build:
-        description: Limit to pre-defined test builds
+        description: Should we perform only a limited number of test builds?
         type: boolean
         default: false
 
@@ -26,7 +26,7 @@ on:
         type: string
         default: master
       test-build:
-        description: Limit to pre-defined test builds
+        description: Should we perform only a limited number of test builds?
         type: boolean
         default: false
 
@@ -45,8 +45,6 @@ jobs:
       fail-fast: false
       matrix:
         opts:
-          # * Standard x86_64
-
           - name: Editor (x86_64, release)
             target: editor
             arch: x86_64
@@ -65,8 +63,6 @@ jobs:
             dotnet: false
             should-build: ${{ !inputs.test-build }}
 
-          # * Standard x86_32
-
           # - name: Editor (x86_32, release)
           #   target: editor
           #   arch: x86_32
@@ -85,47 +81,11 @@ jobs:
             dotnet: false
             should-build: ${{ !inputs.test-build }}
 
-          # * Standard arm64
-
-          - name: Editor (arm64, release)
-            target: editor
-            arch: arm64
-            dotnet: false
-            should-build: ${{ !inputs.test-build }}
-
-          - name: Template (arm64, release)
-            target: template_release
-            arch: arm64
-            dotnet: false
-            should-build: ${{ !inputs.test-build }}
-
-          - name: Template (arm64, debug)
-            target: template_debug
-            arch: arm64
-            dotnet: false
-            should-build: ${{ !inputs.test-build }}
-
-          # * Standard arm32
-
-          - name: Template (arm32, release)
-            target: template_release
-            arch: arm32
-            dotnet: false
-            should-build: ${{ !inputs.test-build }}
-
-          - name: Template (arm32, debug)
-            target: template_debug
-            arch: arm32
-            dotnet: false
-            should-build: ${{ !inputs.test-build }}
-
-          # * .NET x86_64
-
           - name: Editor .NET (x86_64, release)
             target: editor
             arch: x86_64
             dotnet: true
-            should-build: true
+            should-build: ${{ !inputs.test-build }}
 
           - name: Template .NET (x86_64, release)
             target: template_release
@@ -139,8 +99,6 @@ jobs:
             dotnet: true
             should-build: ${{ !inputs.test-build }}
 
-          # * .NET x86_32
-
           # - name: Editor .NET (x86_32, release)
           #   target: editor
           #   arch: x86_32
@@ -159,42 +117,6 @@ jobs:
             dotnet: true
             should-build: ${{ !inputs.test-build }}
 
-          # * .NET arm64
-
-          # ! FIXME: Needs a separate job for .NET glue generation since we can't execute arm64 binaries on x86_64.
-          # !        Alternatively, solution generation can be done as post-process job, taking the glue from x86_64, after all builds complete.
-          # - name: Editor .NET (arm64, release)
-          #   target: editor
-          #   arch: arm64
-          #   dotnet: true
-          #   should-build: ${{ !inputs.test-build }}
-
-          - name: Template .NET (arm64, release)
-            target: template_release
-            arch: arm64
-            dotnet: true
-            should-build: ${{ !inputs.test-build }}
-
-          - name: Template .NET (arm64, debug)
-            target: template_debug
-            arch: arm64
-            dotnet: true
-            should-build: ${{ !inputs.test-build }}
-
-          # * .NET arm32
-
-          - name: Template .NET (arm32, release)
-            target: template_release
-            arch: arm32
-            dotnet: true
-            should-build: ${{ !inputs.test-build }}
-
-          - name: Template .NET (arm32, debug)
-            target: template_debug
-            arch: arm32
-            dotnet: true
-            should-build: ${{ !inputs.test-build }}
-
         exclude:
           - { opts: { should-build: false } }
 
@@ -217,17 +139,29 @@ jobs:
       # Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
       - uses: ./modules/limboai/.github/actions/init-version
 
-      - name: Set up Linux toolchain
-        uses: ./modules/limboai/.github/actions/setup-linux-toolchain
-        with:
-          arch: ${{matrix.opts.arch}}
-
-      - name: Set up Wayland deps
+      # About sed see: https://github.com/godotengine/buildroot/issues/6
+      - name: Set up buildroot x86_64
+        if: matrix.opts.arch == 'x86_64'
         run: |
-          sudo apt-get install libwayland-dev
+          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
+          sed -i x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
+          ./relocate-sdk.sh
+          cd ..
+
+      - name: Set up buildroot x86_32
+        if: 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 scons cache
-        if: inputs.test-build # ! Only cache test/PR builds
         uses: actions/cache@v4
         with:
           path: ${{github.workspace}}/.scons_cache/
@@ -244,17 +178,25 @@ jobs:
           PATH=${GITHUB_WORKSPACE}/buildroot/bin:$PATH
           scons platform=linuxbsd target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} module_mono_enabled=${{matrix.opts.dotnet}} ${{env.SCONSFLAGS}}
 
-      - name: Build .NET assemblies
+      - name: Generate C# glue
         if: matrix.opts.dotnet && matrix.opts.target == 'editor'
-        uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
-        with:
-          platform: linuxbsd
-          bin: ${{env.BIN}}
+        env:
+          GODOT_VERSION_STATUS: limboai
+        run: |
+          ./bin/$BIN --headless --generate-mono-glue ./modules/mono/glue || true
+
+      - name: Build .NET solutions
+        if: matrix.opts.dotnet && matrix.opts.target == 'editor'
+        env:
+          GODOT_VERSION_STATUS: limboai
+        run: |
+          ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
 
       - name: Prepare artifact
         env:
           OUTDIR: ${{ startsWith(matrix.opts.target, 'template') && 'out/templates' || 'out/' }}
         run: |
+          strip ./bin/godot.*
           chmod +x ./bin/godot.*
           mkdir -p ${{env.OUTDIR}}
           mv bin/* ${{env.OUTDIR}}
@@ -279,7 +221,7 @@ jobs:
           BUILD_TYPE: ${{ endsWith(matrix.opts.target, 'release') && 'release' || 'debug' }}
         run: |
           mv out/templates/${BIN} out/templates/linux_${BUILD_TYPE}.${{matrix.opts.arch}}
-          echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}${{matrix.opts.dotnet == true && '.mono' || ''}}" > out/templates/version.txt
+          echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > out/templates/version.txt
           ls -R out/
 
       - name: Upload artifact

.github/workflows/macos.yml

@@ -11,7 +11,7 @@ on:
         type: string
         default: master
       test-build:
-        description: Limit to pre-defined test builds
+        description: Should we perform only a limited number of test builds?
         type: boolean
         default: false
 
@@ -26,17 +26,22 @@ on:
         type: string
         default: master
       test-build:
-        description: Limit to pre-defined test builds
+        description: Should we perform only a limited number of test builds?
         type: boolean
         default: false
 
 # Global Settings
 env:
   SCONS_CACHE_LIMIT: 4096
-  SCONSFLAGS: production=yes tests=no verbose=yes warnings=extra
+  SCONSFLAGS: production=yes tests=no verbose=yes warnings=extra werror=yes
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
 
+permissions:
+  actions: write
+  contents: read
+  packages: read
+
 jobs:
   macos-builds:
     runs-on: "macos-latest"
@@ -49,80 +54,90 @@ jobs:
           - name: Editor (x86_64, release)
             target: editor
             arch: x86_64
-            dotnet: false
+            build-mono: false
             should-build: true
 
           - name: Template (x86_64, release)
             target: template_release
             arch: x86_64
-            dotnet: false
+            build-mono: false
             should-build: ${{ !inputs.test-build }}
 
           - name: Template (x86_64, debug)
             target: template_debug
             arch: x86_64
-            dotnet: false
+            build-mono: false
             should-build: ${{ !inputs.test-build }}
 
           - name: Editor (arm64, release)
             target: editor
             arch: arm64
-            dotnet: false
+            build-mono: false
             should-build: true
 
           - name: Template (arm64, release)
             target: template_release
             arch: arm64
-            dotnet: false
+            build-mono: false
             should-build: ${{ !inputs.test-build }}
 
           - name: Template (arm64, debug)
             target: template_debug
             arch: arm64
-            dotnet: false
+            build-mono: false
             should-build: ${{ !inputs.test-build }}
 
-          - name: .NET Editor (x86_64, release)
-            target: editor
-            arch: x86_64
-            dotnet: true
-            should-build: ${{ !inputs.test-build }}
+          # ! Disabled for now: .NET version fails to build
 
-          - name: .NET Template (x86_64, release)
-            target: template_release
-            arch: x86_64
-            dotnet: true
-            should-build: ${{ !inputs.test-build }}
+          # - name: .NET Editor (x86_64, release)
+          #   target: editor
+          #   arch: x86_64
+          #   build-mono: true
+          #   artifact-name: macos-mono-editor
+          #   cache-name: macos-editor
+          #   should-build: ${{ !inputs.test-build }}
 
-          - name: .NET Template (x86_64, debug)
-            target: template_debug
-            arch: x86_64
-            dotnet: true
-            should-build: ${{ !inputs.test-build }}
+          # - name: .NET Template (x86_64, release)
+          #   target: template_release
+          #   arch: x86_64
+          #   build-mono: true
+          #   artifact-name: macos-mono-templates
+          #   should-build: ${{ !inputs.test-build }}
 
-          - name: .NET Editor (arm64, release)
-            target: editor
-            arch: arm64
-            dotnet: true
-            should-build: ${{ !inputs.test-build }}
+          # - name: .NET Template (x86_64, debug)
+          #   target: template_debug
+          #   arch: x86_64
+          #   build-mono: true
+          #   artifact-name: macos-mono-templates
+          #   should-build: ${{ !inputs.test-build }}
 
-          - name: .NET Template (arm64, release)
-            target: template_release
-            arch: arm64
-            dotnet: true
-            should-build: ${{ !inputs.test-build }}
+          # - name: .NET Editor (arm64, release)
+          #   target: editor
+          #   arch: arm64
+          #   build-mono: true
+          #   artifact-name: macos-mono-editor
+          #   cache-name: macos-editor
+          #   should-build: ${{ !inputs.test-build }}
 
-          - name: .NET Template (arm64, debug)
-            target: template_debug
-            arch: arm64
-            dotnet: true
-            should-build: ${{ !inputs.test-build }}
+          # - name: .NET Template (arm64, release)
+          #   target: template_release
+          #   arch: arm64
+          #   build-mono: true
+          #   artifact-name: macos-mono-templates
+          #   should-build: ${{ !inputs.test-build }}
+
+          # - name: .NET Template (arm64, debug)
+          #   target: template_debug
+          #   arch: arm64
+          #   build-mono: true
+          #   artifact-name: macos-mono-templates
+          #   should-build: ${{ !inputs.test-build }}
 
         exclude:
           - { opts: { should-build: false } }
 
     env:
-      BIN: godot.macos.${{matrix.opts.target}}.${{matrix.opts.arch}}${{  matrix.opts.dotnet == true && '.mono' || ''  }}
+      BIN: godot.macos.${{matrix.opts.target}}.${{matrix.opts.arch}}${{  matrix.opts.build-mono == true && '.mono' || ''  }}
 
     steps:
       - name: Clone Godot
@@ -151,12 +166,6 @@ jobs:
           python -c "import sys; print(sys.version)"
           python -m pip install scons==4.4.0
 
-      - name: Set up .NET SDK 6.0
-        if: matrix.opts.dotnet
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: "6.0.x"
-
       - name: Diagnostics
         run: |
           python --version
@@ -165,19 +174,9 @@ jobs:
 
       - name: Set up Vulkan SDK
         run: |
-          # ! Note: Vulkan SDK changed packaging, so we need to inline these steps for the time being.
-          #sh misc/scripts/install_vulkan_sdk_macos.sh
-
-          curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/config.json" -o /tmp/vulkan-sdk.json
-          sdk_version=`jq -r '.version' /tmp/vulkan-sdk.json`
-          curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip" -o /tmp/vulkan-sdk.zip
-          unzip /tmp/vulkan-sdk.zip -d /tmp
-          /tmp/InstallVulkan-${sdk_version}.app/Contents/MacOS/InstallVulkan-${sdk_version} --accept-licenses --default-answer --confirm-command install
-          rm -Rf /tmp/InstallVulkan-${sdk_version}.app
-          rm -f /tmp/vulkan-sdk.zip
+          sh misc/scripts/install_vulkan_sdk_macos.sh
 
       - name: Set up scons cache
-        if: inputs.test-build # ! Only cache test/PR builds
         uses: actions/cache@v4
         with:
           path: ${{github.workspace}}/.scons_cache/
@@ -191,23 +190,29 @@ jobs:
         env:
           SCONS_CACHE: ${{github.workspace}}/.scons_cache/
         run: |
-          scons -j2 platform=macos target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} module_mono_enabled=${{matrix.opts.dotnet}} ${{env.SCONSFLAGS}}
+          scons -j2 platform=macos target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} module_mono_enabled=${{matrix.opts.build-mono}} ${{env.SCONSFLAGS}}
 
-      - name: Build .NET assemblies
-        if: matrix.opts.dotnet && matrix.opts.target == 'editor'
-        uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
-        with:
-          platform: macos
-          bin: ${{env.BIN}}
+      # ! Disabled for now: .NET version fails to build
+
+      # - name: Generate C# glue
+      #   if: matrix.opts.build-mono && matrix.opts.target == 'editor'
+      #   run: |
+      #     ./bin/$BIN --headless --generate-mono-glue ./modules/mono/glue || true
+
+      # - name: Build .NET solutions
+      #   if: matrix.opts.build-mono && matrix.opts.target == 'editor'
+      #   run: |
+      #     ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=macos
 
       - name: Prepare artifact
         run: |
+          strip bin/godot.*
           chmod +x bin/godot.*
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: tmp-${{matrix.opts.dotnet == true && 'dotnet-' || ''}}macos-${{matrix.opts.target}}-${{matrix.opts.arch}}
+          name: tmp-macos-${{matrix.opts.target}}-${{matrix.opts.arch}}
           path: bin/*
 
   make-macos-bundle:
@@ -215,19 +220,6 @@ jobs:
     name: Make macOS Bundles
     needs: macos-builds
 
-    strategy:
-      fail-fast: false
-      matrix:
-        opts:
-          - download-prefix: tmp-macos
-            dotnet: false
-            should-build: true
-          - download-prefix: tmp-dotnet-macos
-            dotnet: true
-            should-build: ${{ !inputs.test-build }}
-        exclude:
-          - { opts: { should-build: false } }
-
     steps:
       - name: Clone Godot
         uses: actions/checkout@v4
@@ -247,43 +239,41 @@ jobs:
       - name: Download editor artifact
         uses: actions/download-artifact@v4
         with:
-          pattern: ${{matrix.opts.download-prefix}}-editor-*
+          pattern: tmp-macos-editor-*
           merge-multiple: true
           path: bin/
 
       # Zipping the editor bundle to retain executable bit;
       # workaround for: https://github.com/actions/upload-artifact/issues/38
       - name: Make editor bundle
-        env:
-          APP_NAME: Godot${{matrix.opts.dotnet == true && '_mono' || ''}}.app
         run: |
           ls bin/
-          lipo -create bin/godot.macos.editor.x86_64* bin/godot.macos.editor.arm64* -output bin/godot.macos.editor.universal
+          lipo -create bin/godot.macos.editor.x86_64 bin/godot.macos.editor.arm64 -output bin/godot.macos.editor.universal
+          strip bin/godot.macos.editor.universal
+          rm bin/godot.macos.editor.{x86_64,arm64}
           mkdir -p out/editor/
-          cp -r misc/dist/macos_tools.app out/editor/${APP_NAME}
-          mkdir -p out/editor/${APP_NAME}/Contents/{MacOS,Resources}
-          cp bin/godot.macos.editor.universal out/editor/${APP_NAME}/Contents/MacOS/Godot
-          chmod +x out/editor/${APP_NAME}/Contents/MacOS/Godot
-          cp -r bin/GodotSharp out/editor/${APP_NAME}/Contents/Resources/GodotSharp || true
+          cp -r misc/dist/macos_tools.app out/editor/Godot.app
+          mkdir -p out/editor/Godot.app/Contents/MacOS
+          cp bin/godot.macos.editor.universal out/editor/Godot.app/Contents/MacOS/Godot
+          chmod +x out/editor/Godot.app/Contents/MacOS/Godot
           pushd out/editor
-          zip -q -9 -r ${APP_NAME}.zip ${APP_NAME}
-          rm -rf ${APP_NAME}
+          zip -r Godot.app.zip Godot.app
+          rm -rf Godot.app
           echo -e "## Why another ZIP inside?\n\nWorkaround for: https://github.com/actions/upload-artifact/issues/38\n" > README.md
           popd
-          rm -rf bin/*
           ls out/editor/
 
       - name: Upload editor bundle
         uses: actions/upload-artifact@v4
         with:
-          name: ${{env.NAME_PREFIX}}${{matrix.opts.dotnet == true && '.dotnet' || ''}}.editor.macos.universal
+          name: ${{env.NAME_PREFIX}}.editor.macos.universal
           path: out/editor/*
 
       - name: Download templates artifact
         if: ${{ !inputs.test-build }}
         uses: actions/download-artifact@v4
         with:
-          pattern: ${{matrix.opts.download-prefix}}-template_*
+          pattern: tmp-macos-template_*
           merge-multiple: true
           path: bin/
 
@@ -292,23 +282,25 @@ jobs:
         run: |
           rm -rf out/
           ls bin/
-          lipo -create bin/godot.macos.template_release.x86_64* bin/godot.macos.template_release.arm64* -output bin/godot.macos.template_release.universal
-          lipo -create bin/godot.macos.template_debug.x86_64* bin/godot.macos.template_debug.arm64* -output bin/godot.macos.template_debug.universal
+          lipo -create bin/godot.macos.template_release.x86_64 bin/godot.macos.template_release.arm64 -output bin/godot.macos.template_release.universal
+          lipo -create bin/godot.macos.template_debug.x86_64 bin/godot.macos.template_debug.arm64 -output bin/godot.macos.template_debug.universal
+          rm bin/godot.macos.template_{debug,release}.{x86_64,arm64}
+          strip bin/godot.*
           cp -r misc/dist/macos_template.app macos_template.app
           mkdir -p macos_template.app/Contents/MacOS
           cp bin/godot.macos.template_debug.universal macos_template.app/Contents/MacOS/godot_macos_debug.universal
           cp bin/godot.macos.template_release.universal macos_template.app/Contents/MacOS/godot_macos_release.universal
           chmod +x macos_template.app/Contents/MacOS/godot_macos_{release,debug}.universal
-          zip -q -9 -r macos.zip macos_template.app
+          zip -r macos.zip macos_template.app
+          rm bin/*
           mkdir -p out/templates/
           mv macos.zip out/templates/macos.zip
-          echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}${{matrix.opts.dotnet == true && '.mono' || ''}}" > out/templates/version.txt
-          rm -rf bin/*
+          echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > out/templates/version.txt
           ls out/templates/
 
-      - uses: geekyeggo/delete-artifact@v5
+      - uses: geekyeggo/delete-artifact@v4
         with:
-          name: ${{matrix.opts.download-prefix}}-*
+          name: tmp-macos-*
           useGlob: true
           failOnError: false
 
@@ -316,5 +308,5 @@ jobs:
         if: ${{ !inputs.test-build }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{env.NAME_PREFIX}}${{matrix.opts.dotnet == true && '.dotnet' || ''}}.export-templates.macos
+          name: ${{env.NAME_PREFIX}}.export-templates.macos
           path: out/*

.github/workflows/test_builds.yml

@@ -26,8 +26,13 @@ concurrency:
 
 # Global Settings.
 env:
-  GODOT_REF: "master"
-  GODOT_CPP_REF: "master"
+  GODOT_REF: "4.2"
+  GODOT_CPP_REF: "4.2"
+
+permissions:
+  actions: write
+  contents: read
+  packages: read
 
 jobs:
   unit-tests:
@@ -36,7 +41,7 @@ jobs:
 
     # Settings
     env:
-      SCONSFLAGS: platform=linuxbsd target=editor arch=x86_64 production=false dev_build=true tests=true verbose=yes warnings=extra werror=yes strict_checks=yes
+      SCONSFLAGS: platform=linuxbsd target=editor arch=x86_64 production=false dev_build=true tests=true verbose=yes warnings=extra werror=yes
       SCONS_CACHE_LIMIT: 7168
       BIN: godot.linuxbsd.editor.dev.x86_64
 
@@ -52,10 +57,16 @@ jobs:
         with:
           path: modules/limboai
 
-      - name: Set up Linux toolchain
-        uses: ./modules/limboai/.github/actions/setup-linux-toolchain
-        with:
-          arch: x86_64
+      # About sed see: https://github.com/godotengine/buildroot/issues/6
+      - name: Set up buildroot 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
+          sed -i x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
+          ./relocate-sdk.sh
+          cd ..
 
       - name: Set up scons cache
         uses: actions/cache@v4
@@ -101,18 +112,6 @@ jobs:
         run: |
           bin/${{ env.BIN }} --test --headless
 
-  static-checks:
-    name: ⚙️ Static checks
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Clone LimboAI module
-        uses: actions/checkout@v4
-
-      - name: Code style checks
-        uses: pre-commit/action@v3.0.1
-        with:
-          extra_args: --all-files
-
   cache-env:
     runs-on: ubuntu-latest
     outputs:

.github/workflows/web.yml

@@ -40,42 +40,18 @@ jobs:
         include:
           - name: Template (release)
             target: template_release
-            threads: true
             dlink: false
 
-          - name: Template (release, dlink)
+          - name: Template (release, dlink_enabled=true)
             target: template_release
-            threads: true
             dlink: true
 
           - name: Template (debug)
             target: template_debug
-            threads: true
             dlink: false
 
-          - name: Template (debug, dlink)
+          - name: Template (debug, dlink_enabled=true)
             target: template_debug
-            threads: true
-            dlink: true
-
-          - name: Template (release, nothreads)
-            target: template_release
-            threads: false
-            dlink: false
-
-          - name: Template (release, nothreads, dlink)
-            target: template_release
-            threads: false
-            dlink: true
-
-          - name: Template (debug, nothreads)
-            target: template_debug
-            threads: false
-            dlink: false
-
-          - name: Template (debug, nothreads, dlink)
-            target: template_debug
-            threads: false
             dlink: true
 
     env:
@@ -120,39 +96,34 @@ jobs:
           python --version
           scons --version
 
-      # ! Note: we stopped using the scons cache in release builds.
-      # - name: Set up scons cache
-      #   uses: actions/cache@v4
-      #   with:
-      #     path: ${{github.workspace}}/.scons_cache/
-      #     key: ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-      #     restore-keys: |
-      #       ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
-      #       ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
-      #       ${{env.CACHE_NAME}}-${{inputs.godot-ref}}
+      - name: Set up scons cache
+        uses: actions/cache@v4
+        with:
+          path: ${{github.workspace}}/.scons_cache/
+          key: ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+          restore-keys: |
+            ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}-${{env.LIMBOAI_VERSION}}
+            ${{env.CACHE_NAME}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
+            ${{env.CACHE_NAME}}-${{inputs.godot-ref}}
 
       - name: Compilation
         env:
           SCONS_CACHE: ${{github.workspace}}/.scons_cache/
         run: |
-          scons platform=web target=${{matrix.target}} threads=${{matrix.threads}} dlink_enabled=${{matrix.dlink}} ${{env.SCONSFLAGS}}
+          scons platform=web target=${{matrix.target}} dlink_enabled=${{matrix.dlink}} ${{env.SCONSFLAGS}}
 
       - name: Prepare artifacts
         run: |
           mkdir -p out/templates/
-          mv bin/godot.web.template_debug.wasm32.zip out/templates/web_debug.zip || true
-          mv bin/godot.web.template_debug.wasm32.nothreads.zip out/templates/web_nothreads_debug.zip || true
-          mv bin/godot.web.template_debug.wasm32.dlink.zip out/templates/web_dlink_debug.zip || true
-          mv bin/godot.web.template_debug.wasm32.nothreads.dlink.zip out/templates/web_dlink_nothreads_debug.zip || true
           mv bin/godot.web.template_release.wasm32.zip out/templates/web_release.zip || true
-          mv bin/godot.web.template_release.wasm32.nothreads.zip out/templates/web_nothreads_release.zip || true
           mv bin/godot.web.template_release.wasm32.dlink.zip out/templates/web_dlink_release.zip || true
-          mv bin/godot.web.template_release.wasm32.nothreads.dlink.zip out/templates/web_dlink_nothreads_release.zip || true
+          mv bin/godot.web.template_debug.wasm32.zip out/templates/web_debug.zip || true
+          mv bin/godot.web.template_debug.wasm32.dlink.zip out/templates/web_dlink_debug.zip || true
           rm -rf bin/
           echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > out/templates/version.txt
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{env.NAME_PREFIX}}.${{matrix.target}}.web${{matrix.threads == false && '.nothreads' || ''}}${{matrix.dlink == true && '.dlink' || ''}}
+          name: ${{env.NAME_PREFIX}}.${{matrix.target}}.web${{matrix.dlink == true && '.dlink' || ''}}
           path: out/*

.github/workflows/windows.yml

@@ -11,7 +11,7 @@ on:
         type: string
         default: master
       test-build:
-        description: Limit to pre-defined test builds
+        description: Should we perform only a limited number of test builds?
         type: boolean
         default: false
 
@@ -26,174 +26,103 @@ on:
         type: string
         default: master
       test-build:
-        description: Limit to pre-defined test builds
+        description: Should we perform only a limited number of test builds?
         type: boolean
         default: false
 
 # Global Settings
 env:
-  BUILD_IMAGE_VERSION: 4.3-f40
-  MESA_VERSION: 23.1.9-1
+  SCONS_CACHE_MSVC_CONFIG: true
   SCONS_CACHE_LIMIT: 4096
-  SCONSFLAGS: production=yes use_mingw=yes verbose=yes warnings=no progress=no d3d12=yes
+  SCONSFLAGS: production=yes tests=no verbose=yes warnings=extra werror=yes
+  DOTNET_NOLOGO: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
 
 jobs:
   windows-builds:
-    runs-on: "ubuntu-24.04"
+    runs-on: "windows-latest"
     name: ${{ matrix.opts.name }}
-    outputs:
-      built-dotnet-editor: ${{ steps.mark-dotnet-editor.outputs.built-dotnet-editor }}
     strategy:
       fail-fast: false
       matrix:
         opts:
-          # * Standard x86_64
-
           - name: Editor (x86_64, release)
             target: editor
             arch: x86_64
-            llvm: false
             dotnet: false
             should-build: true
 
           - name: Template (x86_64, release)
             target: template_release
             arch: x86_64
-            llvm: false
             dotnet: false
             should-build: ${{ !inputs.test-build }}
 
           - name: Template (x86_64, debug)
             target: template_debug
             arch: x86_64
-            llvm: false
             dotnet: false
             should-build: ${{ !inputs.test-build }}
 
-          # * Standard x86_32
-
           # - name: Editor (x86_32, release)
           #   target: editor
           #   arch: x86_32
-          #   llvm: false
           #   dotnet: false
           # should-build: ${{ !inputs.test-build }}
 
           - name: Template (x86_32, release)
             target: template_release
             arch: x86_32
-            llvm: false
             dotnet: false
             should-build: ${{ !inputs.test-build }}
 
           - name: Template (x86_32, debug)
             target: template_debug
             arch: x86_32
-            llvm: false
             dotnet: false
             should-build: ${{ !inputs.test-build }}
 
-          # * Standard arm64
-
-          # - name: Editor (arm64, release)
-          #   target: editor
-          #   arch: arm64
-          #   llvm: true
-          #   dotnet: false
-          #   should-build: ${{ !inputs.test-build }}
-
-          - name: Template (arm64, release)
-            target: template_release
-            arch: arm64
-            llvm: true
-            dotnet: false
-            scons-flags: mingw_prefix=/root/llvm-mingw
-            should-build: ${{ !inputs.test-build }}
-
-          - name: Template (arm64, debug)
-            target: template_debug
-            arch: arm64
-            llvm: true
-            dotnet: false
-            scons-flags: mingw_prefix=/root/llvm-mingw
-            should-build: ${{ !inputs.test-build }}
-
-          # * .NET x86_64
-
           - name: Editor .NET (x86_64, release)
             target: editor
             arch: x86_64
-            llvm: false
             dotnet: true
-            should-build: ${{ !inputs.test-build }}
+            should-build: true
 
           - name: Template .NET (x86_64, release)
             target: template_release
             arch: x86_64
-            llvm: false
             dotnet: true
             should-build: ${{ !inputs.test-build }}
 
           - name: Template .NET (x86_64, debug)
             target: template_debug
             arch: x86_64
-            llvm: false
             dotnet: true
             should-build: ${{ !inputs.test-build }}
 
-          # * .NET x86_32
-
           # - name: Editor .NET (x86_32, release)
           #   target: editor
           #   arch: x86_32
-          #   llvm: false
           #   dotnet: true
           # should-build: ${{ !inputs.test-build }}
 
           - name: Template .NET (x86_32, release)
             target: template_release
             arch: x86_32
-            llvm: false
             dotnet: true
             should-build: ${{ !inputs.test-build }}
 
           - name: Template .NET (x86_32, debug)
             target: template_debug
             arch: x86_32
-            llvm: false
             dotnet: true
             should-build: ${{ !inputs.test-build }}
 
-            # * .NET arm64
-
-          # - name: Editor .NET (arm64, release)
-          #   target: editor
-          #   arch: arm64
-          #   llvm: true
-          #   dotnet: true
-          #   should-build: ${{ !inputs.test-build }}
-
-          - name: Template .NET (arm64, release)
-            target: template_release
-            arch: arm64
-            llvm: true
-            dotnet: true
-            scons-flags: mingw_prefix=/root/llvm-mingw
-            should-build: ${{ !inputs.test-build }}
-
-          - name: Template .NET (arm64, debug)
-            target: template_debug
-            arch: arm64
-            llvm: true
-            dotnet: true
-            scons-flags: mingw_prefix=/root/llvm-mingw
-            should-build: ${{ !inputs.test-build }}
-
         exclude:
           - { opts: { should-build: false } }
 
     env:
-      BIN: godot.windows.${{matrix.opts.target}}.${{matrix.opts.arch}}${{matrix.opts.llvm && '.llvm' || ''}}${{matrix.opts.dotnet == true && '.mono' || ''}}
+      BIN: godot.windows.${{matrix.opts.target}}.${{matrix.opts.arch}}${{  matrix.opts.dotnet == true && '.mono' || ''  }}
 
     steps:
       - name: Clone Godot
@@ -208,11 +137,26 @@ jobs:
           path: modules/limboai
           ref: ${{ inputs.limboai-ref }}
 
-      # Inits GODOT_VERSION, LIMBOAI_VERSION, NAME_PREFIX, GODOT_VERSION_STATUS, BUILD_NAME environment variables.
+      # Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
       - uses: ./modules/limboai/.github/actions/init-version
 
+      - name: Set up Python 3.x
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+          architecture: "x64"
+
+      - name: Set up scons
+        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
+        uses: ammaraskar/msvc-problem-matcher@master
+
       - name: Set up scons cache
-        if: inputs.test-build # ! Only cache test/PR builds
         uses: actions/cache@v4
         with:
           path: ${{github.workspace}}/.scons_cache/
@@ -222,54 +166,25 @@ jobs:
             ${{env.BIN}}-${{inputs.godot-ref}}-${{inputs.limboai-ref}}
             ${{env.BIN}}-${{inputs.godot-ref}}
 
-      - name: Static ANGLE libs
+      - name: Compilation
+        env:
+          SCONS_CACHE: ${{github.workspace}}/.scons_cache/
         run: |
-          mkdir -p deps/angle
-          cd deps/angle
-          url=https://github.com/godotengine/godot-angle-static/releases/download/chromium%2F6601.2/godot-angle-static
-          curl -L -o windows_${{matrix.opts.arch}}.zip $url-${{matrix.opts.arch}}-${{matrix.opts.llvm && 'llvm' || 'gcc'}}-release.zip
-          unzip windows_${{matrix.opts.arch}}.zip
-          rm windows_${{matrix.opts.arch}}.zip
+          scons -j2 platform=windows target=${{matrix.opts.target}} arch=${{matrix.opts.arch}} module_mono_enabled=${{matrix.opts.dotnet}} ${{env.SCONSFLAGS}}
 
-      - name: Mesa libs
+      - name: Generate C# glue
+        if: matrix.opts.dotnet && matrix.opts.target == 'editor'
+        env:
+          GODOT_VERSION_STATUS: limboai
         run: |
-          mkdir -p deps/mesa
-          cd deps/mesa
-          curl -L -o mesa_${{matrix.opts.arch}}.zip https://github.com/godotengine/godot-nir-static/releases/download/${{env.MESA_VERSION}}/godot-nir-static-${{matrix.opts.arch}}-${{matrix.opts.llvm && 'llvm' || 'gcc'}}-release.zip
-          unzip -o mesa_${{matrix.opts.arch}}.zip
-          rm -f mesa_${{matrix.opts.arch}}.zip
+          ./bin/${{ env.BIN }} --headless --generate-mono-glue ./modules/mono/glue || true
 
-      - name: Pull build container
+      - name: Build .NET solutions
+        if: matrix.opts.dotnet && matrix.opts.target == 'editor'
+        env:
+          GODOT_VERSION_STATUS: limboai
         run: |
-          podman pull ghcr.io/limbonaut/godot-windows:${{env.BUILD_IMAGE_VERSION}}
-
-      - name: Build using container
-        shell: bash
-        run: |
-          scons_command="scons \
-              platform=windows \
-              target=${{matrix.opts.target}} \
-              arch=${{matrix.opts.arch}} \
-              use_llvm=${{matrix.opts.llvm}} \
-              module_mono_enabled=${{matrix.opts.dotnet}} \
-              ${{env.SCONSFLAGS}} \
-              ${{matrix.opts.scons-flags}} \
-              angle_libs=/build/deps/angle \
-              mesa_libs=/build/deps/mesa \
-          "
-          podman_run="podman run -it --rm \
-            --env GODOT_VERSION_STATUS=${GODOT_VERSION_STATUS} \
-            --env BUILD_NAME=${BUILD_NAME} \
-            --env NUM_CORES=$(nproc --all) \
-            --env DOTNET_NOLOGO=true \
-            --env DOTNET_CLI_TELEMETRY_OPTOUT=true \
-            --env SCONS_CACHE=/build/.scons_cache/ \
-            --env SCONS_CACHE_LIMIT=${SCONS_CACHE_LIMIT} \
-            -v ${GITHUB_WORKSPACE}/:/build/ \
-            -w /build godot-windows:${{env.BUILD_IMAGE_VERSION}} bash -c \
-          "
-          echo "Running ${podman_run} \"${scons_command}\""
-          ${podman_run} "${scons_command}"
+          python ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=windows
 
       - name: Prepare artifact
         shell: bash
@@ -289,7 +204,7 @@ jobs:
         run: |
           mv out/templates/${BIN}.exe out/templates/windows_${BUILD_TYPE}_${{matrix.opts.arch}}.exe
           mv out/templates/${BIN}.console.exe out/templates/windows_${BUILD_TYPE}_${{matrix.opts.arch}}_console.exe
-          echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}${{matrix.opts.dotnet == true && '.mono' || ''}}" > out/templates/version.txt
+          echo "${GODOT_VERSION}.limboai+${LIMBOAI_VERSION}" > out/templates/version.txt
           ls -R out/
 
       - name: Upload artifact
@@ -297,62 +212,3 @@ jobs:
         with:
           name: ${{env.NAME_PREFIX}}${{matrix.opts.dotnet == true && '.dotnet' || ''}}.${{matrix.opts.target}}.windows.${{matrix.opts.arch}}
           path: out/*
-
-      - name: Mark .NET editor as built
-        if: matrix.opts.dotnet && matrix.opts.target == 'editor'
-        id: mark-dotnet-editor
-        run: echo "built-dotnet-editor=true" >> $GITHUB_OUTPUT
-
-
-  dotnet-assemblies:
-    name: .NET assembly for ${{matrix.opts.arch}}
-    needs: windows-builds
-    if: always() && needs.windows-builds.outputs.built-dotnet-editor == 'true'
-    runs-on: "windows-latest"
-    strategy:
-      fail-fast: false
-      matrix:
-        opts:
-          - arch: x86_64
-            llvm: false
-    env:
-      BIN: godot.windows.editor.${{matrix.opts.arch}}${{matrix.opts.llvm && '.llvm' || ''}}.mono
-    steps:
-      - name: Clone Godot
-        uses: actions/checkout@v4
-        with:
-          repository: godotengine/godot
-          ref: ${{ inputs.godot-ref }}
-
-      - name: Clone LimboAI module
-        uses: actions/checkout@v4
-        with:
-          path: modules/limboai
-          ref: ${{ inputs.limboai-ref }}
-
-      # Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
-      - uses: ./modules/limboai/.github/actions/init-version
-
-      - name: Reconstruct artifact name
-        shell: bash
-        run: |
-          echo "ARTIFACT=${{env.NAME_PREFIX}}.dotnet.editor.windows.${{matrix.opts.arch}}" >> $GITHUB_ENV
-
-      - name: Download editor artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{env.ARTIFACT}}
-          path: bin/
-
-      - name: Build .NET assemblies
-        uses: ./modules/limboai/.github/actions/build-dotnet-assemblies
-        with:
-          platform: windows
-          bin: ${{env.BIN}}
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{env.ARTIFACT}}
-          overwrite: true
-          path: bin/*

.gitignore

@@ -2,7 +2,6 @@
 demo/addons/
 demo/script_templates/
 icons/*.import
-godot-cpp
 
 # Godot auto generated files
 *.gen.*
@@ -187,6 +186,3 @@ godot.creator.*
 
 # compile commands (https://clang.llvm.org/docs/JSONCompilationDatabase.html)
 compile_commands.json
-
-# clang cache
-.cache

.pre-commit-config.yaml

@@ -1,24 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v17.0.6
-    hooks:
-      - id: clang-format
-        files: \.(c|h|cpp|hpp|cc|cxx|m|mm|inc|java|glsl)$
-        types_or: [text]
-        exclude: |
-          (?x)^(
-            tests/python_build.*|
-            .*thirdparty.*|
-            .*platform/android/java/lib/src/com.*|
-            .*-so_wrap.*
-          )
-
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.2.0
-    hooks:
-      - id: black
-        files: (\.py$|SConstruct|SCsub)
-        types_or: [text]
-        exclude: .*thirdparty.*
-        args:
-          - --line-length=120

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2023-2025 Serhii Snitsaruk and the LimboAI contributors.
+Copyright 2021-2024 Serhii Snitsaruk
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -8,40 +8,33 @@
 [![🔎 Unit Tests](https://github.com/limbonaut/limboai/actions/workflows/test_builds.yml/badge.svg)](https://github.com/limbonaut/limboai/actions/workflows/test_builds.yml)
 [![Documentation Status](https://readthedocs.org/projects/limboai/badge/?version=latest)](https://limboai.readthedocs.io/en/latest/?badge=latest)
 [![GitHub License](https://img.shields.io/github/license/limbonaut/limboai)](https://github.com/limbonaut/limboai/blob/master/LICENSE.md)
+
 [![Discord](https://img.shields.io/discord/1185664967379267774?logo=discord&link=https%3A%2F%2Fdiscord.gg%2FN5MGC95GpP)](https://discord.gg/N5MGC95GpP)
+[![Support this project](https://img.shields.io/badge/Support%20this%20project-red?logo=kofi&logoColor=white&link=https%3A%2F%2Fko-fi.com%2Flimbonaut)](https://ko-fi.com/limbonaut)
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109346796150895359?domain=https%3A%2F%2Fmastodon.gamedev.place)](https://mastodon.gamedev.place/@limbo)
 
->**🛈 Supported Godot Engine:** **4.3** (v1.2.0+) | **4.2** (v1.1.x releases)
 
 **LimboAI** is an open-source C++ plugin for **Godot Engine 4** providing a combination of
 **Behavior Trees** and **State Machines**, which can be used together to create complex AI behaviors.
 It comes with a behavior tree editor, built-in documentation, visual debugger, extensive demo project with a tutorial, and more!
-While it is implemented in C++, it fully supports GDScript for [creating your own tasks](https://limboai.readthedocs.io/en/stable/behavior-trees/custom-tasks.html) and [states](https://limboai.readthedocs.io/en/stable/hierarchical-state-machines/create-hsm.html).
+While it is implemented in C++, it fully supports GDScript for [creating your own tasks](https://limboai.readthedocs.io/en/latest/getting-started/custom-tasks.html) and [states](https://limboai.readthedocs.io/en/latest/getting-started/hsm.html).
 
-If you enjoy using LimboAI, please **consider supporting** my efforts with a donation on Ko-fi 😊 Your contribution will help me continue developing and improving it.
-
-[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/Y8Y2TCNH0)
+>**🛈 Supported Godot Engine: 4.2**
 
 ![Textured screenshot](doc/images/behavior-tree-editor-debugger.png)
 
-Behavior Trees are powerful hierarchical structures used to model and control the behavior of agents in a game (e.g., characters, enemies). They are designed to make it easier to create rich and highly modular behaviors for your games. To learn more about behavior trees, check out [Introduction to Behavior Trees](https://limboai.readthedocs.io/en/stable/behavior-trees/introduction.html) and our demo project, which includes a tutorial.
+Behavior Trees are powerful hierarchical structures used to model and control the behavior of agents in a game (e.g., characters, enemies). They are designed to make it easier to create rich and highly modular behaviors for your games. To learn more about behavior trees, check out [Introduction to Behavior Trees](https://limboai.readthedocs.io/en/latest/getting-started/introduction.html) and our demo project, which includes a tutorial.
 
 ## Demonstration
 
 ![Charger from Demo](doc/images/demo_charger.gif)
 
->**🛈 Demo project** lives in the `demo` folder and is available separately in [**Releases**](https://github.com/limbonaut/limboai/releases).
-> Run `demo/scenes/showcase.tscn` to get started.
-> It also includes a tutorial that introduces behavior trees through illustrative examples.
-
 ### Videos
 
-> **🛈** YouTube videos produced by various creators
+[![Demonstration](https://img.youtube.com/vi/NWaMArUg7mY/0.jpg)](https://www.youtube.com/watch?v=NWaMArUg7mY)
 
-<a href="https://www.youtube.com/watch?v=NWaMArUg7mY"><img src="https://img.youtube.com/vi/NWaMArUg7mY/0.jpg" width=410></a>
-<a href="https://www.youtube.com/watch?v=aP0Aacdxmno"><img src="https://img.youtube.com/vi/aP0Aacdxmno/0.jpg" width=410></a>
-<a href="https://www.youtube.com/watch?v=vZHzMO90IwQ"><img src="https://img.youtube.com/vi/vZHzMO90IwQ/0.jpg" width=410></a>
-<a href="https://www.youtube.com/watch?v=gAk3xl5fBsM"><img src="https://img.youtube.com/vi/gAk3xl5fBsM/0.jpg" width=410></a>
+>**🛈 Demo project** lives in the `demo` folder and is available separately in [**Releases**](https://github.com/limbonaut/limboai/releases).
+> It also contains a tutorial that introduces behavior trees using examples.
 
 ## Features
 
@@ -50,13 +43,13 @@ Behavior Trees are powerful hierarchical structures used to model and control th
     - Execute `BehaviorTree` resources using the `BTPlayer` node.
     - Create complex behaviors by combining and nesting tasks in a hierarchy.
     - Control execution flow using composite, decorator, and condition tasks.
-    - [Create custom tasks](https://limboai.readthedocs.io/en/stable/behavior-trees/custom-tasks.html) by extending core classes: `BTAction`, `BTCondition`, `BTDecorator`, and `BTComposite`.
+    - [Create custom tasks](https://limboai.readthedocs.io/en/latest/getting-started/custom-tasks.html) by extending core classes: `BTAction`, `BTCondition`, `BTDecorator`, and `BTComposite`.
     - Built-in class documentation.
     - Blackboard system: Share data seamlessly between tasks using the `Blackboard`.
       - Blackboard plans: Define variables in the BehaviorTree resource and override their values in the BTPlayer node.
       - Plan editor: Manage variables, their data types and property hints.
-      - Blackboard scopes: Prevent name conflicts and enable advanced techniques like [sharing data between several agents](https://limboai.readthedocs.io/en/stable/behavior-trees/using-blackboard.html#sharing-data-between-several-agents).
-      - Blackboard parameters: [Export a BB parameter](https://limboai.readthedocs.io/en/stable/behavior-trees/using-blackboard.html#task-parameters), for which user can provide a value or bind it to a blackboard variable (can be used in custom tasks).
+      - Blackboard scopes: Prevent name conflicts and enable advanced techniques like [sharing data between several agents](https://limboai.readthedocs.io/en/latest/getting-started/using-blackboard.html#sharing-data-between-several-agents).
+      - Blackboard parameters: [Export a BB parameter](https://limboai.readthedocs.io/en/latest/getting-started/using-blackboard.html#task-parameters), for which user can provide a value or bind it to a blackboard variable (can be used in custom tasks).
       - Inspector support for specifying blackboard variables (custom editor for exported `StringName` properties ending with "_var").
     - Use the `BTSubtree` task to execute a tree from a different resource file, promoting organization and reusability.
     - Visual Debugger: Inspect the execution of any BT in a running scene to identify and troubleshoot issues.
@@ -67,24 +60,20 @@ Behavior Trees are powerful hierarchical structures used to model and control th
     - Extend the `LimboState` class to implement state logic.
     - `LimboHSM` node serves as a state machine that manages `LimboState` instances and transitions.
     - `LimboHSM` is a state itself and can be nested within other `LimboHSM` instances.
-    - [Event-based](https://limboai.readthedocs.io/en/stable/hierarchical-state-machines/create-hsm.html#events-and-transitions): Transitions are associated with events and are triggered by the state machine when the relevant event is dispatched, allowing for better decoupling of transitions from state logic.
+    - [Event-based](https://limboai.readthedocs.io/en/latest/getting-started/hsm.html#events-and-transitions): Transitions are associated with events and are triggered by the state machine when the relevant event is dispatched, allowing for better decoupling of transitions from state logic.
     - Combine state machines with behavior trees using `BTState` for advanced reactive AI.
-    - Delegation Option: Using the vanilla `LimboState`, [delegate the implementation](https://limboai.readthedocs.io/en/stable/hierarchical-state-machines/create-hsm.html#single-file-state-machine-setup) to your callback functions, making it perfect for rapid prototyping and game jams.
+    - Delegation Option: Using the vanilla `LimboState`, [delegate the implementation](https://limboai.readthedocs.io/en/latest/getting-started/hsm.html#single-file-state-machine-setup) to your callback functions, making it perfect for rapid prototyping and game jams.
     - 🛈 Note: State machine setup and initialization require code; there is no GUI editor.
 
 - **Tested:** Behavior tree tasks and HSM are covered by unit tests.
 
-- **GDExtension:** LimboAI can be [used as extension](https://limboai.readthedocs.io/en/stable/getting-started/getting-limboai.html#get-gdextension-version). Custom engine builds are not necessary.
+- **GDExtension:** LimboAI can be [used as extension](https://limboai.readthedocs.io/en/latest/getting-started/gdextension.html). Custom engine builds are not necessary.
 
 - **Demo + Tutorial:** Check out our extensive demo project, which includes an introduction to behavior trees using examples.
 
-## First steps
-
-Follow the [Getting started](https://limboai.readthedocs.io/en/stable/getting-started/getting-limboai.html) guide to learn how to get started with LimboAI and the demo project.
-
 ## Getting LimboAI
 
-LimboAI can be used as either a C++ module or as a GDExtension shared library. GDExtension version is more convenient to use but somewhat limited in features. Whichever you choose to use, your project will stay compatible with both and you can switch from one to the other any time. See [Using GDExtension](https://limboai.readthedocs.io/en/stable/getting-started/getting-limboai.html#get-gdextension-version).
+LimboAI can be used as either a C++ module or as a GDExtension shared library. GDExtension version is more convenient to use but somewhat limited in features. Whichever you choose to use, your project will stay compatible with both and you can switch from one to the other any time. See [Using GDExtension](https://limboai.readthedocs.io/en/latest/getting-started/gdextension.html).
 
 ### Precompiled builds
 
@@ -93,36 +82,28 @@ LimboAI can be used as either a C++ module or as a GDExtension shared library. G
 
 ### Compiling from source
 
+>**🛈 For GDExtension:** Refer to comments in [setup_gdextension.sh](./gdextension/setup_gdextension.sh) file.
+
 - Download the Godot Engine source code and put this module source into the `modules/limboai` directory.
 - Consult the Godot Engine documentation for instructions on [how to build from source code](https://docs.godotengine.org/en/stable/contributing/development/compiling/index.html).
 - If you plan to export a game utilizing the LimboAI module, you'll also need to build export templates.
 - To execute unit tests, compile the engine with `tests=yes` and run it with `--test --tc="*[LimboAI]*"`.
 
-#### For GDExtension
-
-- You'll need SCons build tool and a C++ compiler. See also [Compiling](https://docs.godotengine.org/en/stable/contributing/development/compiling/index.html).
-- Run `scons target=editor` to build the plugin library for your current platform.
-  - SCons will automatically clone the godot-cpp/ repository if it doesn't already exist in the `limboai/godot-cpp` directory.
-  - By default, built targets are placed in the demo project: `demo/addons/limboai/bin/`
-- Check `scons -h` for other options and targets.
-
 ## Using the plugin
 
-- Online Documentation: [stable](https://limboai.readthedocs.io/en/stable/index.html), [latest](https://limboai.readthedocs.io/en/latest/index.html)
-- [Getting started](https://limboai.readthedocs.io/en/stable/getting-started/getting-limboai.html)
-- [Introduction to Behavior Trees](https://limboai.readthedocs.io/en/stable/behavior-trees/introduction.html)
-- [Creating custom tasks in GDScript](https://limboai.readthedocs.io/en/stable/behavior-trees/custom-tasks.html)
-- [Sharing data using Blackboard](https://limboai.readthedocs.io/en/stable/behavior-trees/using-blackboard.html)
-- [Accessing nodes in the scene tree](https://limboai.readthedocs.io/en/stable/behavior-trees/accessing-nodes.html)
-- [State machines](https://limboai.readthedocs.io/en/stable/hierarchical-state-machines/create-hsm.html)
-- [Using GDExtension](https://limboai.readthedocs.io/en/stable/getting-started/getting-limboai.html#get-gdextension-version)
-- [Using LimboAI with C#](https://limboai.readthedocs.io/en/stable/getting-started/c-sharp.html)
-- [Class reference](https://limboai.readthedocs.io/en/stable/classes/featured-classes.html)
+- [Online Documentation](https://limboai.readthedocs.io/en/latest/index.html)
+- [Introduction to Behavior Trees](https://limboai.readthedocs.io/en/latest/getting-started/introduction.html)
+- [Creating custom tasks in GDScript](https://limboai.readthedocs.io/en/latest/getting-started/custom-tasks.html)
+- [Sharing data using Blackboard](https://limboai.readthedocs.io/en/latest/getting-started/using-blackboard.html)
+- [Accessing nodes in the scene tree](https://limboai.readthedocs.io/en/latest/getting-started/accessing-nodes.html)
+- [State machines](https://limboai.readthedocs.io/en/latest/getting-started/hsm.html)
+- [Using GDExtension](https://limboai.readthedocs.io/en/latest/getting-started/gdextension.html)
+- [Using LimboAI with C#](https://limboai.readthedocs.io/en/latest/getting-started/c-sharp.html)
+- [Class reference](https://limboai.readthedocs.io/en/latest/getting-started/featured-classes.html)
 
 ## Contributing
 
-Contributions are welcome! Please open issues for bug reports, feature requests, or code changes.
-For detailed guidelines on contributing to code or documentation, check out our [Contributing](https://limboai.readthedocs.io/en/latest/getting-started/contributing.html) page.
+Contributions are welcome! Please open issues for bug reports, feature requests, or code changes. Keep the minor versions backward-compatible when submitting pull requests.
 
 If you have an idea for a behavior tree task or a feature that could be useful in a variety of projects, open an issue to discuss it.
 
@@ -132,8 +113,18 @@ Need help? We have a Discord server: https://discord.gg/N5MGC95GpP
 
 I write about LimboAI development on Mastodon: https://mastodon.gamedev.place/@limbo.
 
+## Roadmap
+
+Features and improvements that may be implemented in the future:
+- ~~Providing precompiled builds for download.~~ 🗸
+- ~~Tests and CI.~~ 🗸
+- ~~GDExtension support.~~ 🗸
+- ~~Extensive demo project.~~ 🗸
+- Expanding the library of commonly useful tasks.
+- Exploring the execution history of behavior trees in the visual debugger.
+- Per-project ignore list for tasks that users may want to hide in the task palette.
+- GUI editor for state machines.
+
 ## License
 
-Use of this source code is governed by an MIT-style license that can be found in the LICENSE file or at https://opensource.org/licenses/MIT
-
-LimboAI logo and demo project art assets are licensed under the Creative Commons Attribution 4.0 International license that can be found at https://creativecommons.org/licenses/by/4.0/
+Use of this source code is governed by an MIT-style license that can be found in the LICENSE file or at https://opensource.org/licenses/MIT.

SConstruct

@@ -1,160 +0,0 @@
-#!/usr/bin/env python
-"""
-This is SConstruct file for building GDExtension variant using SCons build system.
-For module variant, see SCsub file.
-
-Use --project=DIR to customize output path for built targets.
- - Built targets are placed into "DIR/addons/limboai/bin".
- - For example: scons --project="../my_project"
-   - built targets will be placed into "../my_project/addons/limboai/bin".
- - If not specified, built targets are put into the demo/ project.
-"""
-
-import os
-import sys
-import subprocess
-from limboai_version import generate_module_version_header, godot_cpp_ref
-
-sys.path.append("gdextension")
-from update_icon_entries import update_icon_entries
-from fix_icon_imports import fix_icon_imports
-
-# Check if godot-cpp/ exists
-if not os.path.exists("godot-cpp"):
-    print("Directory godot-cpp/ not found. Cloning repository...")
-    result = subprocess.run(
-        ["git", "clone", "-b", godot_cpp_ref, "https://github.com/godotengine/godot-cpp.git"],
-        check=True,
-        # capture_output=True
-    )
-    if result.returncode != 0:
-        print("Error: Cloning godot-cpp repository failed.")
-        Exit(1)
-    print("Finished cloning godot-cpp repository.")
-
-AddOption(
-    "--project",
-    dest="project",
-    type="string",
-    nargs=1,
-    action="store",
-    metavar="DIR",
-    default="demo",
-    help="Specify project directory",
-)
-
-help_text = """
-Options:
-  --project=DIR     Specify project directory (default: "demo");
-                    built targets will be placed in DIR/addons/limboai/bin
-"""
-Help(help_text)
-
-project_dir = GetOption("project")
-if not os.path.isdir(project_dir):
-    print("Project directory not found: " + project_dir)
-    Exit(2)
-
-# Parse LimboAI-specific variables.
-vars = Variables()
-vars.AddVariables(
-    BoolVariable("deploy_manifest", help="Deploy limboai.gdextension into PROJECT/addons/limboai/bin", default=True),
-    BoolVariable("deploy_icons", help="Deploy icons into PROJECT/addons/limboai/icons", default=True),
-)
-env = Environment(tools=["default"], PLATFORM="", variables=vars)
-Help(vars.GenerateHelpText(env))
-
-# Read LimboAI-specific variables.
-deploy_manifest = env["deploy_manifest"]
-deploy_icons = env["deploy_icons"]
-
-# Remove processed variables from ARGUMENTS to avoid godot-cpp warnings.
-for o in vars.options:
-    if o.key in ARGUMENTS:
-        del ARGUMENTS[o.key]
-
-# For reference:
-# - CCFLAGS are compilation flags shared between C and C++
-# - CFLAGS are for C-specific compilation flags
-# - CXXFLAGS are for C++-specific compilation flags
-# - CPPFLAGS are for pre-processor flags
-# - CPPDEFINES are for pre-processor defines
-# - LINKFLAGS are for linking flags
-
-env = SConscript("godot-cpp/SConstruct")
-
-# Generate version header.
-print("Generating LimboAI version header...")
-generate_module_version_header()
-
-# Update icon entries in limboai.gdextension file.
-# Note: This will remove everything after [icons] section, and rebuild it with generated icon entries.
-print("Updating LimboAI icon entries...")
-update_icon_entries(silent=True)
-
-# Fix icon imports in the PROJECT/addons/limboai/icons/.
-# Enables scaling and color conversion in the editor for imported SVG icons.
-try:
-    fix_icon_imports(project_dir)
-except FileNotFoundError as e:
-    print(e)
-except Exception as e:
-    print("Unknown error: " + str(e))
-
-# Tweak this if you want to use different folders, or more folders, to store your source code in.
-env.Append(CPPDEFINES=["LIMBOAI_GDEXTENSION"])
-sources = Glob("*.cpp")
-sources += Glob("blackboard/*.cpp")
-sources += Glob("blackboard/bb_param/*.cpp")
-sources += Glob("bt/*.cpp")
-sources += Glob("bt/tasks/*.cpp")
-sources += Glob("bt/tasks/blackboard/*.cpp")
-sources += Glob("bt/tasks/composites/*.cpp")
-sources += Glob("bt/tasks/decorators/*.cpp")
-sources += Glob("bt/tasks/scene/*.cpp")
-sources += Glob("bt/tasks/utility/*.cpp")
-sources += Glob("gdextension/*.cpp")
-sources += Glob("editor/debugger/*.cpp")
-sources += Glob("editor/*.cpp")
-sources += Glob("hsm/*.cpp")
-sources += Glob("util/*.cpp")
-
-# Generate documentation header.
-if env["target"] in ["editor", "template_debug"]:
-    doc_data = env.GodotCPPDocData("gen/doc_data.gen.cpp", source=Glob("doc_classes/*.xml"))
-    sources.append(doc_data)
-
-# Build library.
-if env["platform"] == "macos":
-    library = env.SharedLibrary(
-        project_dir
-        + "/addons/limboai/bin/liblimboai.{}.{}.framework/liblimboai.{}.{}".format(
-            env["platform"], env["target"], env["platform"], env["target"]
-        ),
-        source=sources,
-    )
-else:
-    library = env.SharedLibrary(
-        project_dir + "/addons/limboai/bin/liblimboai{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
-        source=sources,
-    )
-
-Default(library)
-
-# Deploy icons into PROJECT/addons/limboai/icons.
-if deploy_icons:
-    cmd_deploy_icons = env.Command(
-        project_dir + "/addons/limboai/icons/",
-        "icons/",
-        Copy("$TARGET", "$SOURCE"),
-    )
-    Default(cmd_deploy_icons)
-
-# Deploy limboai.gdextension into PROJECT/addons/limboai/bin.
-if deploy_manifest:
-    cmd_deploy_manifest = env.Command(
-        project_dir + "/addons/limboai/bin/limboai.gdextension",
-        "gdextension/limboai.gdextension",
-        Copy("$TARGET", "$SOURCE"),
-    )
-    Default(cmd_deploy_manifest)

SCsub

@@ -5,11 +5,7 @@ Import("env_modules")
 
 module_env = env.Clone()
 
-module_env.Append(CPPDEFINES=["LIMBOAI_MODULE"])
-
-import limboai_version
-
-limboai_version.generate_module_version_header()
+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")

blackboard/bb_param/bb_aabb.h

@@ -1,7 +1,7 @@
 /**
  * bb_aabb.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBAabb : public BBParam {
 	GDCLASS(BBAabb, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::AABB; }
 };
 

blackboard/bb_param/bb_array.h

@@ -1,7 +1,7 @@
 /**
  * bb_array.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBArray : public BBParam {
 	GDCLASS(BBArray, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::ARRAY; }
 };
 

blackboard/bb_param/bb_basis.h

@@ -1,7 +1,7 @@
 /**
  * bb_basis.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBBasis : public BBParam {
 	GDCLASS(BBBasis, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::BASIS; }
 };
 

blackboard/bb_param/bb_bool.h

@@ -1,7 +1,7 @@
 /**
  * bb_bool.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBBool : public BBParam {
 	GDCLASS(BBBool, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::BOOL; }
 };
 

blackboard/bb_param/bb_byte_array.h

@@ -1,7 +1,7 @@
 /**
  * bb_byte_array.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBByteArray : public BBParam {
 	GDCLASS(BBByteArray, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::PACKED_BYTE_ARRAY; }
 };
 

blackboard/bb_param/bb_color.h

@@ -1,7 +1,7 @@
 /**
  * bb_color.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBColor : public BBParam {
 	GDCLASS(BBColor, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::COLOR; }
 };
 

blackboard/bb_param/bb_color_array.h

@@ -1,7 +1,7 @@
 /**
  * bb_color_array.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBColorArray : public BBParam {
 	GDCLASS(BBColorArray, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::PACKED_COLOR_ARRAY; }
 };
 

blackboard/bb_param/bb_dictionary.h

@@ -1,7 +1,7 @@
 /**
  * bb_dictionary.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBDictionary : public BBParam {
 	GDCLASS(BBDictionary, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::DICTIONARY; }
 };
 

blackboard/bb_param/bb_float.h

@@ -1,7 +1,7 @@
 /**
  * bb_float.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBFloat : public BBParam {
 	GDCLASS(BBFloat, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::FLOAT; }
 };
 

blackboard/bb_param/bb_float32_array.h

@@ -1,7 +1,7 @@
 /**
  * bb_float32_array.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBFloat32Array : public BBParam {
 	GDCLASS(BBFloat32Array, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::PACKED_FLOAT32_ARRAY; }
 };
 

blackboard/bb_param/bb_float64_array.h

@@ -1,7 +1,7 @@
 /**
  * bb_float64_array.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBFloat64Array : public BBParam {
 	GDCLASS(BBFloat64Array, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::PACKED_FLOAT64_ARRAY; }
 };
 

blackboard/bb_param/bb_int.h

@@ -1,7 +1,7 @@
 /**
  * bb_int.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBInt : public BBParam {
 	GDCLASS(BBInt, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::INT; }
 };
 

blackboard/bb_param/bb_int32_array.h

@@ -1,7 +1,7 @@
 /**
  * bb_int32_array.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBInt32Array : public BBParam {
 	GDCLASS(BBInt32Array, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::PACKED_INT32_ARRAY; }
 };
 

blackboard/bb_param/bb_int64_array.h

@@ -1,7 +1,7 @@
 /**
  * bb_int64_array.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBInt64Array : public BBParam {
 	GDCLASS(BBInt64Array, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::PACKED_INT64_ARRAY; }
 };
 

blackboard/bb_param/bb_node.cpp

@@ -1,7 +1,7 @@
 /**
  * bb_node.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -11,9 +11,18 @@
 
 #include "bb_node.h"
 
-Variant BBNode::get_value(Node *p_scene_root, const Ref<Blackboard> &p_blackboard, const Variant &p_default) {
-	ERR_FAIL_NULL_V_MSG(p_scene_root, Variant(), "BBNode: get_value() failed - scene_root is null.");
-	ERR_FAIL_COND_V_MSG(p_blackboard.is_null(), Variant(), "BBNode: get_value() failed - blackboard is null.");
+#ifdef LIMBOAI_MODULE
+#include "core/error/error_macros.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());
+	ERR_FAIL_COND_V(!p_blackboard.is_valid(), Variant());
 
 	Variant val;
 	if (get_value_source() == SAVED_VALUE) {
@@ -23,11 +32,16 @@ Variant BBNode::get_value(Node *p_scene_root, const Ref<Blackboard> &p_blackboar
 	}
 
 	if (val.get_type() == Variant::NODE_PATH) {
-		return p_scene_root->get_node_or_null(val);
-	} else if (val.get_type() == Variant::OBJECT || val.get_type() == Variant::NIL) {
-		return val;
+		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_or_null(val);
 	} else {
-		WARN_PRINT("BBNode: Unexpected variant type: " + Variant::get_type_name(val.get_type()) + ". Returning default value.");
-		return p_default;
+		Object *obj = val;
+		if (unlikely(obj == nullptr && val.get_type() != Variant::NIL)) {
+			WARN_PRINT("BBNode: Unexpected variant type of a blackboard variable.");
+			return p_default;
+		} else {
+			return obj;
+		}
 	}
 }

blackboard/bb_param/bb_node.h

@@ -1,7 +1,7 @@
 /**
  * bb_node.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,11 +18,10 @@ class BBNode : public BBParam {
 	GDCLASS(BBNode, BBParam);
 
 protected:
-	static void _bind_methods() {}
+	virtual Variant::Type get_type() const override { return Variant::NODE_PATH; }
 
 public:
-	virtual Variant::Type get_type() const override { return Variant::NODE_PATH; }
-	virtual Variant get_value(Node *p_scene_root, const Ref<Blackboard> &p_blackboard, const Variant &p_default = Variant()) override;
+	virtual Variant get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard, const Variant &p_default = Variant()) override;
 };
 
 #endif // BB_NODE_H

blackboard/bb_param/bb_param.cpp

@@ -1,7 +1,7 @@
 /**
  * bb_param.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -75,13 +75,10 @@ String BBParam::_to_string() {
 	}
 }
 
-Variant BBParam::get_value(Node *p_scene_root, const Ref<Blackboard> &p_blackboard, const Variant &p_default) {
+Variant BBParam::get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard, const Variant &p_default) {
 	ERR_FAIL_COND_V(!p_blackboard.is_valid(), p_default);
 
 	if (value_source == SAVED_VALUE) {
-		if (saved_value == Variant()) {
-			_assign_default_value();
-		}
 		return saved_value;
 	} else {
 		ERR_FAIL_COND_V_MSG(!p_blackboard->has_var(variable), p_default, vformat("BBParam: Blackboard variable \"%s\" doesn't exist.", variable));
@@ -105,7 +102,7 @@ void BBParam::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_variable", "variable_name"), &BBParam::set_variable);
 	ClassDB::bind_method(D_METHOD("get_variable"), &BBParam::get_variable);
 	ClassDB::bind_method(D_METHOD("get_type"), &BBParam::get_type);
-	ClassDB::bind_method(D_METHOD("get_value", "scene_root", "blackboard", "default"), &BBParam::get_value, Variant());
+	ClassDB::bind_method(D_METHOD("get_value", "agent", "blackboard", "default"), &BBParam::get_value, Variant());
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "value_source", PROPERTY_HINT_ENUM, "Saved Value,Blackboard Var"), "set_value_source", "get_value_source");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "variable", PROPERTY_HINT_NONE, "", 0), "set_variable", "get_variable");
@@ -117,4 +114,6 @@ void BBParam::_bind_methods() {
 
 BBParam::BBParam() {
 	value_source = SAVED_VALUE;
+
+	_assign_default_value();
 }

blackboard/bb_param/bb_param.h

@@ -1,7 +1,7 @@
 /**
  * bb_param.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -49,6 +49,8 @@ protected:
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 
 public:
+	virtual Variant::Type get_type() const { return Variant::NIL; }
+
 	void set_value_source(ValueSource p_value);
 	ValueSource get_value_source() const { return value_source; }
 
@@ -64,9 +66,7 @@ public:
 	virtual String _to_string();
 #endif
 
-	virtual Variant::Type get_type() const { return Variant::NIL; }
-	virtual Variant::Type get_variable_expected_type() const { return get_type(); }
-	virtual Variant get_value(Node *p_scene_root, const Ref<Blackboard> &p_blackboard, const Variant &p_default = Variant());
+	virtual Variant get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard, const Variant &p_default = Variant());
 
 	BBParam();
 };

blackboard/bb_param/bb_plane.h

@@ -1,7 +1,7 @@
 /**
  * bb_plane.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBPlane : public BBParam {
 	GDCLASS(BBPlane, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::PLANE; }
 };
 

blackboard/bb_param/bb_projection.h

@@ -1,7 +1,7 @@
 /**
  * bb_projection.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBProjection : public BBParam {
 	GDCLASS(BBProjection, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::PROJECTION; }
 };
 

blackboard/bb_param/bb_quaternion.h

@@ -1,7 +1,7 @@
 /**
  * bb_quaternion.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBQuaternion : public BBParam {
 	GDCLASS(BBQuaternion, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::QUATERNION; }
 };
 

blackboard/bb_param/bb_rect2.h

@@ -1,7 +1,7 @@
 /**
  * bb_rect2.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBRect2 : public BBParam {
 	GDCLASS(BBRect2, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::RECT2; }
 };
 

blackboard/bb_param/bb_rect2i.h

@@ -1,7 +1,7 @@
 /**
  * bb_rect2i.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBRect2i : public BBParam {
 	GDCLASS(BBRect2i, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::RECT2I; }
 };
 

blackboard/bb_param/bb_string.h

@@ -1,7 +1,7 @@
 /**
  * bb_string.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBString : public BBParam {
 	GDCLASS(BBString, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::STRING; }
 };
 

blackboard/bb_param/bb_string_array.h

@@ -1,7 +1,7 @@
 /**
  * bb_string_array.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBStringArray : public BBParam {
 	GDCLASS(BBStringArray, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::PACKED_STRING_ARRAY; }
 };
 

blackboard/bb_param/bb_string_name.h

@@ -1,7 +1,7 @@
 /**
  * bb_string_name.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBStringName : public BBParam {
 	GDCLASS(BBStringName, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::STRING_NAME; }
 };
 

blackboard/bb_param/bb_transform2d.h

@@ -1,7 +1,7 @@
 /**
  * bb_transform2d.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBTransform2D : public BBParam {
 	GDCLASS(BBTransform2D, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::TRANSFORM2D; }
 };
 

blackboard/bb_param/bb_transform3d.h

@@ -1,7 +1,7 @@
 /**
  * bb_transform3d.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBTransform3D : public BBParam {
 	GDCLASS(BBTransform3D, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::TRANSFORM3D; }
 };
 

blackboard/bb_param/bb_variant.cpp

@@ -1,7 +1,7 @@
 /**
  * bb_variant.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

blackboard/bb_param/bb_variant.h

@@ -1,7 +1,7 @@
 /**
  * bb_variant.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -27,8 +27,6 @@ public:
 	virtual Variant::Type get_type() const override;
 	void set_type(Variant::Type p_type);
 
-	virtual Variant::Type get_variable_expected_type() const override { return Variant::NIL; }
-
 	BBVariant(const Variant &p_value);
 	BBVariant();
 };

blackboard/bb_param/bb_vector2.h

@@ -1,7 +1,7 @@
 /**
  * bb_vector2.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBVector2 : public BBParam {
 	GDCLASS(BBVector2, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::VECTOR2; }
 };
 

blackboard/bb_param/bb_vector2_array.h

@@ -1,7 +1,7 @@
 /**
  * bb_vector2_array.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBVector2Array : public BBParam {
 	GDCLASS(BBVector2Array, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::PACKED_VECTOR2_ARRAY; }
 };
 

blackboard/bb_param/bb_vector2i.h

@@ -1,7 +1,7 @@
 /**
  * bb_vector2i.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBVector2i : public BBParam {
 	GDCLASS(BBVector2i, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::VECTOR2I; }
 };
 

blackboard/bb_param/bb_vector3.h

@@ -1,7 +1,7 @@
 /**
  * bb_vector3.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBVector3 : public BBParam {
 	GDCLASS(BBVector3, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::VECTOR3; }
 };
 

blackboard/bb_param/bb_vector3_array.h

@@ -1,7 +1,7 @@
 /**
  * bb_vector3_array.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBVector3Array : public BBParam {
 	GDCLASS(BBVector3Array, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::PACKED_VECTOR3_ARRAY; }
 };
 

blackboard/bb_param/bb_vector3i.h

@@ -1,7 +1,7 @@
 /**
  * bb_vector3i.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBVector3i : public BBParam {
 	GDCLASS(BBVector3i, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::VECTOR3I; }
 };
 

blackboard/bb_param/bb_vector4.h

@@ -1,7 +1,7 @@
 /**
  * bb_vector4.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBVector4 : public BBParam {
 	GDCLASS(BBVector4, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::VECTOR4; }
 };
 

blackboard/bb_param/bb_vector4i.h

@@ -1,7 +1,7 @@
 /**
  * bb_vector4i.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,6 @@ class BBVector4i : public BBParam {
 	GDCLASS(BBVector4i, BBParam);
 
 protected:
-	static void _bind_methods() {}
-
 	virtual Variant::Type get_type() const override { return Variant::VECTOR4I; }
 };
 

blackboard/bb_variable.cpp

@@ -1,7 +1,7 @@
 /**
  * bb_variable.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -25,7 +25,7 @@ void BBVariable::set_value(const Variant &p_value) {
 	data->value_changed = true;
 
 	if (is_bound()) {
-		Object *obj = OBJECT_DB_GET_INSTANCE(data->bound_object);
+		Object *obj = ObjectDB::get_instance(ObjectID(data->bound_object));
 		ERR_FAIL_COND_MSG(!obj, "Blackboard: Failed to get bound object.");
 #ifdef LIMBOAI_MODULE
 		bool r_valid;
@@ -39,7 +39,7 @@ void BBVariable::set_value(const Variant &p_value) {
 
 Variant BBVariable::get_value() const {
 	if (is_bound()) {
-		Object *obj = OBJECT_DB_GET_INSTANCE(data->bound_object);
+		Object *obj = ObjectDB::get_instance(ObjectID(data->bound_object));
 		ERR_FAIL_COND_V_MSG(!obj, data->value, "Blackboard: Failed to get bound object.");
 #ifdef LIMBOAI_MODULE
 		bool r_valid;
@@ -78,16 +78,12 @@ String BBVariable::get_hint_string() const {
 	return data->hint_string;
 }
 
-BBVariable BBVariable::duplicate(bool p_deep) const {
+BBVariable BBVariable::duplicate() const {
 	BBVariable var;
 	var.data->hint = data->hint;
 	var.data->hint_string = data->hint_string;
 	var.data->type = data->type;
-	if (p_deep) {
-		var.data->value = data->value.duplicate(p_deep);
-	} else {
-		var.data->value = data->value;
-	}
+	var.data->value = data->value;
 	var.data->binding_path = data->binding_path;
 	var.data->bound_object = data->bound_object;
 	var.data->bound_property = data->bound_property;

blackboard/bb_variable.h

@@ -1,7 +1,7 @@
 /**
  * bb_variable.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -54,7 +54,7 @@ public:
 	void set_hint_string(const String &p_hint_string);
 	String get_hint_string() const;
 
-	BBVariable duplicate(bool p_deep = false) const;
+	BBVariable duplicate() const;
 
 	_FORCE_INLINE_ bool is_value_changed() const { return data->value_changed; }
 	_FORCE_INLINE_ void reset_value_changed() { data->value_changed = false; }

blackboard/blackboard.cpp

@@ -1,7 +1,7 @@
 /**
  * blackboard.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -10,7 +10,6 @@
  */
 
 #include "blackboard.h"
-#include "../util/limbo_compat.h"
 
 #ifdef LIMBOAI_MODULE
 #include "core/variant/variant.h"
@@ -65,69 +64,13 @@ void Blackboard::erase_var(const StringName &p_name) {
 	data.erase(p_name);
 }
 
-TypedArray<StringName> Blackboard::list_vars() const {
-	TypedArray<StringName> var_names;
-	var_names.resize(data.size());
-	int idx = 0;
-	for (const KeyValue<StringName, BBVariable> &kv : data) {
-		var_names[idx] = kv.key;
-		idx += 1;
-	}
-	return var_names;
-}
-
-void Blackboard::print_state() const {
-	Ref<Blackboard> bb{ this };
-	int scope_idx = 0;
-	while (bb.is_valid()) {
-		int i = 0;
-		String line = "Scope " + itos(scope_idx) + ": { ";
-		for (const KeyValue<StringName, BBVariable> &kv : bb->data) {
-			if (i > 0) {
-				line += ", ";
-			}
-			line += String(kv.key) + ": " + String(kv.value.get_value());
-			i++;
-		}
-		line += " }";
-		PRINT_LINE(line);
-		bb = bb->get_parent();
-		scope_idx++;
-	}
-}
-
-Dictionary Blackboard::get_vars_as_dict() const {
-	Dictionary dict;
-	for (const KeyValue<StringName, BBVariable> &kv : data) {
-		dict[kv.key] = kv.value.get_value();
-	}
-	return dict;
-}
-
-void Blackboard::populate_from_dict(const Dictionary &p_dictionary) {
-	Array keys = p_dictionary.keys();
-	for (int i = 0; i < keys.size(); i++) {
-		if (keys[i].get_type() == Variant::STRING_NAME || keys[i].get_type() == Variant::STRING) {
-			set_var(keys[i], p_dictionary[keys[i]]);
-		} else {
-			ERR_PRINT("Blackboard: Invalid key type in dictionary to populate blackboard. Must be StringName or String.");
-		}
-	}
-}
-
-void Blackboard::bind_var_to_property(const StringName &p_name, Object *p_object, const StringName &p_property, bool p_create) {
-	if (!data.has(p_name)) {
-		if (p_create) {
-			data.insert(p_name, BBVariable());
-		} else {
-			ERR_FAIL_MSG("Blackboard: Can't bind variable that doesn't exist (var: " + p_name + ").");
-		}
-	}
+void Blackboard::bind_var_to_property(const StringName &p_name, Object *p_object, const StringName &p_property) {
+	ERR_FAIL_COND_MSG(!data.has(p_name), "Blackboard: Binding failed - can't bind variable that doesn't exist.");
 	data[p_name].bind(p_object, p_property);
 }
 
 void Blackboard::unbind_var(const StringName &p_name) {
-	ERR_FAIL_COND_MSG(!data.has(p_name), "Blackboard: Can't unbind variable that doesn't exist (var: " + p_name + ").");
+	ERR_FAIL_COND_MSG(data.has(p_name), "Blackboard: Can't unbind variable that doesn't exist.");
 	data[p_name].unbind();
 }
 
@@ -135,33 +78,22 @@ void Blackboard::assign_var(const StringName &p_name, const BBVariable &p_var) {
 	data.insert(p_name, p_var);
 }
 
-void Blackboard::link_var(const StringName &p_name, const Ref<Blackboard> &p_target_blackboard, const StringName &p_target_var, bool p_create) {
-	if (!data.has(p_name)) {
-		if (p_create) {
-			data.insert(p_name, BBVariable());
-		} else {
-			ERR_FAIL_MSG("Blackboard: Can't link variable that doesn't exist (var: " + p_name + ").");
-		}
-	}
+void Blackboard::link_var(const StringName &p_name, const Ref<Blackboard> &p_target_blackboard, const StringName &p_target_var) {
+	ERR_FAIL_COND_MSG(!data.has(p_name), "Blackboard: Can't link variable that doesn't exist (var: " + p_name + ").");
 	ERR_FAIL_COND_MSG(p_target_blackboard.is_null(), "Blackboard: Can't link variable to target blackboard that is null (var: " + p_name + ").");
 	ERR_FAIL_COND_MSG(!p_target_blackboard->data.has(p_target_var), "Blackboard: Can't link variable to non-existent target (var: " + p_name + ", target: " + p_target_var + ").");
 	data[p_name] = p_target_blackboard->data[p_target_var];
 }
 
 void Blackboard::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("get_var", "var_name", "default", "complain"), &Blackboard::get_var, DEFVAL(Variant()), DEFVAL(true));
+	ClassDB::bind_method(D_METHOD("get_var", "var_name", "default", "complain"), &Blackboard::get_var, Variant(), true);
 	ClassDB::bind_method(D_METHOD("set_var", "var_name", "value"), &Blackboard::set_var);
 	ClassDB::bind_method(D_METHOD("has_var", "var_name"), &Blackboard::has_var);
 	ClassDB::bind_method(D_METHOD("set_parent", "blackboard"), &Blackboard::set_parent);
 	ClassDB::bind_method(D_METHOD("get_parent"), &Blackboard::get_parent);
 	ClassDB::bind_method(D_METHOD("erase_var", "var_name"), &Blackboard::erase_var);
-	ClassDB::bind_method(D_METHOD("clear"), &Blackboard::clear);
-	ClassDB::bind_method(D_METHOD("list_vars"), &Blackboard::list_vars);
-	ClassDB::bind_method(D_METHOD("print_state"), &Blackboard::print_state);
-	ClassDB::bind_method(D_METHOD("get_vars_as_dict"), &Blackboard::get_vars_as_dict);
-	ClassDB::bind_method(D_METHOD("populate_from_dict", "dictionary"), &Blackboard::populate_from_dict);
 	ClassDB::bind_method(D_METHOD("top"), &Blackboard::top);
-	ClassDB::bind_method(D_METHOD("bind_var_to_property", "var_name", "object", "property", "create"), &Blackboard::bind_var_to_property, DEFVAL(false));
+	ClassDB::bind_method(D_METHOD("bind_var_to_property", "var_name", "object", "property"), &Blackboard::bind_var_to_property);
 	ClassDB::bind_method(D_METHOD("unbind_var", "var_name"), &Blackboard::unbind_var);
-	ClassDB::bind_method(D_METHOD("link_var", "var_name", "target_blackboard", "target_var", "create"), &Blackboard::link_var, DEFVAL(false));
+	ClassDB::bind_method(D_METHOD("link_var", "var_name", "target_blackboard", "target_var"), &Blackboard::link_var);
 }

blackboard/blackboard.h

@@ -1,7 +1,7 @@
 /**
  * blackboard.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -40,34 +40,25 @@ private:
 protected:
 	static void _bind_methods();
 
-#ifdef LIMBOAI_GDEXTENSION
-	String _to_string() const { return "<" + get_class() + "#" + itos(get_instance_id()) + ">"; }
-#endif
-
 public:
 	void set_parent(const Ref<Blackboard> &p_blackboard) { parent = p_blackboard; }
 	Ref<Blackboard> get_parent() const { return parent; }
 
 	Ref<Blackboard> top() const;
 
-	Variant get_var(const StringName &p_name, const Variant &p_default = Variant(), bool p_complain = true) const;
+	Variant get_var(const StringName &p_name, const Variant &p_default, bool p_complain = true) const;
 	void set_var(const StringName &p_name, const Variant &p_value);
 	bool has_var(const StringName &p_name) const;
-	_FORCE_INLINE_ bool has_local_var(const StringName &p_name) const { return data.has(p_name); }
 	void erase_var(const StringName &p_name);
-	void clear() { data.clear(); }
-	TypedArray<StringName> list_vars() const;
-	void print_state() const;
 
-	Dictionary get_vars_as_dict() const;
-	void populate_from_dict(const Dictionary &p_dictionary);
-
-	void bind_var_to_property(const StringName &p_name, Object *p_object, const StringName &p_property, bool p_create = false);
+	void bind_var_to_property(const StringName &p_name, Object *p_object, const StringName &p_property);
 	void unbind_var(const StringName &p_name);
 
 	void assign_var(const StringName &p_name, const BBVariable &p_var);
 
-	void link_var(const StringName &p_name, const Ref<Blackboard> &p_target_blackboard, const StringName &p_target_var, bool p_create = false);
+	void link_var(const StringName &p_name, const Ref<Blackboard> &p_target_blackboard, const StringName &p_target_var);
+
+	// TODO: Add serialization API.
 };
 
 #endif // BLACKBOARD_H

blackboard/blackboard_plan.cpp

@@ -1,7 +1,7 @@
 /**
  * blackboard_plan.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -11,76 +11,18 @@
 
 #include "blackboard_plan.h"
 
-#include "../util/limbo_utility.h"
-
-#ifdef LIMBOAI_MODULE
-#include "editor/editor_inspector.h"
-#include "editor/editor_interface.h"
-#elif LIMBOAI_GDEXTENSION
-#include <godot_cpp/classes/editor_inspector.hpp>
-#include <godot_cpp/classes/editor_interface.hpp>
-#include <godot_cpp/classes/engine.hpp>
-#include <godot_cpp/classes/scene_tree.hpp>
-#endif
-
 bool BlackboardPlan::_set(const StringName &p_name, const Variant &p_value) {
 	String name_str = p_name;
 
-#ifdef TOOLS_ENABLED
 	// * Editor
 	if (var_map.has(p_name)) {
-		BBVariable &var = var_map[p_name];
-		var.set_value(p_value);
+		var_map[p_name].set_value(p_value);
 		if (base.is_valid() && p_value == base->get_var(p_name).get_value()) {
 			// When user pressed reset property button in inspector...
-			var.reset_value_changed();
+			var_map[p_name].reset_value_changed();
 		}
 		return true;
 	}
-#endif // TOOLS_ENABLED
-
-	// * Mapping
-	if (name_str.begins_with("mapping/")) {
-		StringName mapped_var_name = name_str.get_slicec('/', 1);
-		StringName value = p_value;
-		bool prop_list_changed = false;
-		if (value == StringName()) {
-			if (parent_scope_mapping.has(mapped_var_name)) {
-				prop_list_changed = true;
-				parent_scope_mapping.erase(mapped_var_name);
-			}
-		} else {
-			if (!parent_scope_mapping.has(mapped_var_name)) {
-				prop_list_changed = true;
-			}
-			parent_scope_mapping[mapped_var_name] = value;
-		}
-		if (prop_list_changed) {
-			notify_property_list_changed();
-		}
-		return true;
-	}
-
-	// * Binding
-	if (name_str.begins_with("binding/")) {
-		StringName bound_var = name_str.get_slicec('/', 1);
-		NodePath value = p_value;
-		bool prop_list_changed = false;
-		if (value.is_empty()) {
-			if (property_bindings.has(bound_var)) {
-				prop_list_changed = true;
-				property_bindings.erase(bound_var);
-			}
-		} else {
-			if (!property_bindings.has(bound_var)) {
-				prop_list_changed = true;
-			}
-			property_bindings[bound_var] = value;
-		}
-		if (prop_list_changed) {
-			notify_property_list_changed();
-		}
-	}
 
 	// * Storage
 	if (name_str.begins_with("var/")) {
@@ -99,8 +41,6 @@ bool BlackboardPlan::_set(const StringName &p_name, const Variant &p_value) {
 			var_map[var_name].set_hint((PropertyHint)(int)p_value);
 		} else if (what == "hint_string") {
 			var_map[var_name].set_hint_string(p_value);
-		} else if (what == "property_binding") {
-			property_bindings[var_name] = NodePath(p_value);
 		} else {
 			return false;
 		}
@@ -113,61 +53,9 @@ bool BlackboardPlan::_set(const StringName &p_name, const Variant &p_value) {
 bool BlackboardPlan::_get(const StringName &p_name, Variant &r_ret) const {
 	String name_str = p_name;
 
-#ifdef TOOLS_ENABLED
 	// * Editor
 	if (var_map.has(p_name)) {
-		if (has_mapping(p_name)) {
-			r_ret = "Mapped to " + LimboUtility::get_singleton()->decorate_var(parent_scope_mapping[p_name]);
-		} else if (has_property_binding(p_name)) {
-			const NodePath &binding = property_bindings[p_name];
-
-			Node *edited_node = Object::cast_to<Node>(EditorInterface::get_singleton()->get_inspector()->get_edited_object());
-			if (!edited_node) {
-				edited_node = SCENE_TREE()->get_edited_scene_root();
-			}
-			Node *bound_node = edited_node ? edited_node->get_node_or_null(binding) : nullptr;
-
-			String shortened_path;
-			if (bound_node) {
-				shortened_path = (String)bound_node->get_name() +
-						":" + (String)binding.get_concatenated_subnames();
-			} else {
-				shortened_path = (String)binding.get_name(binding.get_name_count() - 1) +
-						":" + (String)binding.get_concatenated_subnames();
-			}
-			r_ret = String::utf8("🔗 ") + shortened_path;
-		} else {
-			r_ret = var_map[p_name].get_value();
-		}
-		return true;
-	}
-#endif // TOOLS_ENABLED
-
-	// * Mapping
-	if (name_str.begins_with("mapping/")) {
-		StringName mapped_var_name = name_str.get_slicec('/', 1);
-		ERR_FAIL_COND_V(mapped_var_name == StringName(), false);
-		if (has_mapping(mapped_var_name)) {
-			r_ret = parent_scope_mapping[mapped_var_name];
-		} else if (has_property_binding(mapped_var_name)) {
-			r_ret = RTR("Already bound to property.");
-		} else {
-			r_ret = StringName();
-		}
-		return true;
-	}
-
-	// * Binding
-	if (name_str.begins_with("binding/")) {
-		StringName bound_var = name_str.get_slicec('/', 1);
-		ERR_FAIL_COND_V(bound_var == StringName(), false);
-		if (has_property_binding(bound_var)) {
-			r_ret = property_bindings[bound_var];
-		} else if (has_mapping(bound_var)) {
-			r_ret = RTR("Already mapped to variable.");
-		} else {
-			r_ret = NodePath();
-		}
+		r_ret = var_map[p_name].get_value();
 		return true;
 	}
 
@@ -175,6 +63,7 @@ bool BlackboardPlan::_get(const StringName &p_name, Variant &r_ret) const {
 	if (!name_str.begins_with("var/")) {
 		return false;
 	}
+
 	StringName var_name = name_str.get_slicec('/', 1);
 	String what = name_str.get_slicec('/', 2);
 	ERR_FAIL_COND_V(!var_map.has(var_name), false);
@@ -198,76 +87,25 @@ void BlackboardPlan::_get_property_list(List<PropertyInfo> *p_list) const {
 		String var_name = p.first;
 		BBVariable var = p.second;
 
-#ifdef TOOLS_ENABLED
 		// * Editor
-		if (!_is_var_nil(var) && !_is_var_private(var_name, var)) {
-			if (has_mapping(var_name) || has_property_binding(var_name)) {
-				p_list->push_back(PropertyInfo(Variant::STRING, var_name, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_READ_ONLY));
-			} else {
-				p_list->push_back(PropertyInfo(var.get_type(), var_name, var.get_hint(), var.get_hint_string(), PROPERTY_USAGE_EDITOR));
-			}
+		if (var.get_type() != Variant::NIL && (!is_derived() || !var_name.begins_with("_"))) {
+			p_list->push_back(PropertyInfo(var.get_type(), var_name, var.get_hint(), var.get_hint_string(), PROPERTY_USAGE_EDITOR));
 		}
-#endif // TOOLS_ENABLED
 
 		// * Storage
-		if (is_derived() && (!var.is_value_changed() || var.get_value() == base->var_map[var_name].get_value())) {
-			// Don't store variable if it's not modified in a derived plan.
-			// Variable is considered modified when it's marked as changed and its value is different from the base plan.
-			continue;
-		}
 		p_list->push_back(PropertyInfo(Variant::STRING, "var/" + var_name + "/name", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
 		p_list->push_back(PropertyInfo(Variant::INT, "var/" + var_name + "/type", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
 		p_list->push_back(PropertyInfo(var.get_type(), "var/" + var_name + "/value", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
 		p_list->push_back(PropertyInfo(Variant::INT, "var/" + var_name + "/hint", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
 		p_list->push_back(PropertyInfo(Variant::STRING, "var/" + var_name + "/hint_string", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL));
 	}
-
-	// * Mapping
-	if (is_mapping_enabled()) {
-		p_list->push_back(PropertyInfo(Variant::NIL, "Mapping", PROPERTY_HINT_NONE, "mapping/", PROPERTY_USAGE_GROUP));
-		for (const Pair<StringName, BBVariable> &p : var_list) {
-			if (_is_var_private(p.first, p.second)) {
-				continue;
-			}
-			if (unlikely(has_property_binding(p.first))) {
-				p_list->push_back(PropertyInfo(Variant::STRING, "mapping/" + p.first, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_READ_ONLY));
-			} else {
-				// Serialize only non-empty mappings.
-				PropertyUsageFlags usage = has_mapping(p.first) ? PROPERTY_USAGE_DEFAULT : PROPERTY_USAGE_EDITOR;
-				p_list->push_back(PropertyInfo(Variant::STRING_NAME, "mapping/" + p.first, PROPERTY_HINT_NONE, "", usage));
-			}
-		}
-	}
-
-	// * Binding
-	p_list->push_back(PropertyInfo(Variant::NIL, "Binding", PROPERTY_HINT_NONE, "binding/", PROPERTY_USAGE_GROUP));
-	for (const Pair<StringName, BBVariable> &p : var_list) {
-		if (_is_var_nil(p.second) || _is_var_private(p.first, p.second)) {
-			continue;
-		}
-		if (unlikely(has_mapping(p.first))) {
-			p_list->push_back(PropertyInfo(Variant::STRING, "binding/" + p.first, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_READ_ONLY));
-		} else {
-			PropertyUsageFlags usage = has_property_binding(p.first) ? PROPERTY_USAGE_DEFAULT : PROPERTY_USAGE_EDITOR;
-			// PROPERTY_HINT_LINK is used to signal that NodePath should point to a property.
-			// Our inspector plugin will know how to handle it.
-			p_list->push_back(PropertyInfo(Variant::NODE_PATH, "binding/" + p.first, PROPERTY_HINT_LINK, itos(p.second.get_type()), usage));
-		}
-	}
 }
 
 bool BlackboardPlan::_property_can_revert(const StringName &p_name) const {
-	if (String(p_name).begins_with("mapping/")) {
-		return true;
-	}
 	return base.is_valid() && base->var_map.has(p_name);
 }
 
 bool BlackboardPlan::_property_get_revert(const StringName &p_name, Variant &r_property) const {
-	if (String(p_name).begins_with("mapping/")) {
-		r_property = StringName();
-		return true;
-	}
 	if (base->var_map.has(p_name)) {
 		r_property = base->var_map[p_name].get_value();
 		return true;
@@ -276,30 +114,11 @@ bool BlackboardPlan::_property_get_revert(const StringName &p_name, Variant &r_p
 }
 
 void BlackboardPlan::set_base_plan(const Ref<BlackboardPlan> &p_base) {
-	if (p_base == this) {
-		WARN_PRINT_ED("BlackboardPlan: Using same resource for derived blackboard plan is not supported.");
-		base.unref();
-	} else {
-		base = p_base;
-	}
+	base = p_base;
 	sync_with_base_plan();
 	notify_property_list_changed();
 }
 
-void BlackboardPlan::set_parent_scope_plan_provider(const Callable &p_parent_scope_plan_provider) {
-	parent_scope_plan_provider = p_parent_scope_plan_provider;
-	notify_property_list_changed();
-}
-
-bool BlackboardPlan::has_mapping(const StringName &p_name) const {
-	return is_mapping_enabled() && parent_scope_mapping.has(p_name) && parent_scope_mapping[p_name] != StringName();
-}
-
-void BlackboardPlan::set_property_binding(const StringName &p_name, const NodePath &p_path) {
-	property_bindings[p_name] = p_path;
-	emit_changed();
-}
-
 void BlackboardPlan::set_prefetch_nodepath_vars(bool p_enable) {
 	prefetch_nodepath_vars = p_enable;
 	emit_changed();
@@ -314,7 +133,6 @@ bool BlackboardPlan::is_prefetching_nodepath_vars() const {
 }
 
 void BlackboardPlan::add_var(const StringName &p_name, const BBVariable &p_var) {
-	ERR_FAIL_COND(p_name == StringName());
 	ERR_FAIL_COND(var_map.has(p_name));
 	var_map.insert(p_name, p_var);
 	var_list.push_back(Pair<StringName, BBVariable>(p_name, p_var));
@@ -338,11 +156,11 @@ BBVariable BlackboardPlan::get_var(const StringName &p_name) {
 Pair<StringName, BBVariable> BlackboardPlan::get_var_by_index(int p_index) {
 	Pair<StringName, BBVariable> ret;
 	ERR_FAIL_INDEX_V(p_index, (int)var_map.size(), ret);
-	return var_list.get(p_index);
+	return var_list[p_index];
 }
 
-TypedArray<StringName> BlackboardPlan::list_vars() const {
-	TypedArray<StringName> ret;
+PackedStringArray BlackboardPlan::list_vars() const {
+	PackedStringArray ret;
 	for (const Pair<StringName, BBVariable> &p : var_list) {
 		ret.append(p.first);
 	}
@@ -373,7 +191,6 @@ void BlackboardPlan::rename_var(const StringName &p_name, const StringName &p_ne
 
 	ERR_FAIL_COND(!is_valid_var_name(p_new_name));
 	ERR_FAIL_COND(!var_map.has(p_name));
-	ERR_FAIL_COND(var_map.has(p_new_name));
 
 	BBVariable var = var_map[p_name];
 	Pair<StringName, BBVariable> new_entry(p_new_name, var);
@@ -383,11 +200,6 @@ void BlackboardPlan::rename_var(const StringName &p_name, const StringName &p_ne
 	var_map.erase(p_name);
 	var_map.insert(p_new_name, var);
 
-	if (parent_scope_mapping.has(p_name)) {
-		parent_scope_mapping[p_new_name] = parent_scope_mapping[p_name];
-		parent_scope_mapping.erase(p_name);
-	}
-
 	notify_property_list_changed();
 	emit_changed();
 }
@@ -451,17 +263,12 @@ void BlackboardPlan::sync_with_base_plan() {
 	}
 
 	// Erase variables that do not exist in the base plan.
-	List<StringName> erase_list;
 	for (const Pair<StringName, BBVariable> &p : var_list) {
 		if (!base->has_var(p.first)) {
-			erase_list.push_back(p.first);
+			remove_var(p.first);
 			changed = true;
 		}
 	}
-	while (erase_list.size()) {
-		remove_var(erase_list.front()->get());
-		erase_list.pop_front();
-	}
 
 	// Sync order of variables.
 	// Glossary: E - element of current plan, B - element of base plan, F - element of current plan (used for forward search).
@@ -488,72 +295,43 @@ void BlackboardPlan::sync_with_base_plan() {
 	}
 }
 
-Ref<Blackboard> BlackboardPlan::create_blackboard(Node *p_prefetch_root, const Ref<Blackboard> &p_parent_scope, Node *p_prefetch_root_for_base_plan) {
-	ERR_FAIL_COND_V(p_prefetch_root == nullptr && prefetch_nodepath_vars, memnew(Blackboard));
+// Add a variable duplicate to the blackboard, optionally with NodePath prefetch.
+inline void bb_add_var_dup_with_prefetch(const Ref<Blackboard> &p_blackboard, const StringName &p_name, const BBVariable &p_var, bool p_prefetch, Node *p_node) {
+	if (unlikely(p_prefetch && p_var.get_type() == Variant::NODE_PATH)) {
+		Node *n = p_node->get_node_or_null(p_var.get_value());
+		BBVariable var = p_var.duplicate();
+		if (n != nullptr) {
+			var.set_value(n);
+		} else {
+			if (p_blackboard->has_var(p_name)) {
+				// Not adding: Assuming variable was initialized by the user or in the parent scope.
+				return;
+			}
+			ERR_PRINT(vformat("BlackboardPlan: Prefetch failed for variable $%s with value: %s", p_name, p_var.get_value()));
+			var.set_value(Variant());
+		}
+		p_blackboard->assign_var(p_name, var);
+	} else {
+		p_blackboard->assign_var(p_name, p_var.duplicate());
+	}
+}
+
+Ref<Blackboard> BlackboardPlan::create_blackboard(Node *p_node) {
+	ERR_FAIL_COND_V(p_node == nullptr && prefetch_nodepath_vars, memnew(Blackboard));
 	Ref<Blackboard> bb = memnew(Blackboard);
-	bb->set_parent(p_parent_scope);
-	populate_blackboard(bb, true, p_prefetch_root, p_prefetch_root_for_base_plan);
+	for (const Pair<StringName, BBVariable> &p : var_list) {
+		bb_add_var_dup_with_prefetch(bb, p.first, p.second, prefetch_nodepath_vars, p_node);
+	}
 	return bb;
 }
 
-void BlackboardPlan::populate_blackboard(const Ref<Blackboard> &p_blackboard, bool overwrite, Node *p_prefetch_root, Node *p_prefetch_root_for_base_plan) {
-	ERR_FAIL_COND(p_prefetch_root == nullptr && prefetch_nodepath_vars);
-	ERR_FAIL_COND(p_blackboard.is_null());
+void BlackboardPlan::populate_blackboard(const Ref<Blackboard> &p_blackboard, bool overwrite, Node *p_node) {
+	ERR_FAIL_COND(p_node == nullptr && prefetch_nodepath_vars);
 	for (const Pair<StringName, BBVariable> &p : var_list) {
-		if (p_blackboard->has_local_var(p.first) && !overwrite) {
-#ifdef DEBUG_ENABLED
-			Variant::Type existing_type = p_blackboard->get_var(p.first).get_type();
-			Variant::Type planned_type = p.second.get_type();
-			if (existing_type != planned_type && existing_type != Variant::NIL && planned_type != Variant::NIL && !(existing_type == Variant::OBJECT && planned_type == Variant::NODE_PATH)) {
-				WARN_PRINT(vformat("BlackboardPlan: Not overwriting %s as it already exists in the blackboard, but it has a different type than planned (%s vs %s). File: %s",
-						LimboUtility::get_singleton()->decorate_var(p.first), Variant::get_type_name(existing_type), Variant::get_type_name(planned_type), get_path()));
-			}
-#endif
+		if (p_blackboard->has_var(p.first) && !overwrite) {
 			continue;
 		}
-		bool is_bound = has_property_binding(p.first) || (is_derived() && get_base_plan()->has_property_binding(p.first));
-		bool has_mapping = parent_scope_mapping.has(p.first);
-		bool do_prefetch = !is_bound && !has_mapping && prefetch_nodepath_vars;
-
-		// Add a variable duplicate to the blackboard, optionally with NodePath prefetch.
-		BBVariable var = p.second.duplicate(true);
-		if (unlikely(do_prefetch && p.second.get_type() == Variant::NODE_PATH)) {
-			Node *prefetch_root = !p_prefetch_root_for_base_plan || !is_derived() || is_derived_var_changed(p.first) ? p_prefetch_root : p_prefetch_root_for_base_plan;
-			Node *n = prefetch_root->get_node_or_null(p.second.get_value());
-			if (n != nullptr) {
-				var.set_value(n);
-			} else {
-				ERR_PRINT(vformat("BlackboardPlan: Prefetch failed for variable $%s with value: %s", p.first, p.second.get_value()));
-				var.set_value(Variant());
-			}
-		}
-		p_blackboard->assign_var(p.first, var);
-
-		if (has_mapping) {
-			StringName target_var = parent_scope_mapping[p.first];
-			if (target_var != StringName()) {
-				ERR_CONTINUE_MSG(p_blackboard->get_parent().is_null(), vformat("BlackboardPlan: Cannot link variable %s to parent scope because the parent scope is not set.", LimboUtility::get_singleton()->decorate_var(p.first)));
-				p_blackboard->link_var(p.first, p_blackboard->get_parent(), target_var);
-			}
-		} else if (is_bound) {
-			// Bind variable to a property of a scene node.
-			NodePath binding_path;
-			Node *binding_root;
-			if (has_property_binding(p.first)) {
-				binding_path = property_bindings[p.first];
-				binding_root = p_prefetch_root;
-			} else {
-				binding_path = get_base_plan()->property_bindings[p.first];
-				binding_root = p_prefetch_root_for_base_plan;
-			}
-			ERR_CONTINUE_MSG(binding_path.get_subname_count() != 1, vformat("BlackboardPlan: Can't bind variable %s using property path that contains multiple sub-names: %s", LimboUtility::get_singleton()->decorate_var(p.first), binding_path));
-			NodePath node_path{ binding_path.get_concatenated_names() };
-			StringName prop_name = binding_path.get_subname(0);
-			// TODO: Implement binding for base plan as well.
-			Node *n = binding_root->get_node_or_null(node_path);
-			ERR_CONTINUE_MSG(n == nullptr, vformat("BlackboardPlan: Binding failed for variable %s using property path: %s", LimboUtility::get_singleton()->decorate_var(p.first), binding_path));
-			var.bind(n, prop_name);
-		}
+		bb_add_var_dup_with_prefetch(p_blackboard, p.first, p.second, prefetch_nodepath_vars, p_node);
 	}
 }
 
@@ -565,10 +343,8 @@ void BlackboardPlan::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_base_plan"), &BlackboardPlan::get_base_plan);
 	ClassDB::bind_method(D_METHOD("is_derived"), &BlackboardPlan::is_derived);
 	ClassDB::bind_method(D_METHOD("sync_with_base_plan"), &BlackboardPlan::sync_with_base_plan);
-	ClassDB::bind_method(D_METHOD("set_parent_scope_plan_provider", "callable"), &BlackboardPlan::set_parent_scope_plan_provider);
-	ClassDB::bind_method(D_METHOD("get_parent_scope_plan_provider"), &BlackboardPlan::get_parent_scope_plan_provider);
-	ClassDB::bind_method(D_METHOD("create_blackboard", "prefetch_root", "parent_scope", "prefetch_root_for_base_plan"), &BlackboardPlan::create_blackboard, DEFVAL(Ref<Blackboard>()), DEFVAL(Variant()));
-	ClassDB::bind_method(D_METHOD("populate_blackboard", "blackboard", "overwrite", "prefetch_root", "prefetch_root_for_base_plan"), &BlackboardPlan::populate_blackboard, DEFVAL(Variant()));
+	ClassDB::bind_method(D_METHOD("create_blackboard", "node"), &BlackboardPlan::create_blackboard);
+	ClassDB::bind_method(D_METHOD("populate_blackboard", "blackboard", "overwrite", "node"), &BlackboardPlan::populate_blackboard);
 
 	// To avoid cluttering the member namespace, we do not export unnecessary properties in this class.
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "prefetch_nodepath_vars", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "set_prefetch_nodepath_vars", "is_prefetching_nodepath_vars");

blackboard/blackboard_plan.h

@@ -1,7 +1,7 @@
 /**
  * blackboard_plan.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -34,26 +34,11 @@ private:
 	// When base is not null, the plan is considered to be derived from the base plan.
 	// A derived plan can only have variables that exist in the base plan,
 	// and only the values can be different in those variables.
-	// The derived plan is synced with the base plan to maintain consistency.
 	Ref<BlackboardPlan> base;
 
-	// Mapping between variables in this plan and their parent scope names.
-	// Used for linking variables to their parent scope counterparts upon Blackboard creation/population.
-	HashMap<StringName, StringName> parent_scope_mapping;
-	// Fetcher function for the parent scope plan. Function should return a Ref<BlackboardPlan>.
-	// Used in the inspector: enables mapping feature when set.
-	Callable parent_scope_plan_provider;
-
-	// Bindings to properties in the scene to which this plan belongs.
-	HashMap<StringName, NodePath> property_bindings;
-	bool property_binding_enabled = false;
-
 	// If true, NodePath variables will be prefetched, so that the vars will contain node pointers instead (upon BB creation/population).
 	bool prefetch_nodepath_vars = true;
 
-	_FORCE_INLINE_ bool _is_var_nil(const BBVariable &p_var) const { return p_var.get_type() == Variant::NIL; }
-	_FORCE_INLINE_ bool _is_var_private(const String &p_name, const BBVariable &p_var) const { return is_derived() && p_name.begins_with("_"); }
-
 protected:
 	static void _bind_methods();
 
@@ -63,24 +48,10 @@ protected:
 	bool _property_can_revert(const StringName &p_name) const;
 	bool _property_get_revert(const StringName &p_name, Variant &r_property) const;
 
-#ifdef LIMBOAI_GDEXTENSION
-	String _to_string() const { return "<" + get_class() + "#" + itos(get_instance_id()) + ">"; }
-#endif
-
 public:
 	void set_base_plan(const Ref<BlackboardPlan> &p_base);
 	Ref<BlackboardPlan> get_base_plan() const { return base; }
 
-	void set_parent_scope_plan_provider(const Callable &p_parent_scope_plan_provider);
-	Callable get_parent_scope_plan_provider() const { return parent_scope_plan_provider; }
-
-	bool is_mapping_enabled() const { return parent_scope_plan_provider.is_valid() && (parent_scope_plan_provider.call() != Ref<BlackboardPlan>()); }
-	bool has_mapping(const StringName &p_name) const;
-
-	bool has_property_binding(const StringName &p_name) const { return property_bindings.has(p_name); }
-	void set_property_binding(const StringName &p_name, const NodePath &p_path);
-	NodePath get_property_binding(const StringName &p_name) const { return property_bindings.has(p_name) ? property_bindings[p_name] : NodePath(); }
-
 	void set_prefetch_nodepath_vars(bool p_enable);
 	bool is_prefetching_nodepath_vars() const;
 
@@ -92,7 +63,7 @@ public:
 	_FORCE_INLINE_ bool is_empty() const { return var_map.is_empty(); }
 	int get_var_count() const { return var_map.size(); }
 
-	TypedArray<StringName> list_vars() const;
+	PackedStringArray list_vars() const;
 	StringName get_var_name(const BBVariable &p_var) const;
 	bool is_valid_var_name(const StringName &p_name) const;
 	void rename_var(const StringName &p_name, const StringName &p_new_name);
@@ -100,10 +71,9 @@ public:
 
 	void sync_with_base_plan();
 	_FORCE_INLINE_ bool is_derived() const { return base.is_valid(); }
-	_FORCE_INLINE_ bool is_derived_var_changed(const StringName &p_name) const { return base.is_valid() && var_map.has(p_name) && var_map[p_name].is_value_changed(); }
 
-	Ref<Blackboard> create_blackboard(Node *p_prefetch_root, const Ref<Blackboard> &p_parent_scope = Ref<Blackboard>(), Node *p_prefetch_root_for_base_plan = nullptr);
-	void populate_blackboard(const Ref<Blackboard> &p_blackboard, bool overwrite, Node *p_prefetch_root, Node *p_prefetch_root_for_base_plan = nullptr);
+	Ref<Blackboard> create_blackboard(Node *p_agent);
+	void populate_blackboard(const Ref<Blackboard> &p_blackboard, bool overwrite, Node *p_node);
 
 	BlackboardPlan();
 };

bt/behavior_tree.cpp

@@ -1,7 +1,7 @@
 /**
  * behavior_tree.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -48,17 +48,11 @@ void BehaviorTree::set_blackboard_plan(const Ref<BlackboardPlan> &p_plan) {
 		blackboard_plan->connect(LW_NAME(changed), callable_mp(this, &BehaviorTree::_plan_changed));
 	}
 
-	_plan_changed();
+	emit_changed();
 }
 
 void BehaviorTree::set_root_task(const Ref<BTTask> &p_value) {
-#ifdef TOOLS_ENABLED
-	_unset_editor_behavior_tree_hint();
-#endif // TOOLS_ENABLED
 	root_task = p_value;
-#ifdef TOOLS_ENABLED
-	_set_editor_behavior_tree_hint();
-#endif // TOOLS_ENABLED
 	emit_changed();
 }
 
@@ -77,39 +71,17 @@ void BehaviorTree::copy_other(const Ref<BehaviorTree> &p_other) {
 	root_task = p_other->get_root_task();
 }
 
-Ref<BTInstance> BehaviorTree::instantiate(Node *p_agent, const Ref<Blackboard> &p_blackboard, Node *p_instance_owner, Node *p_custom_scene_root) const {
-	ERR_FAIL_COND_V_MSG(root_task.is_null(), nullptr, "BehaviorTree: Instantiation failed - BT has no valid root task.");
-	ERR_FAIL_NULL_V_MSG(p_agent, nullptr, "BehaviorTree: Instantiation failed - agent can't be null.");
-	ERR_FAIL_NULL_V_MSG(p_instance_owner, nullptr, "BehaviorTree: Instantiation failed -- instance owner can't be null.");
-	ERR_FAIL_COND_V_MSG(p_blackboard.is_null(), nullptr, "BehaviorTree: Instantiation failed - blackboard can't be null.");
-	Node *scene_root = p_custom_scene_root ? p_custom_scene_root : p_instance_owner->get_owner();
-	ERR_FAIL_NULL_V_MSG(scene_root, nullptr, "BehaviorTree: Instantiation failed - unable to establish scene root. This is likely due to the instance owner not being owned by a scene node and custom_scene_root being null.");
-	Ref<BTTask> root_copy = root_task->clone();
-	root_copy->initialize(p_agent, p_blackboard, scene_root);
-	return BTInstance::create(root_copy, get_path(), p_instance_owner);
+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();
+	inst->initialize(p_agent, p_blackboard);
+	return inst;
 }
 
 void BehaviorTree::_plan_changed() {
-	emit_signal(LW_NAME(plan_changed));
 	emit_changed();
 }
 
-#ifdef TOOLS_ENABLED
-
-void BehaviorTree::_set_editor_behavior_tree_hint() {
-	if (root_task.is_valid()) {
-		root_task->data.behavior_tree_id = this->get_instance_id();
-	}
-}
-
-void BehaviorTree::_unset_editor_behavior_tree_hint() {
-	if (root_task.is_valid()) {
-		root_task->data.behavior_tree_id = ObjectID();
-	}
-}
-
-#endif // TOOLS_ENABLED
-
 void BehaviorTree::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_description", "description"), &BehaviorTree::set_description);
 	ClassDB::bind_method(D_METHOD("get_description"), &BehaviorTree::get_description);
@@ -119,13 +91,11 @@ void BehaviorTree::_bind_methods() {
 	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", "other"), &BehaviorTree::copy_other);
-	ClassDB::bind_method(D_METHOD("instantiate", "agent", "blackboard", "instance_owner", "custom_scene_root"), &BehaviorTree::instantiate, DEFVAL(Variant()));
+	ClassDB::bind_method(D_METHOD("instantiate", "agent", "blackboard"), &BehaviorTree::instantiate);
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "description", PROPERTY_HINT_MULTILINE_TEXT), "set_description", "get_description");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "blackboard_plan", PROPERTY_HINT_RESOURCE_TYPE, "BlackboardPlan", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_blackboard_plan", "get_blackboard_plan");
 	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");
-
-	ADD_SIGNAL(MethodInfo("plan_changed"));
 }
 
 BehaviorTree::BehaviorTree() {

bt/behavior_tree.h

@@ -1,7 +1,7 @@
 /**
  * behavior_tree.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -13,7 +13,6 @@
 #define BEHAVIOR_TREE_H
 
 #include "../blackboard/blackboard_plan.h"
-#include "bt_instance.h"
 #include "tasks/bt_task.h"
 
 #ifdef LIMBOAI_MODULE
@@ -35,18 +34,9 @@ private:
 
 	void _plan_changed();
 
-#ifdef TOOLS_ENABLED
-	void _set_editor_behavior_tree_hint();
-	void _unset_editor_behavior_tree_hint();
-#endif // TOOLS_ENABLED
-
 protected:
 	static void _bind_methods();
 
-#ifdef LIMBOAI_GDEXTENSION
-	String _to_string() const { return "<" + get_class() + "#" + itos(get_instance_id()) + ">"; }
-#endif
-
 public:
 #ifdef LIMBOAI_MODULE
 	virtual bool editor_can_reload_from_file() override { return false; }
@@ -63,7 +53,7 @@ public:
 
 	Ref<BehaviorTree> clone() const;
 	void copy_other(const Ref<BehaviorTree> &p_other);
-	Ref<BTInstance> instantiate(Node *p_agent, const Ref<Blackboard> &p_blackboard, Node *p_instance_owner, Node *p_custom_scene_root = nullptr) const;
+	Ref<BTTask> instantiate(Node *p_agent, const Ref<Blackboard> &p_blackboard) const;
 
 	BehaviorTree();
 	~BehaviorTree();

bt/bt_instance.cpp

@@ -1,156 +0,0 @@
-/**
- * bt_instance.cpp
- * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- * =============================================================================
- */
-
-#include "bt_instance.h"
-
-#include "../editor/debugger/limbo_debugger.h"
-#include "behavior_tree.h"
-
-#ifdef LIMBOAI_MODULE
-#include "core/os/time.h"
-#include "main/performance.h"
-#endif
-
-#ifdef LIMBOAI_GDEXTENSION
-#include <godot_cpp/classes/performance.hpp>
-#include <godot_cpp/classes/time.hpp>
-#endif
-
-Ref<BTInstance> BTInstance::create(Ref<BTTask> p_root_task, String p_source_bt_path, Node *p_owner_node) {
-	ERR_FAIL_COND_V(p_root_task.is_null(), nullptr);
-	ERR_FAIL_NULL_V(p_owner_node, nullptr);
-	Ref<BTInstance> inst;
-	inst.instantiate();
-	inst->root_task = p_root_task;
-	inst->owner_node_id = p_owner_node->get_instance_id();
-	inst->source_bt_path = p_source_bt_path;
-	return inst;
-}
-
-BT::Status BTInstance::update(double p_delta) {
-	ERR_FAIL_COND_V(!root_task.is_valid(), BT::FRESH);
-
-#ifdef DEBUG_ENABLED
-	double start = Time::get_singleton()->get_ticks_usec();
-#endif
-
-	const Ref<BTInstance> keep_alive{ this }; // keep instance alive until update is finished
-	last_status = root_task->execute(p_delta);
-	emit_signal(LW_NAME(updated), last_status);
-
-#ifdef DEBUG_ENABLED
-	double end = Time::get_singleton()->get_ticks_usec();
-	update_time_acc += (end - start);
-	update_time_n += 1.0;
-#endif
-	return last_status;
-}
-
-void BTInstance::set_monitor_performance(bool p_monitor) {
-#ifdef DEBUG_ENABLED
-	monitor_performance = p_monitor;
-	if (monitor_performance) {
-		_add_custom_monitor();
-	} else {
-		_remove_custom_monitor();
-	}
-#endif
-}
-
-bool BTInstance::get_monitor_performance() const {
-#ifdef DEBUG_ENABLED
-	return monitor_performance;
-#else
-	return false;
-#endif
-}
-
-void BTInstance::register_with_debugger() {
-#ifdef DEBUG_ENABLED
-	if (LimboDebugger::get_singleton()->is_active()) {
-		LimboDebugger::get_singleton()->register_bt_instance(get_instance_id());
-	}
-#endif
-}
-
-void BTInstance::unregister_with_debugger() {
-#ifdef DEBUG_ENABLED
-	if (LimboDebugger::get_singleton() && LimboDebugger::get_singleton()->is_active()) {
-		LimboDebugger::get_singleton()->unregister_bt_instance(get_instance_id());
-	}
-#endif
-}
-
-#ifdef DEBUG_ENABLED
-
-double BTInstance::_get_mean_update_time_msec_and_reset() {
-	if (update_time_n) {
-		double mean_time_msec = (update_time_acc * 0.001) / update_time_n;
-		update_time_acc = 0.0;
-		update_time_n = 0.0;
-		return mean_time_msec;
-	}
-	return 0.0;
-}
-
-void BTInstance::_add_custom_monitor() {
-	ERR_FAIL_NULL(get_owner_node());
-	ERR_FAIL_COND(root_task.is_null());
-	ERR_FAIL_NULL(root_task->get_agent());
-
-	if (monitor_id == StringName()) {
-		monitor_id = vformat("LimboAI/update_ms|%s_%s_%s", root_task->get_agent()->get_name(), get_owner_node()->get_name(),
-				String(itos(get_instance_id())).md5_text().substr(0, 4));
-	}
-	if (!Performance::get_singleton()->has_custom_monitor(monitor_id)) {
-		PERFORMANCE_ADD_CUSTOM_MONITOR(monitor_id, callable_mp(this, &BTInstance::_get_mean_update_time_msec_and_reset));
-	}
-}
-
-void BTInstance::_remove_custom_monitor() {
-	if (monitor_id != StringName() && Performance::get_singleton()->has_custom_monitor(monitor_id)) {
-		Performance::get_singleton()->remove_custom_monitor(monitor_id);
-	}
-}
-
-#endif // * DEBUG_ENABLED
-
-void BTInstance::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("get_root_task"), &BTInstance::get_root_task);
-	ClassDB::bind_method(D_METHOD("get_owner_node"), &BTInstance::get_owner_node);
-	ClassDB::bind_method(D_METHOD("get_last_status"), &BTInstance::get_last_status);
-	ClassDB::bind_method(D_METHOD("get_source_bt_path"), &BTInstance::get_source_bt_path);
-	ClassDB::bind_method(D_METHOD("get_agent"), &BTInstance::get_agent);
-	ClassDB::bind_method(D_METHOD("get_blackboard"), &BTInstance::get_blackboard);
-
-	ClassDB::bind_method(D_METHOD("is_instance_valid"), &BTInstance::is_instance_valid);
-
-	ClassDB::bind_method(D_METHOD("set_monitor_performance", "monitor"), &BTInstance::set_monitor_performance);
-	ClassDB::bind_method(D_METHOD("get_monitor_performance"), &BTInstance::get_monitor_performance);
-
-	ClassDB::bind_method(D_METHOD("update", "delta"), &BTInstance::update);
-
-	ClassDB::bind_method(D_METHOD("register_with_debugger"), &BTInstance::register_with_debugger);
-	ClassDB::bind_method(D_METHOD("unregister_with_debugger"), &BTInstance::unregister_with_debugger);
-
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "monitor_performance"), "set_monitor_performance", "get_monitor_performance");
-
-	ADD_SIGNAL(MethodInfo("updated", PropertyInfo(Variant::INT, "status")));
-	ADD_SIGNAL(MethodInfo("freed"));
-}
-
-BTInstance::~BTInstance() {
-	emit_signal(LW_NAME(freed));
-#ifdef DEBUG_ENABLED
-	_remove_custom_monitor();
-	unregister_with_debugger();
-#endif
-}

bt/bt_instance.h

@@ -1,68 +0,0 @@
-/**
- * bt_instance.h
- * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- * =============================================================================
- */
-#ifndef BT_INSTANCE_H
-#define BT_INSTANCE_H
-
-#include "tasks/bt_task.h"
-
-class BTInstance : public RefCounted {
-	GDCLASS(BTInstance, RefCounted);
-
-private:
-	Ref<BTTask> root_task;
-	uint64_t owner_node_id = 0;
-	String source_bt_path;
-	BT::Status last_status = BT::FRESH;
-
-#ifdef DEBUG_ENABLED
-	bool monitor_performance = false;
-	StringName monitor_id;
-	double update_time_acc = 0.0;
-	double update_time_n = 0.0;
-
-	double _get_mean_update_time_msec_and_reset();
-	void _add_custom_monitor();
-	void _remove_custom_monitor();
-
-#endif // * DEBUG_ENABLED
-
-protected:
-	static void _bind_methods();
-
-#ifdef LIMBOAI_GDEXTENSION
-	String _to_string() const { return "<" + get_class() + "#" + itos(get_instance_id()) + ">"; }
-#endif
-
-public:
-	_FORCE_INLINE_ Ref<BTTask> get_root_task() const { return root_task; }
-	_FORCE_INLINE_ Node *get_owner_node() const { return owner_node_id ? Object::cast_to<Node>(OBJECT_DB_GET_INSTANCE(owner_node_id)) : nullptr; }
-	_FORCE_INLINE_ BT::Status get_last_status() const { return last_status; }
-	_FORCE_INLINE_ String get_source_bt_path() const { return source_bt_path; }
-	_FORCE_INLINE_ Node *get_agent() const { return root_task.is_valid() ? root_task->get_agent() : nullptr; }
-	_FORCE_INLINE_ Ref<Blackboard> get_blackboard() const { return root_task.is_valid() ? root_task->get_blackboard() : Ref<Blackboard>(); }
-
-	_FORCE_INLINE_ bool is_instance_valid() const { return root_task.is_valid(); }
-
-	BT::Status update(double p_delta);
-
-	void set_monitor_performance(bool p_monitor);
-	bool get_monitor_performance() const;
-
-	void register_with_debugger();
-	void unregister_with_debugger();
-
-	static Ref<BTInstance> create(Ref<BTTask> p_root_task, String p_source_bt_path, Node *p_owner_node);
-
-	BTInstance() = default;
-	~BTInstance();
-};
-
-#endif // BT_INSTANCE_H

bt/bt_player.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_player.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -11,6 +11,7 @@
 
 #include "bt_player.h"
 
+#include "../editor/debugger/limbo_debugger.h"
 #include "../util/limbo_compat.h"
 #include "../util/limbo_string_names.h"
 
@@ -42,99 +43,48 @@
 
 VARIANT_ENUM_CAST(BTPlayer::UpdateMode);
 
-void BTPlayer::_instantiate_bt() {
-	bt_instance.unref();
-	ERR_FAIL_COND_MSG(!behavior_tree.is_valid(), "BTPlayer: Initialization failed - needs a valid behavior tree.");
-	ERR_FAIL_COND_MSG(!behavior_tree->get_root_task().is_valid(), "BTPlayer: Initialization failed - behavior tree has no valid root task.");
-	Node *agent = GET_NODE(this, agent_node);
-	ERR_FAIL_NULL_MSG(agent, vformat("BTPlayer: Initialization failed - can't get agent with path '%s'.", agent_node));
-	Node *scene_root = _get_scene_root();
-	ERR_FAIL_COND_MSG(scene_root == nullptr,
-			"BTPlayer: Initialization failed - unable to establish scene root. This is likely due to BTPlayer not being owned by a scene node. Check BTPlayer.set_scene_root_hint().");
-	bt_instance = behavior_tree->instantiate(agent, blackboard, this, scene_root);
-	ERR_FAIL_COND_MSG(bt_instance.is_null(), "BTPlayer: Failed to instantiate behavior tree.");
+void BTPlayer::_load_tree() {
 #ifdef DEBUG_ENABLED
-	bt_instance->set_monitor_performance(monitor_performance);
-	bt_instance->register_with_debugger();
-#endif // DEBUG_ENABLED
+	if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
+		LimboDebugger::get_singleton()->unregister_bt_instance(tree_instance, get_path());
+	}
+#endif
+	tree_instance.unref();
+	ERR_FAIL_COND_MSG(!behavior_tree.is_valid(), "BTPlayer: Needs a valid behavior tree.");
+	ERR_FAIL_COND_MSG(!behavior_tree->get_root_task().is_valid(), "BTPlayer: Behavior tree has no valid root task.");
+	tree_instance = behavior_tree->instantiate(get_owner(), blackboard);
+#ifdef DEBUG_ENABLED
+	if (IS_DEBUGGER_ACTIVE()) {
+		LimboDebugger::get_singleton()->register_bt_instance(tree_instance, get_path());
+	}
+#endif
 }
 
 void BTPlayer::_update_blackboard_plan() {
 	if (blackboard_plan.is_null()) {
 		blackboard_plan = Ref<BlackboardPlan>(memnew(BlackboardPlan));
-	} else if (!RESOURCE_IS_BUILT_IN(blackboard_plan)) {
-		WARN_PRINT_ED("BTPlayer: Using external resource for derived blackboard plan is not supported. Converted to built-in resource.");
-		blackboard_plan = blackboard_plan->duplicate();
 	}
-
 	blackboard_plan->set_base_plan(behavior_tree.is_valid() ? behavior_tree->get_blackboard_plan() : nullptr);
 }
 
-void BTPlayer::_initialize() {
-	if (blackboard.is_null()) {
-		blackboard = Ref<Blackboard>(memnew(Blackboard));
-	}
-	if (blackboard_plan.is_valid()) {
-		// Don't overwrite existing blackboard values as they may be initialized from code.
-		blackboard_plan->populate_blackboard(blackboard, false, this, _get_scene_root());
-	}
-	if (behavior_tree.is_valid()) {
-		_instantiate_bt();
-	}
-}
-
-void BTPlayer::set_bt_instance(const Ref<BTInstance> &p_bt_instance) {
-	ERR_FAIL_COND_MSG(p_bt_instance.is_null(), "BTPlayer: Failed to set behavior tree instance - instance is null.");
-	ERR_FAIL_COND_MSG(!p_bt_instance->is_instance_valid(), "BTPlayer: Failed to set behavior tree instance - instance is not valid.");
-
-	bt_instance = p_bt_instance;
-	blackboard = p_bt_instance->get_blackboard();
-	agent_node = p_bt_instance->get_agent()->get_path();
-
-#ifdef DEBUG_ENABLED
-	bt_instance->set_monitor_performance(monitor_performance);
-	bt_instance->register_with_debugger();
-#endif // DEBUG_ENABLED
-
-	blackboard_plan.unref();
-	behavior_tree.unref();
-}
-
-void BTPlayer::set_scene_root_hint(Node *p_scene_root) {
-	ERR_FAIL_NULL_MSG(p_scene_root, "BTPlayer: Failed to set scene root hint - scene root is null.");
-	if (bt_instance.is_valid()) {
-		ERR_PRINT("BTPlayer: Scene root hint shouldn't be set after the behavior tree is instantiated. This change will not affect the current behavior tree instance.");
-	}
-
-	scene_root_hint = p_scene_root;
-}
-
 void BTPlayer::set_behavior_tree(const Ref<BehaviorTree> &p_tree) {
 	if (Engine::get_singleton()->is_editor_hint()) {
-		if (behavior_tree.is_valid() && behavior_tree->is_connected(LW_NAME(plan_changed), callable_mp(this, &BTPlayer::_update_blackboard_plan))) {
-			behavior_tree->disconnect(LW_NAME(plan_changed), callable_mp(this, &BTPlayer::_update_blackboard_plan));
+		if (behavior_tree.is_valid() && behavior_tree->is_connected(LW_NAME(changed), callable_mp(this, &BTPlayer::_update_blackboard_plan))) {
+			behavior_tree->disconnect(LW_NAME(changed), callable_mp(this, &BTPlayer::_update_blackboard_plan));
 		}
 		if (p_tree.is_valid()) {
-			p_tree->connect(LW_NAME(plan_changed), callable_mp(this, &BTPlayer::_update_blackboard_plan));
+			p_tree->connect(LW_NAME(changed), callable_mp(this, &BTPlayer::_update_blackboard_plan));
 		}
 		behavior_tree = p_tree;
 		_update_blackboard_plan();
 	} else {
 		behavior_tree = p_tree;
-		if (get_owner() && is_inside_tree()) {
-			_update_blackboard_plan();
-			_initialize();
+		if (get_owner()) {
+			_load_tree();
 		}
 	}
 }
 
-void BTPlayer::set_agent_node(const NodePath &p_agent_node) {
-	agent_node = p_agent_node;
-	if (bt_instance.is_valid()) {
-		ERR_PRINT("BTPlayer: Agent node cannot be set after the behavior tree is instantiated. This change will not affect the behavior tree instance.");
-	}
-}
-
 void BTPlayer::set_blackboard_plan(const Ref<BlackboardPlan> &p_plan) {
 	blackboard_plan = p_plan;
 	_update_blackboard_plan();
@@ -154,38 +104,70 @@ void BTPlayer::set_active(bool p_active) {
 }
 
 void BTPlayer::update(double p_delta) {
-	if (!bt_instance.is_valid()) {
+	if (!tree_instance.is_valid()) {
 		ERR_PRINT_ONCE(vformat("BTPlayer doesn't have a behavior tree with a valid root task to execute (owner: %s)", get_owner()));
 		return;
 	}
 
+#ifdef DEBUG_ENABLED
+	double start = GET_TICKS_USEC();
+#endif
+
 	if (active) {
-		BT::Status status = bt_instance->update(p_delta);
-		emit_signal(LW_NAME(updated), status);
-#ifndef DISABLE_DEPRECATED
-		if (status == BTTask::SUCCESS || status == BTTask::FAILURE) {
-			emit_signal(LW_NAME(behavior_tree_finished), status);
+		last_status = tree_instance->execute(p_delta);
+		emit_signal(LimboStringNames::get_singleton()->updated, last_status);
+		if (last_status == BTTask::SUCCESS || last_status == BTTask::FAILURE) {
+			emit_signal(LimboStringNames::get_singleton()->behavior_tree_finished, last_status);
 		}
-#endif // DISABLE_DEPRECATED
 	}
+
+#ifdef DEBUG_ENABLED
+	double end = GET_TICKS_USEC();
+	update_time_acc += (end - start);
+	update_time_n += 1.0;
+#endif
 }
 
 void BTPlayer::restart() {
-	ERR_FAIL_COND_MSG(bt_instance.is_null(), "BTPlayer: Restart failed - no valid tree instance. Make sure the BTPlayer has a valid behavior tree with a valid root task.");
-	bt_instance->get_root_task()->abort();
+	tree_instance->abort();
 	set_active(true);
 }
 
-void BTPlayer::set_monitor_performance(bool p_monitor_performance) {
+#ifdef DEBUG_ENABLED
+
+void BTPlayer::_set_monitor_performance(bool p_monitor_performance) {
 	monitor_performance = p_monitor_performance;
 
-#ifdef DEBUG_ENABLED
-	if (bt_instance.is_valid()) {
-		bt_instance->set_monitor_performance(monitor_performance);
+	if (!get_owner()) {
+		return;
+	}
+
+	Performance *perf = Performance::get_singleton();
+	if (monitor_performance) {
+		if (monitor_id == StringName()) {
+			monitor_id = vformat("limboai/update_ms|%s_%s_%s", get_owner()->get_name(), get_name(),
+					String(itos(get_instance_id())).md5_text().substr(0, 4));
+		}
+		if (!perf->has_custom_monitor(monitor_id)) {
+			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);
 	}
-#endif
 }
 
+double BTPlayer::_get_mean_update_time_msec() {
+	if (update_time_n) {
+		double mean_time_msec = (update_time_acc * 0.001) / update_time_n;
+		update_time_acc = 0.0;
+		update_time_n = 0.0;
+		return mean_time_msec;
+	}
+	return 0.0;
+}
+
+#endif // ! DEBUG_ENABLED
+
 void BTPlayer::_notification(int p_notification) {
 	switch (p_notification) {
 		case NOTIFICATION_PROCESS: {
@@ -198,33 +180,43 @@ void BTPlayer::_notification(int p_notification) {
 		} break;
 		case NOTIFICATION_READY: {
 			if (!Engine::get_singleton()->is_editor_hint()) {
-				_initialize();
+				if (blackboard.is_null()) {
+					blackboard = Ref<Blackboard>(memnew(Blackboard));
+				}
+				if (blackboard_plan.is_valid()) {
+					blackboard_plan->populate_blackboard(blackboard, false, this);
+				}
+				if (behavior_tree.is_valid()) {
+					_load_tree();
+				}
+				set_active(active);
+#ifdef DEBUG_ENABLED
+				_set_monitor_performance(monitor_performance);
+#endif
 			} else {
 				_update_blackboard_plan();
 			}
-			set_active(active);
 		} break;
 		case NOTIFICATION_ENTER_TREE: {
 #ifdef DEBUG_ENABLED
-			if (bt_instance.is_valid()) {
-				bt_instance->set_monitor_performance(monitor_performance);
-				bt_instance->register_with_debugger();
+			if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
+				LimboDebugger::get_singleton()->register_bt_instance(tree_instance, get_path());
 			}
 #endif // DEBUG_ENABLED
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
 #ifdef DEBUG_ENABLED
-			if (bt_instance.is_valid()) {
-				bt_instance->set_monitor_performance(false);
-				bt_instance->unregister_with_debugger();
+			if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
+				LimboDebugger::get_singleton()->unregister_bt_instance(tree_instance, get_path());
 			}
 #endif // DEBUG_ENABLED
 
 			if (Engine::get_singleton()->is_editor_hint()) {
-				if (behavior_tree.is_valid() && behavior_tree->is_connected(LW_NAME(plan_changed), callable_mp(this, &BTPlayer::_update_blackboard_plan))) {
-					behavior_tree->disconnect(LW_NAME(plan_changed), callable_mp(this, &BTPlayer::_update_blackboard_plan));
+				if (behavior_tree.is_valid() && behavior_tree->is_connected(LW_NAME(changed), callable_mp(this, &BTPlayer::_update_blackboard_plan))) {
+					behavior_tree->disconnect(LW_NAME(changed), callable_mp(this, &BTPlayer::_update_blackboard_plan));
 				}
 			}
+
 		} break;
 	}
 }
@@ -232,8 +224,6 @@ void BTPlayer::_notification(int p_notification) {
 void BTPlayer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_behavior_tree", "behavior_tree"), &BTPlayer::set_behavior_tree);
 	ClassDB::bind_method(D_METHOD("get_behavior_tree"), &BTPlayer::get_behavior_tree);
-	ClassDB::bind_method(D_METHOD("set_agent_node", "agent_node"), &BTPlayer::set_agent_node);
-	ClassDB::bind_method(D_METHOD("get_agent_node"), &BTPlayer::get_agent_node);
 	ClassDB::bind_method(D_METHOD("set_update_mode", "update_mode"), &BTPlayer::set_update_mode);
 	ClassDB::bind_method(D_METHOD("get_update_mode"), &BTPlayer::get_update_mode);
 	ClassDB::bind_method(D_METHOD("set_active", "active"), &BTPlayer::set_active);
@@ -244,39 +234,34 @@ void BTPlayer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_blackboard_plan", "plan"), &BTPlayer::set_blackboard_plan);
 	ClassDB::bind_method(D_METHOD("get_blackboard_plan"), &BTPlayer::get_blackboard_plan);
 
-	ClassDB::bind_method(D_METHOD("set_monitor_performance", "enable"), &BTPlayer::set_monitor_performance);
-	ClassDB::bind_method(D_METHOD("get_monitor_performance"), &BTPlayer::get_monitor_performance);
-
 	ClassDB::bind_method(D_METHOD("update", "delta"), &BTPlayer::update);
 	ClassDB::bind_method(D_METHOD("restart"), &BTPlayer::restart);
+	ClassDB::bind_method(D_METHOD("get_last_status"), &BTPlayer::get_last_status);
 
-	ClassDB::bind_method(D_METHOD("get_bt_instance"), &BTPlayer::get_bt_instance);
-	ClassDB::bind_method(D_METHOD("set_bt_instance", "bt_instance"), &BTPlayer::set_bt_instance);
-
-	ClassDB::bind_method(D_METHOD("set_scene_root_hint", "scene_root"), &BTPlayer::set_scene_root_hint);
+	ClassDB::bind_method(D_METHOD("get_tree_instance"), &BTPlayer::get_tree_instance);
 
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "behavior_tree", PROPERTY_HINT_RESOURCE_TYPE, "BehaviorTree"), "set_behavior_tree", "get_behavior_tree");
-	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "agent_node"), "set_agent_node", "get_agent_node");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "update_mode", PROPERTY_HINT_ENUM, "Idle,Physics,Manual"), "set_update_mode", "get_update_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "active"), "set_active", "get_active");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "blackboard", PROPERTY_HINT_NONE, "Blackboard", 0), "set_blackboard", "get_blackboard");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "blackboard_plan", PROPERTY_HINT_RESOURCE_TYPE, "BlackboardPlan", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT | PROPERTY_USAGE_ALWAYS_DUPLICATE), "set_blackboard_plan", "get_blackboard_plan");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "monitor_performance"), "set_monitor_performance", "get_monitor_performance");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "blackboard_plan", PROPERTY_HINT_RESOURCE_TYPE, "BlackboardPlan", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_blackboard_plan", "get_blackboard_plan");
 
 	BIND_ENUM_CONSTANT(IDLE);
 	BIND_ENUM_CONSTANT(PHYSICS);
 	BIND_ENUM_CONSTANT(MANUAL);
 
+	ADD_SIGNAL(MethodInfo("behavior_tree_finished", PropertyInfo(Variant::INT, "status")));
 	ADD_SIGNAL(MethodInfo("updated", PropertyInfo(Variant::INT, "status")));
 
-#ifndef DISABLE_DEPRECATED
-	ADD_SIGNAL(MethodInfo("behavior_tree_finished", PropertyInfo(Variant::INT, "status")));
-#endif
+#ifdef DEBUG_ENABLED
+	ClassDB::bind_method(D_METHOD("_set_monitor_performance", "enable"), &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");
+#endif // DEBUG_ENABLED
 }
 
 BTPlayer::BTPlayer() {
 	blackboard = Ref<Blackboard>(memnew(Blackboard));
-	agent_node = LW_NAME(node_pp);
 }
 
 BTPlayer::~BTPlayer() {

bt/bt_player.h

@@ -1,7 +1,7 @@
 /**
  * bt_player.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -15,7 +15,6 @@
 #include "../blackboard/blackboard.h"
 #include "../blackboard/blackboard_plan.h"
 #include "behavior_tree.h"
-#include "bt_instance.h"
 #include "tasks/bt_task.h"
 
 #ifdef LIMBOAI_MODULE
@@ -38,37 +37,26 @@ public:
 
 private:
 	Ref<BehaviorTree> behavior_tree;
-	NodePath agent_node;
 	Ref<BlackboardPlan> blackboard_plan;
 	UpdateMode update_mode = UpdateMode::PHYSICS;
 	bool active = true;
 	Ref<Blackboard> blackboard;
-	Node *scene_root_hint = nullptr;
-	bool monitor_performance = false;
+	int last_status = -1;
 
-	Ref<BTInstance> bt_instance;
+	Ref<BTTask> tree_instance;
 
-	void _instantiate_bt();
+	void _load_tree();
 	void _update_blackboard_plan();
-	void _initialize();
-	_FORCE_INLINE_ Node *_get_scene_root() const { return scene_root_hint ? scene_root_hint : get_owner(); }
 
 protected:
 	static void _bind_methods();
 
 	void _notification(int p_notification);
 
-#ifdef LIMBOAI_GDEXTENSION
-	String _to_string() const { return String(get_name()) + ":<" + get_class() + "#" + itos(get_instance_id()) + ">"; }
-#endif
-
 public:
 	void set_behavior_tree(const Ref<BehaviorTree> &p_tree);
 	Ref<BehaviorTree> get_behavior_tree() const { return behavior_tree; };
 
-	void set_agent_node(const NodePath &p_agent_node);
-	NodePath get_agent_node() const { return agent_node; }
-
 	void set_blackboard_plan(const Ref<BlackboardPlan> &p_plan);
 	Ref<BlackboardPlan> get_blackboard_plan() const { return blackboard_plan; }
 
@@ -81,19 +69,28 @@ public:
 	Ref<Blackboard> get_blackboard() const { return blackboard; }
 	void set_blackboard(const Ref<Blackboard> &p_blackboard) { blackboard = p_blackboard; }
 
-	void set_monitor_performance(bool p_monitor_performance);
-	bool get_monitor_performance() const { return monitor_performance; }
-
 	void update(double p_delta);
 	void restart();
+	int get_last_status() const { return last_status; }
 
-	Ref<BTInstance> get_bt_instance() { return bt_instance; }
-	void set_bt_instance(const Ref<BTInstance> &p_bt_instance);
-
-	void set_scene_root_hint(Node *p_scene_root);
+	Ref<BTTask> get_tree_instance() { return tree_instance; }
 
 	BTPlayer();
 	~BTPlayer();
+
+#ifdef DEBUG_ENABLED // Performance monitoring
+
+private:
+	bool monitor_performance = false;
+	StringName monitor_id;
+	double update_time_acc = 0.0;
+	double update_time_n = 0.0;
+
+	void _set_monitor_performance(bool p_monitor_performance);
+	bool _get_monitor_performance() const { return monitor_performance; }
+	double _get_mean_update_time_msec();
+
+#endif // DEBUG_ENABLED
 };
 
 #endif // BT_PLAYER_H

bt/bt_state.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_state.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -11,6 +11,7 @@
 
 #include "bt_state.h"
 
+#include "../editor/debugger/limbo_debugger.h"
 #include "../util/limbo_compat.h"
 #include "../util/limbo_string_names.h"
 
@@ -24,82 +25,47 @@
 
 void BTState::set_behavior_tree(const Ref<BehaviorTree> &p_tree) {
 	if (Engine::get_singleton()->is_editor_hint()) {
-		if (behavior_tree.is_valid() && behavior_tree->is_connected(LW_NAME(plan_changed), callable_mp(this, &BTState::_update_blackboard_plan))) {
-			behavior_tree->disconnect(LW_NAME(plan_changed), callable_mp(this, &BTState::_update_blackboard_plan));
+		if (behavior_tree.is_valid() && behavior_tree->is_connected(LW_NAME(changed), callable_mp(this, &BTState::_update_blackboard_plan))) {
+			behavior_tree->disconnect(LW_NAME(changed), callable_mp(this, &BTState::_update_blackboard_plan));
 		}
 		if (p_tree.is_valid()) {
-			p_tree->connect(LW_NAME(plan_changed), callable_mp(this, &BTState::_update_blackboard_plan));
+			p_tree->connect(LW_NAME(changed), callable_mp(this, &BTState::_update_blackboard_plan));
 		}
-		behavior_tree = p_tree;
-	} else {
-		behavior_tree = p_tree;
+		_update_blackboard_plan();
 	}
-	_update_blackboard_plan();
-}
-
-void BTState::set_scene_root_hint(Node *p_scene_root) {
-	ERR_FAIL_NULL_MSG(p_scene_root, "BTState: Failed to set scene root hint - scene root is null.");
-	ERR_FAIL_COND_MSG(bt_instance.is_valid(), "BTState: Scene root hint shouldn't be set after initialization. This change will not affect the current behavior tree instance.");
-
-	scene_root_hint = p_scene_root;
-}
-
-void BTState::set_monitor_performance(bool p_monitor) {
-	monitor_performance = p_monitor;
-
-#ifdef DEBUG_ENABLED
-	if (bt_instance.is_valid()) {
-		bt_instance->set_monitor_performance(monitor_performance);
-	}
-#endif
+	behavior_tree = p_tree;
 }
 
 void BTState::_update_blackboard_plan() {
 	if (get_blackboard_plan().is_null()) {
-		set_blackboard_plan(memnew(BlackboardPlan));
-	} else if (!RESOURCE_IS_BUILT_IN(get_blackboard_plan())) {
-		WARN_PRINT_ED("BTState: Using external resource for derived blackboard plan is not supported. Converted to built-in resource.");
-		set_blackboard_plan(get_blackboard_plan()->duplicate());
-	} else {
-		get_blackboard_plan()->set_base_plan(behavior_tree.is_valid() ? behavior_tree->get_blackboard_plan() : nullptr);
+		set_blackboard_plan(Ref<BlackboardPlan>(memnew(BlackboardPlan)));
 	}
-}
-
-Node *BTState::_get_prefetch_root_for_base_plan() {
-	return _get_scene_root();
+	get_blackboard_plan()->set_base_plan(behavior_tree.is_valid() ? behavior_tree->get_blackboard_plan() : nullptr);
 }
 
 void BTState::_setup() {
 	LimboState::_setup();
 	ERR_FAIL_COND_MSG(behavior_tree.is_null(), "BTState: BehaviorTree is not assigned.");
-	Node *scene_root = _get_scene_root();
-	ERR_FAIL_NULL_MSG(scene_root, "BTState: Initialization failed - unable to establish scene root. This is likely due to BTState not being owned by a scene node. Check BTState.set_scene_root_hint().");
-	bt_instance = behavior_tree->instantiate(get_agent(), get_blackboard(), this, scene_root);
-	ERR_FAIL_COND_MSG(bt_instance.is_null(), "BTState: Initialization failed - failed to instantiate behavior tree.");
+	// TODO: BBNode relies on agent to be scene owner, so if the user provides anything else, the behavior tree can break.
+	tree_instance = behavior_tree->instantiate(get_agent(), get_blackboard());
 
 #ifdef DEBUG_ENABLED
-	bt_instance->register_with_debugger();
-	bt_instance->set_monitor_performance(monitor_performance);
+	if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
+		LimboDebugger::get_singleton()->register_bt_instance(tree_instance, get_path());
+	}
 #endif
 }
 
 void BTState::_exit() {
-	if (bt_instance.is_valid()) {
-		bt_instance->get_root_task()->abort();
-	} else {
-		ERR_PRINT_ONCE("BTState: BehaviorTree is not assigned.");
-	}
 	LimboState::_exit();
+	ERR_FAIL_NULL(tree_instance);
+	tree_instance->abort();
 }
 
 void BTState::_update(double p_delta) {
-	GDVIRTUAL_CALL(_update, p_delta);
-	if (!is_active()) {
-		// Bail out if a transition happened in the meantime.
-		return;
-	}
-	ERR_FAIL_COND(bt_instance.is_null());
-	BT::Status status = bt_instance->update(p_delta);
+	VCALL_ARGS(_update, p_delta);
+	ERR_FAIL_NULL(tree_instance);
+	int status = tree_instance->execute(p_delta);
 	if (status == BTTask::SUCCESS) {
 		get_root()->dispatch(success_event, Variant());
 	} else if (status == BTTask::FAILURE) {
@@ -112,24 +78,21 @@ void BTState::_notification(int p_notification) {
 	switch (p_notification) {
 #ifdef DEBUG_ENABLED
 		case NOTIFICATION_ENTER_TREE: {
-			if (bt_instance.is_valid()) {
-				bt_instance->register_with_debugger();
-				bt_instance->set_monitor_performance(monitor_performance);
+			if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
+				LimboDebugger::get_singleton()->register_bt_instance(tree_instance, get_path());
 			}
 		} break;
 #endif // DEBUG_ENABLED
 		case NOTIFICATION_EXIT_TREE: {
 #ifdef DEBUG_ENABLED
-			if (bt_instance.is_valid()) {
-				bt_instance->unregister_with_debugger();
-				bt_instance->set_monitor_performance(false);
+			if (tree_instance.is_valid() && IS_DEBUGGER_ACTIVE()) {
+				LimboDebugger::get_singleton()->unregister_bt_instance(tree_instance, get_path());
 			}
-
 #endif // DEBUG_ENABLED
 
 			if (Engine::get_singleton()->is_editor_hint()) {
-				if (behavior_tree.is_valid() && behavior_tree->is_connected(LW_NAME(plan_changed), callable_mp(this, &BTState::_update_blackboard_plan))) {
-					behavior_tree->disconnect(LW_NAME(plan_changed), callable_mp(this, &BTState::_update_blackboard_plan));
+				if (behavior_tree.is_valid() && behavior_tree->is_connected(LW_NAME(changed), callable_mp(this, &BTState::_update_blackboard_plan))) {
+					behavior_tree->disconnect(LW_NAME(changed), callable_mp(this, &BTState::_update_blackboard_plan));
 				}
 			}
 		} break;
@@ -140,7 +103,7 @@ void BTState::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_behavior_tree", "behavior_tree"), &BTState::set_behavior_tree);
 	ClassDB::bind_method(D_METHOD("get_behavior_tree"), &BTState::get_behavior_tree);
 
-	ClassDB::bind_method(D_METHOD("get_bt_instance"), &BTState::get_bt_instance);
+	ClassDB::bind_method(D_METHOD("get_tree_instance"), &BTState::get_tree_instance);
 
 	ClassDB::bind_method(D_METHOD("set_success_event", "event"), &BTState::set_success_event);
 	ClassDB::bind_method(D_METHOD("get_success_event"), &BTState::get_success_event);
@@ -148,15 +111,9 @@ void BTState::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_failure_event", "event"), &BTState::set_failure_event);
 	ClassDB::bind_method(D_METHOD("get_failure_event"), &BTState::get_failure_event);
 
-	ClassDB::bind_method(D_METHOD("set_monitor_performance", "enable"), &BTState::set_monitor_performance);
-	ClassDB::bind_method(D_METHOD("get_monitor_performance"), &BTState::get_monitor_performance);
-
-	ClassDB::bind_method(D_METHOD("set_scene_root_hint", "scene_root"), &BTState::set_scene_root_hint);
-
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "behavior_tree", PROPERTY_HINT_RESOURCE_TYPE, "BehaviorTree"), "set_behavior_tree", "get_behavior_tree");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "success_event"), "set_success_event", "get_success_event");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING_NAME, "failure_event"), "set_failure_event", "get_failure_event");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "monitor_performance"), "set_monitor_performance", "get_monitor_performance");
 }
 
 BTState::BTState() {

bt/bt_state.h

@@ -1,7 +1,7 @@
 /**
  * bt_state.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -22,13 +22,9 @@ class BTState : public LimboState {
 
 private:
 	Ref<BehaviorTree> behavior_tree;
-	Ref<BTInstance> bt_instance;
+	Ref<BTTask> tree_instance;
 	StringName success_event;
 	StringName failure_event;
-	Node *scene_root_hint = nullptr;
-	bool monitor_performance = false;
-
-	_FORCE_INLINE_ Node *_get_scene_root() const { return scene_root_hint ? scene_root_hint : get_owner(); }
 
 protected:
 	static void _bind_methods();
@@ -37,7 +33,6 @@ protected:
 
 	virtual bool _should_use_new_scope() const override { return true; }
 	virtual void _update_blackboard_plan() override;
-	virtual Node *_get_prefetch_root_for_base_plan() override;
 
 	virtual void _setup() override;
 	virtual void _exit() override;
@@ -47,7 +42,7 @@ public:
 	void set_behavior_tree(const Ref<BehaviorTree> &p_value);
 	Ref<BehaviorTree> get_behavior_tree() const { return behavior_tree; }
 
-	Ref<BTInstance> get_bt_instance() const { return bt_instance; }
+	Ref<BTTask> get_tree_instance() const { return tree_instance; }
 
 	void set_success_event(const StringName &p_success_event) { success_event = p_success_event; }
 	StringName get_success_event() const { return success_event; }
@@ -55,11 +50,6 @@ public:
 	void set_failure_event(const StringName &p_failure_event) { failure_event = p_failure_event; }
 	StringName get_failure_event() const { return failure_event; }
 
-	void set_monitor_performance(bool p_monitor);
-	bool get_monitor_performance() const { return monitor_performance; }
-
-	void set_scene_root_hint(Node *p_node);
-
 	BTState();
 };
 

bt/tasks/blackboard/bt_check_trigger.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_check_trigger.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/blackboard/bt_check_trigger.h

@@ -1,7 +1,7 @@
 /**
  * bt_check_trigger.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/blackboard/bt_check_var.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_check_var.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -24,9 +24,8 @@ void BTCheckVar::set_check_type(LimboUtility::CheckType p_check_type) {
 void BTCheckVar::set_value(const Ref<BBVariant> &p_value) {
 	value = p_value;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && value.is_valid() &&
-			!value->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
-		value->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
+	if (Engine::get_singleton()->is_editor_hint() && value.is_valid()) {
+		value->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
 	}
 }
 
@@ -58,7 +57,7 @@ BT::Status BTCheckVar::_tick(double p_delta) {
 	ERR_FAIL_COND_V_MSG(!get_blackboard()->has_var(variable), FAILURE, vformat("BTCheckVar: Blackboard variable doesn't exist: \"%s\". Returning FAILURE.", variable));
 
 	Variant left_value = get_blackboard()->get_var(variable, Variant());
-	Variant right_value = value->get_value(get_scene_root(), get_blackboard());
+	Variant right_value = value->get_value(get_agent(), get_blackboard());
 
 	return LimboUtility::get_singleton()->perform_check(check_type, left_value, right_value) ? SUCCESS : FAILURE;
 }

bt/tasks/blackboard/bt_check_var.h

@@ -1,7 +1,7 @@
 /**
  * bt_check_var.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/blackboard/bt_set_var.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_set_var.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -26,7 +26,7 @@ BT::Status BTSetVar::_tick(double p_delta) {
 	ERR_FAIL_COND_V_MSG(!value.is_valid(), FAILURE, "BTSetVar: `value` is not set.");
 	Variant result;
 	Variant error_result = LW_NAME(error_value);
-	Variant right_value = value->get_value(get_scene_root(), get_blackboard(), error_result);
+	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) {
 		result = right_value;
@@ -48,9 +48,8 @@ void BTSetVar::set_variable(const StringName &p_variable) {
 void BTSetVar::set_value(const Ref<BBVariant> &p_value) {
 	value = p_value;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && value.is_valid() &&
-			!value->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
-		value->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
+	if (Engine::get_singleton()->is_editor_hint() && value.is_valid()) {
+		value->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
 	}
 }
 

bt/tasks/blackboard/bt_set_var.h

@@ -1,7 +1,7 @@
 /**
  * bt_set_var.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/bt_action.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_action.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/bt_action.h

@@ -1,7 +1,7 @@
 /**
  * bt_action.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -17,9 +17,6 @@
 class BTAction : public BTTask {
 	GDCLASS(BTAction, BTTask);
 
-protected:
-	static void _bind_methods() {}
-
 public:
 	virtual PackedStringArray get_configuration_warnings() override;
 };

bt/tasks/bt_comment.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_comment.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -30,7 +30,7 @@ PackedStringArray BTComment::get_configuration_warnings() {
 	if (get_child_count_excluding_comments() > 0) {
 		warnings.append("Can only have other comment tasks as children.");
 	}
-	if (get_parent().is_null()) {
+	if (get_parent() == nullptr) {
 		warnings.append("Can't be the root task.");
 	}
 	return warnings;

bt/tasks/bt_comment.h

@@ -1,7 +1,7 @@
 /**
  * bt_comment.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,9 +18,6 @@ class BTComment : public BTTask {
 	GDCLASS(BTComment, BTTask);
 	TASK_CATEGORY(Utility);
 
-protected:
-	static void _bind_methods() {}
-
 public:
 	virtual Ref<BTTask> clone() const override;
 	virtual PackedStringArray get_configuration_warnings() override;

bt/tasks/bt_composite.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_composite.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/bt_composite.h

@@ -1,7 +1,7 @@
 /**
  * bt_composite.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -17,9 +17,6 @@
 class BTComposite : public BTTask {
 	GDCLASS(BTComposite, BTTask);
 
-protected:
-	static void _bind_methods() {}
-
 public:
 	virtual PackedStringArray get_configuration_warnings() override;
 };

bt/tasks/bt_condition.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_condition.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/bt_condition.h

@@ -1,7 +1,7 @@
 /**
  * bt_condition.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -17,9 +17,6 @@
 class BTCondition : public BTTask {
 	GDCLASS(BTCondition, BTTask);
 
-protected:
-	static void _bind_methods() {}
-
 public:
 	virtual PackedStringArray get_configuration_warnings() override;
 };

bt/tasks/bt_decorator.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_decorator.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -18,8 +18,3 @@ PackedStringArray BTDecorator::get_configuration_warnings() {
 	}
 	return warnings;
 }
-
-BT::Status BTDecorator::_tick(double p_delta) {
-	ERR_FAIL_COND_V_MSG(get_child_count() == 0, FAILURE, "BT decorator doesn't have a child.");
-	return get_child(0)->execute(p_delta);
-}

bt/tasks/bt_decorator.h

@@ -1,7 +1,7 @@
 /**
  * bt_decorator.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -17,11 +17,6 @@
 class BTDecorator : public BTTask {
 	GDCLASS(BTDecorator, BTTask)
 
-protected:
-	static void _bind_methods() {}
-
-	virtual Status _tick(double p_delta) override;
-
 public:
 	virtual PackedStringArray get_configuration_warnings() override;
 };

bt/tasks/bt_task.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_task.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -14,7 +14,6 @@
 #include "../../blackboard/blackboard.h"
 #include "../../util/limbo_string_names.h"
 #include "../../util/limbo_utility.h"
-#include "../behavior_tree.h"
 #include "bt_comment.h"
 
 #ifdef LIMBOAI_MODULE
@@ -118,32 +117,31 @@ bool BTTask::is_displayed_collapsed() const {
 }
 
 String BTTask::get_task_name() {
-	if (!data.custom_name.is_empty()) {
-		return data.custom_name;
-	}
-
-	Ref<Script> task_script = get_script();
-
-	if (task_script.is_valid()) {
-		// ! CURSED: Currently, has_method() doesn't return true for ClassDB-registered native virtual methods. This may break in the future.
-		bool has_generate_method = has_method(LW_NAME(_generate_name));
-		ERR_FAIL_COND_V_MSG(has_generate_method && !task_script->is_tool(), _generate_name(), vformat("BTTask: @tool annotation is required if _generate_name is defined: %s", task_script->get_path()));
-		if (task_script->is_tool() && has_generate_method) {
-			String call_result;
-			GDVIRTUAL_CALL(_generate_name, call_result);
-			if (call_result.is_empty() || call_result == "<null>") {
-				// Force reset script instance.
-				set_script(Variant());
-				set_script(task_script);
-				// Retry.
-				GDVIRTUAL_CALL(_generate_name, call_result);
+	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);
 			}
-			ERR_FAIL_COND_V_MSG(call_result.is_empty() || call_result == "<null>", _generate_name(), vformat("BTTask: _generate_name() failed to return a proper name string (%s)", task_script->get_path()));
-			return call_result;
 		}
+		return _generate_name();
+#elif LIMBOAI_GDEXTENSION
+		Ref<Script> task_script = get_script();
+		if (task_script.is_valid() && task_script->is_tool()) {
+			Variant call_result;
+			VCALL_OR_NATIVE_V(_generate_name, Variant, call_result);
+			ERR_FAIL_COND_V(call_result.get_type() == Variant::NIL, _generate_name());
+			String task_name = call_result;
+			ERR_FAIL_COND_V(task_name.is_empty(), _generate_name());
+			return task_name;
+		} else {
+			return _generate_name();
+		}
+#endif
 	}
-
-	return _generate_name();
+	return data.custom_name;
 }
 
 Ref<BTTask> BTTask::get_root() const {
@@ -161,19 +159,16 @@ void BTTask::set_custom_name(const String &p_name) {
 	}
 };
 
-void BTTask::initialize(Node *p_agent, const Ref<Blackboard> &p_blackboard, Node *p_scene_root) {
-	ERR_FAIL_NULL(p_agent);
-	ERR_FAIL_COND(p_blackboard.is_null());
-	ERR_FAIL_NULL(p_scene_root);
+void BTTask::initialize(Node *p_agent, const Ref<Blackboard> &p_blackboard) {
+	ERR_FAIL_COND(p_agent == nullptr);
+	ERR_FAIL_COND(p_blackboard == nullptr);
 	data.agent = p_agent;
 	data.blackboard = p_blackboard;
-	data.scene_root = p_scene_root;
 	for (int i = 0; i < data.children.size(); i++) {
-		get_child(i)->initialize(p_agent, p_blackboard, p_scene_root);
+		get_child(i)->initialize(p_agent, p_blackboard);
 	}
 
-	_setup();
-	GDVIRTUAL_CALL(_setup);
+	VCALL_OR_NATIVE(_setup);
 }
 
 Ref<BTTask> BTTask::clone() const {
@@ -181,47 +176,60 @@ Ref<BTTask> BTTask::clone() const {
 
 	// * Children are duplicated via children property. See _set_children().
 
-	// * Make BBParam properties unique.
-	HashMap<Ref<Resource>, Ref<Resource>> duplicates;
 #ifdef LIMBOAI_MODULE
+	// Make BBParam properties unique.
 	List<PropertyInfo> props;
 	inst->get_property_list(&props);
+	HashMap<Ref<Resource>, Ref<Resource>> duplicates;
 	for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
-		PropertyInfo prop = E->get();
-#elif LIMBOAI_GDEXTENSION
-	TypedArray<Dictionary> props = inst->get_property_list();
-	for (int i = 0; i < props.size(); i++) {
-		PropertyInfo prop = PropertyInfo::from_dict(props[i]);
-#endif
-		if (!(prop.usage & PROPERTY_USAGE_STORAGE)) {
+		if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) {
 			continue;
 		}
 
-		Variant prop_value = inst->get(prop.name);
-		Ref<Resource> res = prop_value;
-		if (res.is_valid() && res->is_class("BBParam")) {
-			// Duplicate BBParam
-			if (!duplicates.has(res)) {
-				duplicates[res] = res->duplicate();
-			}
-			res = duplicates[res];
-			inst->set(prop.name, res);
-		} else if (prop_value.get_type() == Variant::ARRAY) {
-			// Duplicate BBParams instances inside an array.
-			// - This code doesn't handle arrays of arrays.
-			// - A partial workaround for: https://github.com/godotengine/godot/issues/74918
-			// - We actually don't want to duplicate resources in clone() except for BBParam subtypes.
-			Array arr = prop_value;
-			if (arr.is_typed() && ClassDB::is_parent_class(arr.get_typed_class_name(), LW_NAME(BBParam))) {
-				for (int j = 0; j < arr.size(); j++) {
-					Ref<Resource> bb_param = arr[j];
-					if (bb_param.is_valid()) {
-						arr[j] = bb_param->duplicate();
+		Variant v = inst->get(E->get().name);
+
+		if (v.is_ref_counted()) {
+			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(E->get().name, res);
 				}
 			}
 		}
 	}
+#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;
 }
@@ -234,21 +242,16 @@ BT::Status BTTask::execute(double p_delta) {
 				data.children.get(i)->abort();
 			}
 		}
-		// First native, then script.
-		_enter();
-		GDVIRTUAL_CALL(_enter);
+
+		VCALL_OR_NATIVE(_enter);
 	} else {
 		data.elapsed += p_delta;
 	}
 
-	if (!GDVIRTUAL_CALL(_tick, p_delta, data.status)) {
-		data.status = _tick(p_delta);
-	}
+	VCALL_OR_NATIVE_ARGS_V(_tick, Status, data.status, p_delta);
 
 	if (data.status != RUNNING) {
-		// First script, then native.
-		GDVIRTUAL_CALL(_exit);
-		_exit();
+		VCALL_OR_NATIVE(_exit);
 		data.elapsed = 0.0;
 	}
 	return data.status;
@@ -259,9 +262,7 @@ void BTTask::abort() {
 		get_child(i)->abort();
 	}
 	if (data.status == RUNNING) {
-		// First script, then native.
-		GDVIRTUAL_CALL(_exit);
-		_exit();
+		VCALL_OR_NATIVE(_exit);
 	}
 	data.status = FRESH;
 	data.elapsed = 0.0;
@@ -352,7 +353,7 @@ PackedStringArray BTTask::get_configuration_warnings() {
 	PackedStringArray warnings;
 	Ref<Script> task_script = get_script();
 	if (task_script.is_valid() && task_script->is_tool()) {
-		GDVIRTUAL_CALL(_get_configuration_warnings, warnings); // Get script warnings.
+		VCALL_V(_get_configuration_warnings, warnings); // Get script warnings.
 	}
 	ret.append_array(warnings);
 	ret.append_array(_get_configuration_warnings());
@@ -373,32 +374,11 @@ void BTTask::print_tree(int p_initial_tabs) {
 	}
 }
 
-Ref<BehaviorTree> BTTask::editor_get_behavior_tree() {
-#ifdef TOOLS_ENABLED
-	BTTask *task = this;
-	while (task->data.behavior_tree_id.is_null() && task->get_parent().is_valid()) {
-		task = task->data.parent;
-	}
-	return Object::cast_to<BehaviorTree>(ObjectDB::get_instance(task->data.behavior_tree_id));
-#else
-	ERR_PRINT("BTTask::editor_get_behavior_tree: Not available in release builds.");
-	return Ref<BehaviorTree>();
-#endif
-}
-
-#ifdef TOOLS_ENABLED
-
-void BTTask::editor_set_behavior_tree(const Ref<BehaviorTree> &p_bt) {
-	data.behavior_tree_id = p_bt->get_instance_id();
-}
-
-#endif // TOOLS_ENABLED
-
 void BTTask::_bind_methods() {
 	// Public Methods.
 	ClassDB::bind_method(D_METHOD("is_root"), &BTTask::is_root);
 	ClassDB::bind_method(D_METHOD("get_root"), &BTTask::get_root);
-	ClassDB::bind_method(D_METHOD("initialize", "agent", "blackboard", "scene_root"), &BTTask::initialize);
+	ClassDB::bind_method(D_METHOD("initialize", "agent", "blackboard"), &BTTask::initialize);
 	ClassDB::bind_method(D_METHOD("clone"), &BTTask::clone);
 	ClassDB::bind_method(D_METHOD("execute", "delta"), &BTTask::execute);
 	ClassDB::bind_method(D_METHOD("get_child", "idx"), &BTTask::get_child);
@@ -415,12 +395,10 @@ void BTTask::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("print_tree", "initial_tabs"), &BTTask::print_tree, Variant(0));
 	ClassDB::bind_method(D_METHOD("get_task_name"), &BTTask::get_task_name);
 	ClassDB::bind_method(D_METHOD("abort"), &BTTask::abort);
-	ClassDB::bind_method(D_METHOD("editor_get_behavior_tree"), &BTTask::editor_get_behavior_tree);
 
 	// Properties, setters and getters.
 	ClassDB::bind_method(D_METHOD("get_agent"), &BTTask::get_agent);
 	ClassDB::bind_method(D_METHOD("set_agent", "agent"), &BTTask::set_agent);
-	ClassDB::bind_method(D_METHOD("get_scene_root"), &BTTask::get_scene_root);
 	ClassDB::bind_method(D_METHOD("_get_children"), &BTTask::_get_children);
 	ClassDB::bind_method(D_METHOD("_set_children", "children"), &BTTask::_set_children);
 	ClassDB::bind_method(D_METHOD("get_blackboard"), &BTTask::get_blackboard);
@@ -432,18 +410,21 @@ 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, "scene_root", PROPERTY_HINT_NODE_TYPE, "Node", PROPERTY_USAGE_NONE), "", "get_scene_root");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "blackboard", PROPERTY_HINT_RESOURCE_TYPE, "Blackboard", PROPERTY_USAGE_NONE), "", "get_blackboard");
 	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, "delta");
 	GDVIRTUAL_BIND(_generate_name);
 	GDVIRTUAL_BIND(_get_configuration_warnings);
+#elif LIMBOAI_GDEXTENSION
+	// TODO: Registering virtual functions is not available in godot-cpp...
+#endif
 }
 
 BTTask::BTTask() {

bt/tasks/bt_task.h

@@ -1,7 +1,7 @@
 /**
  * bt_task.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -37,14 +37,11 @@
 #ifdef LIMBOAI_GDEXTENSION
 #include <godot_cpp/classes/engine.hpp>
 #include <godot_cpp/classes/resource.hpp>
-#include <godot_cpp/core/gdvirtual.gen.inc>
 #include <godot_cpp/core/object.hpp>
 #include <godot_cpp/templates/vector.hpp>
 using namespace godot;
 #endif // LIMBOAI_GDEXTENSION
 
-class BehaviorTree;
-
 /**
  * Base class for BTTask.
  * Note: In order to properly return Status in the _tick virtual method (GDVIRTUAL1R...)
@@ -78,16 +75,12 @@ private:
 		int index = -1;
 		String custom_name;
 		Node *agent = nullptr;
-		Node *scene_root = nullptr;
 		Ref<Blackboard> blackboard;
 		BTTask *parent = nullptr;
 		Vector<Ref<BTTask>> children;
 		Status status = FRESH;
 		double elapsed = 0.0;
 		bool display_collapsed = false;
-#ifdef TOOLS_ENABLED
-		ObjectID behavior_tree_id;
-#endif
 	} data;
 
 	Array _get_children() const;
@@ -104,16 +97,14 @@ protected:
 	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_warnings);
-
-#ifdef LIMBOAI_GDEXTENSION
-	String _to_string() const { return "<" + get_class() + "#" + itos(get_instance_id()) + ">"; }
-#endif
+#endif // LIMBOAI_MODULE
 
 public:
 	// TODO: GDExtension doesn't have this method hmm...
@@ -125,8 +116,6 @@ public:
 	_FORCE_INLINE_ Node *get_agent() const { return data.agent; }
 	void set_agent(Node *p_agent) { data.agent = p_agent; }
 
-	_FORCE_INLINE_ Node *get_scene_root() const { return data.scene_root; }
-
 	void set_display_collapsed(bool p_display_collapsed);
 	bool is_displayed_collapsed() const;
 
@@ -137,7 +126,7 @@ public:
 	Ref<BTTask> get_root() const;
 
 	virtual Ref<BTTask> clone() const;
-	virtual void initialize(Node *p_agent, const Ref<Blackboard> &p_blackboard, Node *p_scene_root);
+	virtual void initialize(Node *p_agent, const Ref<Blackboard> &p_blackboard);
 	virtual PackedStringArray get_configuration_warnings(); // ! Native version.
 
 	Status execute(double p_delta);
@@ -170,11 +159,6 @@ public:
 
 	void print_tree(int p_initial_tabs = 0);
 
-	Ref<BehaviorTree> editor_get_behavior_tree();
-#ifdef TOOLS_ENABLED
-	void editor_set_behavior_tree(const Ref<BehaviorTree> &p_bt);
-#endif
-
 	BTTask();
 	~BTTask();
 };

bt/tasks/composites/bt_dynamic_selector.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_dynamic_selector.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/composites/bt_dynamic_selector.h

@@ -1,7 +1,7 @@
 /**
  * bt_dynamic_selector.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -22,8 +22,6 @@ private:
 	int last_running_idx = 0;
 
 protected:
-	static void _bind_methods() {}
-
 	virtual void _enter() override;
 	virtual Status _tick(double p_delta) override;
 };

bt/tasks/composites/bt_dynamic_sequence.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_dynamic_sequence.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/composites/bt_dynamic_sequence.h

@@ -1,7 +1,7 @@
 /**
  * bt_dynamic_sequence.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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
@@ -22,8 +22,6 @@ private:
 	int last_running_idx = 0;
 
 protected:
-	static void _bind_methods() {}
-
 	virtual void _enter() override;
 	virtual Status _tick(double p_delta) override;
 };

bt/tasks/composites/bt_parallel.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_parallel.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/composites/bt_parallel.h

@@ -1,7 +1,7 @@
 /**
  * bt_parallel.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/composites/bt_probability_selector.cpp

@@ -1,7 +1,7 @@
 /**
  * bt_probability_selector.cpp
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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

bt/tasks/composites/bt_probability_selector.h

@@ -1,7 +1,7 @@
 /**
  * bt_probability_selector.h
  * =============================================================================
- * Copyright (c) 2023-present Serhii Snitsaruk and the LimboAI contributors.
+ * 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