Upgrade to Godot 4.4

CIConfiguration.yml

@@ -2,15 +2,15 @@ version: 1
 
 jobs:
   build:
-    image: thrive/godot-ci:v26
+    image: thrive/godot-ci:v27
     cache:
       loadFrom:
-        - v11-{Branch}-build
-        - v11-master-build
-      writeTo: v11-{Branch}-build
+        - v12-{Branch}-build
+        - v12-master-build
+      writeTo: v12-{Branch}-build
       shared:
         .git/lfs: v7-lfs
-        .import: v12-import
+        .import: v13-import
         builds: v7-builds
         native_libs: v1-native
       system:
@@ -28,15 +28,19 @@ jobs:
       - run:
           name: Download native libraries
           # This doesn't fetch or install debug variants as they aren't strictly necessary for packaging
-          command: dotnet run --project Scripts -- native Fetch --debug false
-      - run:
-          name: Create builds
-          command: dotnet run --project Scripts -- package --dehydrated
-      - run:
-          name: Upload devbuilds
-          command: dotnet run --project Scripts -- upload
+          command: dotnet run --project Scripts -- native Fetch Install --debug false
+      # BUILD DISABLED FOR NOW AS GODOT 4.4 SEEMS TO GET STUCK IMPORTING FONTS
+      #- run:
+      #    name: Create build (Linux)
+      #    command: dotnet run --project Scripts -- package --dehydrated Linux
+      #- run:
+      #    name: Create build (Windows)
+      #    command: dotnet run --project Scripts -- package --dehydrated Windows
+      #- run:
+      #    name: Upload devbuilds
+      #    command: dotnet run --project Scripts -- upload
   jetbrains:
-    image: thrive/godot-ci:v26
+    image: thrive/godot-ci:v27
     cache:
       loadFrom:
         - v9-{Branch}-jetbrains
@@ -93,7 +97,7 @@ jobs:
                 rm -f cleanup_diff.patch
             fi
   format_test:
-    image: thrive/godot-ci:v26
+    image: thrive/godot-ci:v27
     cache:
       loadFrom:
         - v9-{Branch}-format

Scripts/BuildInfoWriter.cs.uid

@@ -0,0 +1 @@
+uid://2w88cwcgrv0w

Scripts/CSharpTranslationExtractor.cs.uid

@@ -0,0 +1 @@
+uid://bdth57bql2mv7

Scripts/Cleanup.cs.uid

@@ -0,0 +1 @@
+uid://7clmvvfs56xy

Scripts/CodeChecks.cs.uid

@@ -0,0 +1 @@
+uid://cdu8cqny2gx2h

Scripts/ContainerTool.cs.uid

@@ -0,0 +1 @@
+uid://jtovr6afllyn

Scripts/CreditsUpdater.cs.uid

@@ -0,0 +1 @@
+uid://cvjey73cphvr2

Scripts/DehydratedInfo.cs.uid

@@ -0,0 +1 @@
+uid://3hfkr78hyi2x

Scripts/Dehydration.cs.uid

@@ -0,0 +1 @@
+uid://c1bngo05haxjg

Scripts/FileGenerator.cs.uid

@@ -0,0 +1 @@
+uid://dtfttfdlw0n8l

Scripts/FileTypeToGenerate.cs.uid

@@ -0,0 +1 @@
+uid://b0hjhhtdoncqo

Scripts/GodotProjectCompiler.cs.uid

@@ -0,0 +1 @@
+uid://c1nmh6dhok4vo

Scripts/GodotProjectValidMaker.cs.uid

@@ -0,0 +1 @@
+uid://cx8dbnjd4pvht

Scripts/GodotSceneTranslationExtractor.cs.uid

@@ -0,0 +1 @@
+uid://c8gjet5a3bsn8

Scripts/GodotTemplateInstaller.cs.uid

@@ -0,0 +1 @@
+uid://xx3nsh14s6lu

Scripts/GodotVersion.cs

@@ -5,7 +5,7 @@ public class GodotVersion
     /// <summary>
     ///   The Godot version we use. UPDATE THIS IF WE UPDATE THE GODOT VERSION
     /// </summary>
