Upgrade to Godot 4.3 (#59)

Author: TitanNano

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
         arch: ['x86_64', 'aarch64']
         include:
           - platform: linux
-            os: ubuntu-22.04
+            os: ubuntu-24.04
             vendor: unknown
             env: -gnu
             lib: libnative.so
@@ -50,7 +50,7 @@ jobs:
     - name: checkout
       uses: actions/checkout@v4
       with:
-        lfs: true
+        lfs: false
     - name: Set up clang64
       if: contains(matrix.os, 'windows')
       run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
@@ -76,40 +76,43 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
           name: libnative-${{ matrix.platform }}-${{ matrix.arch }}
-          path: native/target/${{ env.TARGET_TRIPLET }}/${{ inputs.release && 'release' || 'debug' }}/${{ matrix.lib }}
+          path: native/target/${{ env.TARGET_TRIPLET }}/${{ inputs.release && 'release' || 'debug' }}/${{ matrix.lib }}
 
   godot-export:
     strategy:
       matrix:
         profile: ['macOS', 'Windows', 'Linux']
-        version: ['4.2.2']
+        version: ['4.3']
         include:
           - profile: 'macOS'
             platform: darwin
             vendor: apple
-            os: macos-14
+            os: macos-15
             x86_64: true
             aarch64: true
             extension: '.dmg'
             lib: libnative.dylib
             template_dir: '$HOME/Library/Application\ Support/Godot/export_templates'
+            godot_artefact: 'macOS.universal'
           - profile: 'Windows'
             platform: windows
             env: '-msvc'
             vendor: pc
-            os: ubuntu-22.04
+            os: ubuntu-24.04
             x86_64: true
             aarch64: true
             extension: '.exe'
             lib: native.dll
             template_dir: '$HOME/.local/share/godot/export_templates'
+            godot_artefact: 'linux.x86_64'
           - profile: 'Linux'
             platform: 'linux'
             env: '-gnu'
             vendor: 'unknown'
-            os: ubuntu-20.04
+            os: ubuntu-24.04
             lib: libnative.so
             template_dir: '$HOME/.local/share/godot/export_templates'
+            godot_artefact: 'linux.x86_64'
             x86_64: true
 
     needs: rust-build
@@ -124,11 +127,23 @@ jobs:
         uses: actions/checkout@v4
         with:
           lfs: true
-      - name: setup Godot
-        uses: lihop/setup-godot@v2
+      - uses: hustcer/setup-nu@main
         with:
-          version: ${{ matrix.version }}
-          export-templates: false
+          version: "0.101.*"
+
+      - name: setup Godot
+        shell: nu {0}
+        run: |
+          let bin_path = "${{ startsWith(matrix.os, 'ubuntu') && format('./Godot_v{0}-stable_linux.x86_64', matrix.version) || './Godot.app/Contents/MacOS/Godot' }}"
+          mkdir .godot_bin
+          http get "https://github.com/godotengine/godot/releases/download/${{ matrix.version }}-stable/Godot_v${{ matrix.version }}-stable_${{ matrix.godot_artefact }}.zip"
+            | save -rf .godot_bin/godot.zip
+          cd .godot_bin
+          unzip godot.zip
+          chmod +x $bin_path
+          ln -s $bin_path "./godot"
+          ls -a
+
       - name: download Godot export template
         run: |
           mkdir -p ${{ matrix.template_dir }}/${{ matrix.version }}.stable
@@ -158,47 +173,52 @@ jobs:
         run: |
           platform_dir="${{ matrix.vendor }}-${{ matrix.platform }}"
           mkdir -p native/target/universal-$platform_dir/debug/
-          lipo -create native/target/x86_64-$platform_dir/debug/${{ matrix.lib }} native/target/aarch64-$platform_dir/debug/${{ matrix.lib }} -output native/target/universal-$platform_dir/debug/${{ matrix.lib }}
+          lipo -create native/target/x86_64-$platform_dir/debug/${{ matrix.lib }} native/target/aarch64-$platform_dir/debug/${{ matrix.lib }} -output native/target/universal-$platform_dir/debug/${{ matrix.lib }}
       - name: copy libs
+        shell: nu {0}
         run: |
-          set -x
-          platform_dir="${{ matrix.vendor }}-${{ matrix.platform }}${{ matrix.env }}"
-          x86_64="native/target/x86_64-$platform_dir"
-          aarch64="native/target/aarch64-$platform_dir"
-          universal="native/target/universal-$platform_dir"
+          let platform_dir = "${{ matrix.vendor }}-${{ matrix.platform }}${{ matrix.env }}"
+          let x86_64 = $"native/target/x86_64-($platform_dir)"
+          let aarch64 = $"native/target/aarch64-($platform_dir)"
+          let universal = $"native/target/universal-($platform_dir)"
           
-          if [[ -d "$x86_64/debug/" ]]; then
-            mkdir -p "$x86_64/release/"
-            cp $x86_64/debug/* "$x86_64/release/"
-          fi
+          if ($"($x86_64)/debug/" | path type) == "dir" {
+            mkdir $"($x86_64)/release/"
+            cp -v ($"($x86_64)/debug/*" | into glob) $"($x86_64)/release/"
+          }
 
-          if [[ -d "$aarch64/debug/" ]]; then 
-            mkdir -p "$aarch64/release/"
-            cp $aarch64/debug/* "$aarch64/release/"
-          fi
+          if ($"($aarch64)/debug/" | path type) == "dir" {
+            mkdir $"($aarch64)/release/"
+            cp -v ($"($aarch64)/debug/*" | into glob) $"($aarch64)/release/"
+          }
 
-          if [[ -d "$universal/debug/" ]]; then
-            mkdir -p "$universal/release/"
-            cp $universal/debug/* "$universal/release/"
-          fi
+          if ($"($universal)/debug/" | path type) == "dir" {
+            mkdir $"($universal)/release/"
+            cp -v ($"($universal)/debug/*" | into glob) $"($universal)/release/"
+          }
       - name: import godot project
+        shell: nu {0}
         run: |
-          # import assets
-          .github/build_godot_cache.sh
-          # restart to make sure all rust scripts are detected
-          .github/build_godot_cache.sh
+          $env.PATH = $env.PATH | append ("./.godot_bin" | path expand)
+
+          godot --headless --verbose --import
+
       - name: export-debug
+        shell: nu {0}
         if: ${{ !inputs.release }}
         run: |
-          mkdir -p "${{ env.EXPORT_DIR }}"
-          godot --headless --export-debug ${{ env.EXPORT_ARGS }}
-          test $(ls -al "${{ env.EXPORT_DIR }}" | wc -l) -gt 1
+          $env.PATH = $env.PATH | append ("./.godot_bin" | path expand)
+          mkdir "${{ env.EXPORT_DIR }}"
+          godot --headless --verbose --export-debug ${{ env.EXPORT_ARGS }}
+          if (ls -a "${{ env.EXPORT_DIR }}" | length) < 1 { exit 1 }
       - name: export-release
+        shell: nu {0}
         if: inputs.release
         run: |
-          mkdir -p "${{ env.EXPORT_DIR }}"
+          $env.PATH = $env.PATH | append ("./.godot_bin" | path expand)
+          mkdir "${{ env.EXPORT_DIR }}"
           godot --headless --export-release ${{ env.EXPORT_ARGS }}
-          test $(ls -al "${{ env.EXPORT_DIR }}" | wc -l) -gt 1
+          if (ls -a "${{ env.EXPORT_DIR }}" | length) < 1 { exit 1 }
       - name: describe revision
         id: describe
         run: echo "ref=$(git describe --tags --always)" >> $GITHUB_OUTPUT

README.md

@@ -81,7 +81,7 @@ The game uses SimCity 2000 city files to generate its maps. The original city fi
   - Military Missions
 
 ## Building From Source
-The game is built with the [Godot Game Engine 4.2.2](https://github.com/godotengine/godot/tree/4.2.2-stable) and new builds can be exported with the engines own editor. The game relies on a GDNative module written in Rust. The native module has to be built from source before it can be used by the engine. See the [`/native` directory](./native) for detailed instructions.
+The game is built with the [Godot Game Engine 4.3](https://github.com/godotengine/godot/tree/4.3-stable) and new builds can be exported with the engines own editor. The game relies on a GDExtension module written in Rust. The native module has to be built from source before it can be used by the engine. See the [`/native` directory](./native) for detailed instructions.
 
 ## Contributing
 Pull Requests should always reference existing issues. Please do not submit PRs which have no related issue. To suggest new features, not listed above, or discuss current features / implementations, please use the discussions Section of the repository.

addons/customization/VersionLocking.gd

@@ -17,7 +17,7 @@ static func verify(editor: EditorInterface) -> void:
 	var version_parts := desired_version.split(".")
 	var major := int(version_parts[0])
 	var minor := int(version_parts[1])
-	var patch := int(version_parts[2])
+	var patch := int(version_parts[2] if version_parts.size() >= 3 else 0)
 
 	if major != engine_version.major || minor != engine_version.minor || engine_version.patch != patch:
 		var dialog_scene: PackedScene = load("res://addons/customization/force_quit_control/force_quit_control.tscn")

addons/visual_shader_node_library/examples/3D/textures/flowmap.png.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://0mpah4qrs7h4"
 path.s3tc="res://.godot/imported/flowmap.png-6bcf6f060abcefafe77d0b4b6b27c416.s3tc.ctex"
+path.etc2="res://.godot/imported/flowmap.png-6bcf6f060abcefafe77d0b4b6b27c416.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://addons/visual_shader_node_library/examples/3D/textures/flowmap.png"
-dest_files=["res://.godot/imported/flowmap.png-6bcf6f060abcefafe77d0b4b6b27c416.s3tc.ctex"]
+dest_files=["res://.godot/imported/flowmap.png-6bcf6f060abcefafe77d0b4b6b27c416.s3tc.ctex", "res://.godot/imported/flowmap.png-6bcf6f060abcefafe77d0b4b6b27c416.etc2.ctex"]
 
 [params]
 

addons/visual_shader_node_library/examples/3D/textures/rock_metal.jpg.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://dmhjpggfx1f28"
 path.s3tc="res://.godot/imported/rock_metal.jpg-72b17caa044e4bb9f0c5297808773c01.s3tc.ctex"
+path.etc2="res://.godot/imported/rock_metal.jpg-72b17caa044e4bb9f0c5297808773c01.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://addons/visual_shader_node_library/examples/3D/textures/rock_metal.jpg"
-dest_files=["res://.godot/imported/rock_metal.jpg-72b17caa044e4bb9f0c5297808773c01.s3tc.ctex"]
+dest_files=["res://.godot/imported/rock_metal.jpg-72b17caa044e4bb9f0c5297808773c01.s3tc.ctex", "res://.godot/imported/rock_metal.jpg-72b17caa044e4bb9f0c5297808773c01.etc2.ctex"]
 
 [params]
 

addons/visual_shader_node_library/examples/3D/textures/texture_rock_albedo.png.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://blr0ftfqa3fcr"
 path.s3tc="res://.godot/imported/texture_rock_albedo.png-12c53c5a753bd43dbbabd1f980ca1743.s3tc.ctex"
+path.etc2="res://.godot/imported/texture_rock_albedo.png-12c53c5a753bd43dbbabd1f980ca1743.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://addons/visual_shader_node_library/examples/3D/textures/texture_rock_albedo.png"
-dest_files=["res://.godot/imported/texture_rock_albedo.png-12c53c5a753bd43dbbabd1f980ca1743.s3tc.ctex"]
+dest_files=["res://.godot/imported/texture_rock_albedo.png-12c53c5a753bd43dbbabd1f980ca1743.s3tc.ctex", "res://.godot/imported/texture_rock_albedo.png-12c53c5a753bd43dbbabd1f980ca1743.etc2.ctex"]
 
 [params]
 

addons/visual_shader_node_library/examples/3D/textures/texture_rock_ao.png.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://cp8kfxbjcty8s"
 path.s3tc="res://.godot/imported/texture_rock_ao.png-61fb5b8e003b85d4277182e1db6ac804.s3tc.ctex"
+path.etc2="res://.godot/imported/texture_rock_ao.png-61fb5b8e003b85d4277182e1db6ac804.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://addons/visual_shader_node_library/examples/3D/textures/texture_rock_ao.png"
-dest_files=["res://.godot/imported/texture_rock_ao.png-61fb5b8e003b85d4277182e1db6ac804.s3tc.ctex"]
+dest_files=["res://.godot/imported/texture_rock_ao.png-61fb5b8e003b85d4277182e1db6ac804.s3tc.ctex", "res://.godot/imported/texture_rock_ao.png-61fb5b8e003b85d4277182e1db6ac804.etc2.ctex"]
 
 [params]
 

addons/visual_shader_node_library/examples/3D/textures/texture_rock_depth.png.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://dw6a7lv1roiks"
 path.s3tc="res://.godot/imported/texture_rock_depth.png-a47e356d82f517a80fd29b17176823ce.s3tc.ctex"
+path.etc2="res://.godot/imported/texture_rock_depth.png-a47e356d82f517a80fd29b17176823ce.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://addons/visual_shader_node_library/examples/3D/textures/texture_rock_depth.png"
-dest_files=["res://.godot/imported/texture_rock_depth.png-a47e356d82f517a80fd29b17176823ce.s3tc.ctex"]
+dest_files=["res://.godot/imported/texture_rock_depth.png-a47e356d82f517a80fd29b17176823ce.s3tc.ctex", "res://.godot/imported/texture_rock_depth.png-a47e356d82f517a80fd29b17176823ce.etc2.ctex"]
 
 [params]
 

addons/visual_shader_node_library/examples/3D/textures/texture_rock_metal.png.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://d1jp505optmfd"
 path.s3tc="res://.godot/imported/texture_rock_metal.png-c46fc417e11885c57aff7b8230ab1a0d.s3tc.ctex"
+path.etc2="res://.godot/imported/texture_rock_metal.png-c46fc417e11885c57aff7b8230ab1a0d.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://addons/visual_shader_node_library/examples/3D/textures/texture_rock_metal.png"
-dest_files=["res://.godot/imported/texture_rock_metal.png-c46fc417e11885c57aff7b8230ab1a0d.s3tc.ctex"]
+dest_files=["res://.godot/imported/texture_rock_metal.png-c46fc417e11885c57aff7b8230ab1a0d.s3tc.ctex", "res://.godot/imported/texture_rock_metal.png-c46fc417e11885c57aff7b8230ab1a0d.etc2.ctex"]
 
 [params]
 

addons/visual_shader_node_library/examples/3D/textures/texture_rock_normal.png.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://c6dkhyueg08le"
 path.s3tc="res://.godot/imported/texture_rock_normal.png-81551471a260ea195a853a6e744ac09b.s3tc.ctex"
+path.etc2="res://.godot/imported/texture_rock_normal.png-81551471a260ea195a853a6e744ac09b.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://addons/visual_shader_node_library/examples/3D/textures/texture_rock_normal.png"
-dest_files=["res://.godot/imported/texture_rock_normal.png-81551471a260ea195a853a6e744ac09b.s3tc.ctex"]
+dest_files=["res://.godot/imported/texture_rock_normal.png-81551471a260ea195a853a6e744ac09b.s3tc.ctex", "res://.godot/imported/texture_rock_normal.png-81551471a260ea195a853a6e744ac09b.etc2.ctex"]
 
 [params]
 

addons/visual_shader_node_library/nodes.png.import

@@ -4,15 +4,16 @@ importer="texture"
 type="CompressedTexture2D"
 uid="uid://djuhl2rh8l5y4"
 path.s3tc="res://.godot/imported/nodes.png-b8a42e6fa174205402b0f3d54047cfe9.s3tc.ctex"
+path.etc2="res://.godot/imported/nodes.png-b8a42e6fa174205402b0f3d54047cfe9.etc2.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 
 [deps]
 
 source_file="res://addons/visual_shader_node_library/nodes.png"
-dest_files=["res://.godot/imported/nodes.png-b8a42e6fa174205402b0f3d54047cfe9.s3tc.ctex"]
+dest_files=["res://.godot/imported/nodes.png-b8a42e6fa174205402b0f3d54047cfe9.s3tc.ctex", "res://.godot/imported/nodes.png-b8a42e6fa174205402b0f3d54047cfe9.etc2.ctex"]
 
 [params]
 

native/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-godot = { version = "0.2.2", features = ["experimental-threads", "api-4-2"] }
+godot = { version = "0.2.2", features = ["experimental-threads", "api-4-3"] }
 godot-rust-script = { git = "https://github.com/titannano/godot-rust-script", rev = "46b151f558370c260fa1e79502637f128ea7bb7f" }
 lerp = "0.4.0"
 backtrace = "0.3.64"