Godot 4.2 / .net6 port

addons/quentincaffeino/array-utils/src/Collection.gd

@@ -195,7 +195,7 @@ func fill(value = null, startIndex = 0, length = null):
 # @returns  Collection
 func map(callback):
 	for key in self:
-		self._collection[key] = callback.call([self._collection[key], key, self._collection])
+		self._collection[key] = callback.invoke_call([self._collection[key], key, self._collection])
 
 	self.first()
 	return self
@@ -214,7 +214,7 @@ func filter(callback = null):
 			var key = new_collection.get_keys()[i]
 			var value = new_collection.get(key)
 
-			call = callback.call([key, value, i, new_collection])
+			call = callback.invoke_call([key, value, i, new_collection])
 
 			if !call:
 				new_collection.remove_by_index(i)

addons/quentincaffeino/callback/README.md

@@ -22,13 +22,13 @@ func _ready():  # void
 	var func_cb = CallbackBuilder.new(self).set_name("callable_function").build()
 	var funcref_cb = CallbackBuilder.new(funcref(self, "callable_function")).build()
 
-	print(prop_cb.call())  # Prints: Hello world!
+	print(prop_cb.invoke_call())  # Prints: Hello world!
 
-	print(func_cb.call(["Hello, sam!"]))  # Prints: [Reference...]
-	print(prop_cb.call())  # Prints: Hello, sam!
+	print(func_cb.invoke_call(["Hello, sam!"]))  # Prints: [Reference...]
+	print(prop_cb.invoke_call())  # Prints: Hello, sam!
 
-	print(funcref_cb.call(["Hello, peter!"]))  # Prints: [Reference...]
-	print(prop_cb.call())  # Prints: Hello, peter!
+	print(funcref_cb.invoke_call(["Hello, peter!"]))  # Prints: [Reference...]
+	print(prop_cb.invoke_call())  # Prints: Hello, peter!
 ```
 
 ## License

addons/quentincaffeino/callback/src/AbstractCallback.gd

@@ -48,7 +48,7 @@ func bind(argv = []):
 
 # @param  Variant[]  argv
 # @returns  Variant
-func call(argv = []):
+func invoke_call(argv = []):
 	pass
 
 

addons/quentincaffeino/callback/src/FuncRefCallback.gd → addons/quentincaffeino/callback/src/CallableCallback.gd

@@ -1,8 +1,8 @@
-
+# Wraps a Callable inside a Callback instance
 extends "./AbstractCallback.gd"
 
 
-# @param  FuncRef  target
+# @param  Callable  target
 func _init(target):
 	super(target, Utils.Type.METHOD)
 
@@ -15,11 +15,11 @@ func ensure():
 
 # @param    Variant[]  argv
 # @returns  Variant
-func call(argv = []):
+func invoke_call(argv = []):
 	# Ensure callback target still exists
 	if !ensure():
 		print(errors["qc.callback.call.ensure_failed"] % [ self._target ])
 		return
 
 	# Execute call
-	return self._target.call_funcv(self._get_args(argv))
+	return self._target.call(self._get_args(argv))

addons/quentincaffeino/callback/src/Callback.gd

@@ -1,4 +1,3 @@
-
 extends "./AbstractCallback.gd"
 
 
@@ -40,7 +39,7 @@ func ensure():
 
 # @param    Variant[]  argv
 # @returns  Variant
-func call(argv = []):
+func invoke_call(argv = []):
 	# Ensure callback target still exists
 	if !ensure():
 		print(errors["qc.callback.call.ensure_failed"] % [ self._target, self._name ])

addons/quentincaffeino/callback/src/CallbackBuilder.gd

@@ -3,7 +3,7 @@ extends RefCounted
 
 const Utils = preload("./Utils.gd")
 const Callback = preload("./Callback.gd")
-const FuncRefCallback = preload("./FuncRefCallback.gd")
+const CallableCallback = preload("./CallableCallback.gd")
 const errors = preload("../assets/translations/errors.en.gd").messages
 
 
@@ -72,13 +72,13 @@ func bind(argv = []):
 
 # @returns  Callback|null
 func build():
+	if self._target is Callable:
+		return CallableCallback.new(self._target)
+
 	if typeof(self._target) != TYPE_OBJECT:
 		print(errors["qc.callback.canCreate.first_arg"] % str(typeof(self._target)))
 		return null
 
-	if Utils.is_funcref(self._target):
-		return FuncRefCallback.new(self._target)
-
 	if typeof(self._name) != TYPE_STRING:
 		print(errors["qc.callback.canCreate.second_arg"] % str(typeof(self._name)))
 		return null

addons/quentincaffeino/console-csharp/src/Command/CommandBuilder.cs

@@ -1,10 +1,10 @@
 using Godot;
 
-public class CommandBuilder : Godot.Object
+public partial class CommandBuilder : GodotObject
 {
-    private Godot.Object _commandObject;
+    private GodotObject _commandObject;
 
-    public CommandBuilder(Godot.Object commandObject)
+    public CommandBuilder(GodotObject commandObject)
     {
         _commandObject = commandObject;
     }
@@ -17,7 +17,7 @@ public CommandBuilder SetDescription(string description)
 
     public CommandBuilder AddArgument(string argumentName, Variant.Type argumentType)
     {
-        _commandObject.Call("add_argument", argumentName, argumentType);
+        _commandObject.Call("add_argument", argumentName, (long)argumentType);
         return this;
     }
 

addons/quentincaffeino/console-csharp/src/Console.cs

@@ -1,6 +1,7 @@
 using Godot;
+using System.IO;
 
-public class Console : Node
+public partial class Console : Node
 {
     CanvasLayer _console;
 
@@ -9,9 +10,15 @@ public override void _Ready()
         _console = GetTree().Root.GetNode<CanvasLayer>("Console");
     }
 
-    public CommandBuilder AddCommand(string name, Godot.Object target, string targetMethodName)
+    /// <summary>
+    /// This is a hack until we can fix the code generated by GodotPluginsInitializerGenerator to specify it means System.Console not this Console
+    /// https://github.com/godotengine/godot/pull/72434
+    /// </summary>
+    public static TextWriter Error => System.Console.Error;
+
+    public CommandBuilder AddCommand(string name, GodotObject target, string targetMethodName)
     {
-        Godot.Object consoleCommand = _console.Call("add_command", name, target, targetMethodName) as Godot.Object;
+        GodotObject consoleCommand = _console.Call("add_command", name, target, targetMethodName).Obj as GodotObject;
         return new CommandBuilder(consoleCommand);
     }
 }

addons/quentincaffeino/console/docs/generated/AbstractCallback.md

@@ -58,7 +58,7 @@ void
 ### call
 
 ```gdscript