-    public const string GODOT_VERSION = "4.3";
+    public const string GODOT_VERSION = "4.4";
 
     /// <summary>
     ///   The full name of the version. Don't edit this!

Scripts/GodotVersion.cs.uid

@@ -0,0 +1 @@
+uid://bdyiq5bdvkq83

Scripts/HtmlReader.cs.uid

@@ -0,0 +1 @@
+uid://dpptpry30psu3

Scripts/ImageType.cs.uid

@@ -0,0 +1 @@
+uid://dg1h0k3phuafa

Scripts/JsonTranslationExtractor.cs.uid

@@ -0,0 +1 @@
+uid://bq0h6xftp13b5

Scripts/LocalizationCheck.cs.uid

@@ -0,0 +1 @@
+uid://bjq6jaeutj0us

Scripts/LocalizationUpdate.cs.uid

@@ -0,0 +1 @@
+uid://cvgrlb72444qx

Scripts/NativeLibs.cs.uid

@@ -0,0 +1 @@
+uid://cwyeev77rgjw

Scripts/PackageTool.cs.uid

@@ -0,0 +1 @@
+uid://ddmaxrk1bquyd

Scripts/Program.cs.uid

@@ -0,0 +1 @@
+uid://ctthbtgs1gnfj

Scripts/SteamBuild.cs.uid

@@ -0,0 +1 @@
+uid://da1knpppgxif0

Scripts/SteamBuildCheck.cs.uid

@@ -0,0 +1 @@
+uid://b0xbgdget6f4i

Scripts/TranslationProgressTool.cs.uid

@@ -0,0 +1 @@
+uid://cn6k7t5ghcayc

Scripts/Uploader.cs.uid

@@ -0,0 +1 @@
+uid://6wrsc5x8n3ho

Scripts/WikiUpdater.cs.uid

@@ -0,0 +1 @@
+uid://ytmbubqxqihc

Thrive.csproj

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Godot.NET.Sdk/4.3.0">
+<Project Sdk="Godot.NET.Sdk/4.4.0">
   <PropertyGroup>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <TargetFramework>net9.0</TargetFramework>
-    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
+    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net8.0</TargetFramework>
     <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <Company>Revolutionary Games Studio</Company>
-    <Version>0.8.1.1</Version>
-    <!--<InformationalVersion>-rc1</InformationalVersion>-->
+    <Version>0.8.2.0</Version>
+    <InformationalVersion>-alpha</InformationalVersion>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
   <!-- Ignore the subproject source files -->

ThriveScriptsShared/BuildInfo.cs.uid

@@ -0,0 +1 @@
+uid://dkav330xvgxv5

ThriveScriptsShared/EmbeddedThriveIcon.cs.uid

@@ -0,0 +1 @@
+uid://cbmgfvioityn4

ThriveScriptsShared/GameWiki.cs.uid

@@ -0,0 +1 @@
+uid://bhxh82ov7edx8

ThriveScriptsShared/IRegistryAssignable.cs.uid

@@ -0,0 +1 @@
+uid://bvup1u4vf7exd

ThriveScriptsShared/IRegistryType.cs.uid

@@ -0,0 +1 @@
+uid://dv1tjgkpxcyxs

ThriveScriptsShared/InvalidRegistryDataException.cs.uid

@@ -0,0 +1 @@
+uid://dprpnmwrq5540

ThriveScriptsShared/Stage.cs.uid

@@ -0,0 +1 @@
+uid://dpmahu6wwh11

ThriveScriptsShared/ThriveScriptConstants.cs.uid

@@ -0,0 +1 @@
+uid://dxi17nwyht5n1

ThriveScriptsShared/TranslationsInfo.cs.uid

@@ -0,0 +1 @@
+uid://wlxmj324ugxa

ThriveScriptsShared/VersionPatchNotes.cs.uid

@@ -0,0 +1 @@
+uid://dtbw7r361b0rd

addons/gdUnit4/plugin.cfg

@@ -3,5 +3,5 @@
 name="gdUnit4"
 description="Unit Testing Framework for Godot Scripts"
 author="Mike Schulze"
-version="4.5.0"
+version="5.0.0"
 script="plugin.gd"

addons/gdUnit4/plugin.gd

@@ -1,31 +1,35 @@
 @tool
 extends EditorPlugin
 
-const GdUnitTools := preload("res://addons/gdUnit4/src/core/GdUnitTools.gd")
-const GdUnitTestDiscoverGuard := preload("res://addons/gdUnit4/src/core/discovery/GdUnitTestDiscoverGuard.gd")
-const GdUnitConsole := preload("res://addons/gdUnit4/src/ui/GdUnitConsole.gd")
-
+# We need to define manually the slot id's, to be downwards compatible
+const CONTEXT_SLOT_FILESYSTEM = 1 # EditorContextMenuPlugin.CONTEXT_SLOT_FILESYSTEM
+const CONTEXT_SLOT_SCRIPT_EDITOR = 2 # EditorContextMenuPlugin.CONTEXT_SLOT_SCRIPT_EDITOR
 
 var _gd_inspector: Control
-var _gd_console: GdUnitConsole
+var _gd_console: Control
+var _gd_filesystem_context_menu: Variant
+var _gd_scripteditor_context_menu: Variant
 var _guard: GdUnitTestDiscoverGuard
 
 
 func _enter_tree() -> void:
 	if check_running_in_test_env():
 		@warning_ignore("return_value_discarded")
-		CmdConsole.new().prints_warning("It was recognized that GdUnit4 is running in a test environment, therefore the GdUnit4 plugin will not be executed!")
+		GdUnitCSIMessageWriter.new().prints_warning("It was recognized that GdUnit4 is running in a test environment, therefore the GdUnit4 plugin will not be executed!")
 		return
-	if Engine.get_version_info().hex < 0x40200:
-		prints("GdUnit4 plugin requires a minimum of Godot 4.2.x Version!")
+
+	if Engine.get_version_info().hex < 0x40300:
+		prints("The GdUnit4 plugin requires Godot version 4.3 or higher to run.")
 		return
 	GdUnitSettings.setup()
 	# Install the GdUnit Inspector
 	_gd_inspector = (load("res://addons/gdUnit4/src/ui/GdUnitInspector.tscn") as PackedScene).instantiate()
+	_add_context_menus()
 	add_control_to_dock(EditorPlugin.DOCK_SLOT_LEFT_UR, _gd_inspector)
 	# Install the GdUnit Console
 	_gd_console = (load("res://addons/gdUnit4/src/ui/GdUnitConsole.tscn") as PackedScene).instantiate()
 	var control := add_control_to_bottom_panel(_gd_console, "gdUnitConsole")
+	@warning_ignore("unsafe_method_access")
 	await _gd_console.setup_update_notification(control)
 	if GdUnit4CSharpApiLoader.is_mono_supported():
 		prints("GdUnit4Net version '%s' loaded." % GdUnit4CSharpApiLoader.version())
@@ -42,10 +46,13 @@ func _exit_tree() -> void:
 	if is_instance_valid(_gd_inspector):
 		remove_control_from_docks(_gd_inspector)
 		_gd_inspector.free()
+	_remove_context_menus()
 	if is_instance_valid(_gd_console):
 		remove_control_from_bottom_panel(_gd_console)
 		_gd_console.free()
-	GdUnitTools.dispose_all(true)
+	var gdUnitTools := load("res://addons/gdUnit4/src/core/GdUnitTools.gd")
+	@warning_ignore("unsafe_method_access")
+	gdUnitTools.dispose_all(true)
 	prints("Unload GdUnit4 Plugin success")
 
 
@@ -55,6 +62,38 @@ func check_running_in_test_env() -> bool:
 	return DisplayServer.get_name() == "headless" or args.has("--selftest") or args.has("--add") or args.has("-a") or args.has("--quit-after") or args.has("--import")
 
 