-func call(argv: Variant[])
+func invoke_call(argv: Variant[])
 ```
 
 Variant

addons/quentincaffeino/console/docs/generated/Callback.md

@@ -34,7 +34,7 @@ boolean
 ### call
 
 ```gdscript
-func call(argv: Variant[])
+func invoke_call(argv: Variant[])
 ```
 
 Variant

addons/quentincaffeino/console/src/Command/Command.gd

@@ -69,7 +69,7 @@ func execute(inArgs = []):
 		i += 1
 
 	# Execute command
-	return self._target.call(args)
+	return self._target.invoke_call(args)
 
 
 # @returns  void

addons/quentincaffeino/console/src/Console.gd

@@ -78,6 +78,10 @@ func _ready():
 	# React to clicks on console urls
 	self.Text.connect("meta_clicked", self.Line.set_text)
 
+	self.Text.focus_entered.connect(func():
+		self.Line.grab_focus()
+	)
+
 	# Hide console by default
 	self._console_box.hide()
 	self._animation_player.connect("animation_finished", _toggle_animation_finished)
@@ -188,7 +192,7 @@ func open():
 	previous_focus_owner = self.Line.get_viewport().gui_get_focus_owner()
 	self._console_box.show()
 	self.Line.clear()
-	self.Line.grab_focus()
+	self.Line.grab_focus.call_deferred()
 	self._animation_player.play_backwards('fade')
 	is_console_shown = true
 	emit_signal("toggled", is_console_shown)

addons/quentincaffeino/console/src/ConsoleLine.gd

@@ -143,7 +143,7 @@ static func _parse_commands(input):
 # @returns  Dictionary
 static func _parse_command(rawCommand):
 	var name = ''
-	var arguments: Array[String] = Array()
+	var arguments: Array[String] = []
 
 	var beginning = 0  # int
 	var openQuote  # String|null

addons/quentincaffeino/console/src/Misc/BaseCommands.gd

@@ -40,7 +40,7 @@ func _init(console):
 		.set_description('Shows engine version.')\
 		.register()
 
-	self._console.add_command('fps_max', Engine, 'set_target_fps')\
+	self._console.add_command('max_fps', Engine)\
 		.set_description('The maximal framerate at which the application can run.')\
 		.add_argument('fps', self._console.IntRangeType.new(10, 1000))\
 		.register()

addons/quentincaffeino/console/src/Type/IntType.gd

@@ -9,4 +9,4 @@ func _init():
 # @param    Variant  value
 # @returns  int
 func normalize(value):
-	return int(self._reextract(value))
+	return self._reextract(value).to_int();

addons/quentincaffeino/iterator/src/Iterator.gd

@@ -31,13 +31,13 @@ func _init(target, get_value_field = "get", get_length_field = "size"):
 
 # @returns  int
 func _length():
-	return self._object_get_length_cb.call()
+	return self._object_get_length_cb.invoke_call()
 
 
 # @param    int  index
 # @returns  Variant
 func _get(index):
-	return self._object_get_value_cb.call([index])
+	return self._object_get_value_cb.invoke_call([index])
 
 
 # Sets the internal iterator to the first element in the collection and returns this element.

demo-csharp/CSharpDemoScene.cs

@@ -1,6 +1,6 @@
 using Godot;
 
-public class CSharpDemoScene : CanvasLayer
+public partial class CSharpDemoScene : CanvasLayer
 {    
 	Console _wrapper;
 	Label _label;

demo-csharp/Demo-csharp.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Godot.NET.Sdk/3.3.0">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <RootNamespace>Democsharp</RootNamespace>
-  </PropertyGroup>
+<Project Sdk="Godot.NET.Sdk/4.0.0">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <RootNamespace>Democsharp</RootNamespace>
+  </PropertyGroup>
 </Project>