+func _add_context_menus() -> void:
+	if Engine.get_version_info().hex >= 0x40400:
+		# With Godot 4.4 we have to use the 'add_context_menu_plugin' to register editor context menus
+		_gd_filesystem_context_menu = _create_context_menu("res://addons/gdUnit4/src/ui/menu/EditorFileSystemContextMenuHandlerV44.gdx")
+		call_deferred("add_context_menu_plugin", CONTEXT_SLOT_FILESYSTEM, _gd_filesystem_context_menu)
+		# the CONTEXT_SLOT_SCRIPT_EDITOR is adding to the script panel instead of script editor see https://github.com/godotengine/godot/pull/100556
+		#_gd_scripteditor_context_menu = _preload("res://addons/gdUnit4/src/ui/menu/ScriptEditorContextMenuHandlerV44.gdx")
+		#call_deferred("add_context_menu_plugin", CONTEXT_SLOT_SCRIPT_EDITOR, _gd_scripteditor_context_menu)
+		# so we use the old hacky way to add the context menu
+		_gd_inspector.add_child(preload("res://addons/gdUnit4/src/ui/menu/ScriptEditorContextMenuHandler.gd").new())
+	else:
+		# TODO Delete it if the minimum requirement for the plugin is set to Godot 4.4.
+		_gd_inspector.add_child(preload("res://addons/gdUnit4/src/ui/menu/EditorFileSystemContextMenuHandler.gd").new())
+		_gd_inspector.add_child(preload("res://addons/gdUnit4/src/ui/menu/ScriptEditorContextMenuHandler.gd").new())
+
+
+func _remove_context_menus() -> void:
+	if is_instance_valid(_gd_filesystem_context_menu):
+		call_deferred("remove_context_menu_plugin", _gd_filesystem_context_menu)
+	if is_instance_valid(_gd_scripteditor_context_menu):
+		call_deferred("remove_context_menu_plugin", _gd_scripteditor_context_menu)
+
+
+func _create_context_menu(script_path: String) -> Variant:
+	var context_menu_script := GDScript.new()
+	context_menu_script.source_code = FileAccess.get_file_as_string(script_path)
+	var err := context_menu_script.reload(true)
+	if err != OK:
+		push_error("Can't create context menu %s, error: %s" % [script_path, error_string(err)])
+	return context_menu_script.new()
+
+
 func _on_resource_saved(resource: Resource) -> void:
 	if resource is Script:
 		await _guard.discover(resource as Script)

addons/gdUnit4/plugin.gd.uid

@@ -0,0 +1 @@
+uid://datb6vterv2uj

addons/gdUnit4/src/Comparator.gd.uid

@@ -0,0 +1 @@
+uid://bgdyec75cc62x

addons/gdUnit4/src/Fuzzers.gd.uid

@@ -0,0 +1 @@
+uid://dju8uolt7ybyd

addons/gdUnit4/src/GdUnitArrayAssert.gd.uid

@@ -0,0 +1 @@
+uid://ckifogv3dwmdb

addons/gdUnit4/src/GdUnitAssert.gd.uid

@@ -0,0 +1 @@
+uid://dfh4xrbgqy1ib

addons/gdUnit4/src/GdUnitAwaiter.gd.uid

@@ -0,0 +1 @@
+uid://dlnupbqh3awem

addons/gdUnit4/src/GdUnitBoolAssert.gd.uid

@@ -0,0 +1 @@
+uid://m77m6cgwbc0v

addons/gdUnit4/src/GdUnitConstants.gd.uid

@@ -0,0 +1 @@
+uid://bo1o3ccpw2qj7

addons/gdUnit4/src/GdUnitDictionaryAssert.gd.uid

@@ -0,0 +1 @@
+uid://e5qxgie5ggqt

addons/gdUnit4/src/GdUnitFailureAssert.gd.uid

@@ -0,0 +1 @@
+uid://ca8tpof5rbhpb

addons/gdUnit4/src/GdUnitFileAssert.gd.uid

@@ -0,0 +1 @@
+uid://r78rv34plpim

addons/gdUnit4/src/GdUnitFloatAssert.gd.uid

@@ -0,0 +1 @@
+uid://uywenhvudrtg

addons/gdUnit4/src/GdUnitFuncAssert.gd.uid

@@ -0,0 +1 @@
+uid://cgx51k5beshjx

addons/gdUnit4/src/GdUnitGodotErrorAssert.gd.uid

@@ -0,0 +1 @@
+uid://cpatrn6pkald0

addons/gdUnit4/src/GdUnitIntAssert.gd.uid

@@ -0,0 +1 @@
+uid://hjf2ppyjyvjg

addons/gdUnit4/src/GdUnitObjectAssert.gd

@@ -3,47 +3,59 @@ class_name GdUnitObjectAssert
 extends GdUnitAssert
 
 
-## Verifies that the current value is equal to expected one.
+## Verifies that the current object is equal to expected one.
 @warning_ignore("unused_parameter")
-func is_equal(expected :Variant) -> GdUnitObjectAssert:
+func is_equal(expected: Variant) -> GdUnitObjectAssert:
 	return self
 
 
-## Verifies that the current value is not equal to expected one.
+## Verifies that the current object is not equal to expected one.
 @warning_ignore("unused_parameter")
-func is_not_equal(expected :Variant) -> GdUnitObjectAssert:
+func is_not_equal(expected: Variant) -> GdUnitObjectAssert:
 	return self
 
 
-## Verifies that the current value is null.
+## Verifies that the current object is null.
 func is_null() -> GdUnitObjectAssert:
 	return self
 
 
-## Verifies that the current value is not null.
+## Verifies that the current object is not null.
 func is_not_null() -> GdUnitObjectAssert:
 	return self
 
 
-## Verifies that the current value is the same as the given one.
+## Verifies that the current object is the same as the given one.
 @warning_ignore("unused_parameter", "shadowed_global_identifier")
-func is_same(expected :Variant) -> GdUnitObjectAssert:
+func is_same(expected: Variant) -> GdUnitObjectAssert:
 	return self
 
 
-## Verifies that the current value is not the same as the given one.
+## Verifies that the current object is not the same as the given one.
 @warning_ignore("unused_parameter")
-func is_not_same(expected :Variant) -> GdUnitObjectAssert:
+func is_not_same(expected: Variant) -> GdUnitObjectAssert:
 	return self
 
 
-## Verifies that the current value is an instance of the given type.
+## Verifies that the current object is an instance of the given type.
 @warning_ignore("unused_parameter")
-func is_instanceof(expected :Object) -> GdUnitObjectAssert:
+func is_instanceof(type: Variant) -> GdUnitObjectAssert:
 	return self
 
 
-## Verifies that the current value is not an instance of the given type.
+## Verifies that the current object is not an instance of the given type.
 @warning_ignore("unused_parameter")
-func is_not_instanceof(expected :Variant) -> GdUnitObjectAssert:
+func is_not_instanceof(type: Variant) -> GdUnitObjectAssert:
+	return self
+
+
+## Checks whether the current object inherits from the specified type.
+@warning_ignore("unused_parameter")
+func is_inheriting(type: Variant) -> GdUnitObjectAssert:
+	return self
+
+
+## Checks whether the current object does NOT inherit from the specified type.
+@warning_ignore("unused_parameter")
+func is_not_inheriting(type: Variant) -> GdUnitObjectAssert:
 	return self

addons/gdUnit4/src/GdUnitObjectAssert.gd.uid

@@ -0,0 +1 @@
+uid://bng0ubwtscofm

addons/gdUnit4/src/GdUnitResultAssert.gd.uid

@@ -0,0 +1 @@
+uid://bgbjdwqs0ghvf

addons/gdUnit4/src/GdUnitSceneRunner.gd.uid

@@ -0,0 +1 @@
+uid://d1wwaw1vq0vms

addons/gdUnit4/src/GdUnitSignalAssert.gd.uid

@@ -0,0 +1 @@
+uid://dl4mu5dswhvhg

addons/gdUnit4/src/GdUnitStringAssert.gd.uid

@@ -0,0 +1 @@
+uid://14jpidv2ulh7

addons/gdUnit4/src/GdUnitTestSuite.gd

@@ -54,7 +54,7 @@ func __gdunit_argument_matchers() -> GDScript:
 
 
 func __gdunit_object_interactions() -> GDScript:
-	return __lazy_load("res://addons/gdUnit4/src/core/GdUnitObjectInteractions.gd")
+	return __lazy_load("res://addons/gdUnit4/src/doubler/GdUnitObjectInteractions.gd")
 
 
 ## This function is called before a test suite starts[br]

addons/gdUnit4/src/GdUnitTestSuite.gd.uid

@@ -0,0 +1 @@
+uid://c1yyw2fh8nymj

addons/gdUnit4/src/GdUnitTuple.gd.uid

@@ -0,0 +1 @@
+uid://dafxpkvx0y405