Merge pull request #82 from endlessm/multiline-and-renaming

Multiline and renaming

Author: manuq

addons/block_code/block_code_node/utilities/signal_manager.gd

@@ -59,9 +59,6 @@ func _enter_tree():
 	# Hide the main panel. Very much required.
 	_make_visible(false)
 
-	# Add signal manager for block code nodes to access
-	add_autoload_singleton("SignalManager", "res://addons/block_code/block_code_node/utilities/signal_manager.gd")
-
 	# Remove unwanted class nodes from create node
 	old_feature_profile = EditorInterface.get_current_feature_profile()
 
@@ -83,8 +80,6 @@ func _exit_tree():
 	if main_panel:
 		main_panel.queue_free()
 
-	remove_autoload_singleton("SignalManager")
-
 	var editor_paths: EditorPaths = EditorInterface.get_editor_paths()
 	if editor_paths:
 		var config_dir := editor_paths.get_config_dir()

addons/block_code/block_code_plugin.gd

@@ -142,6 +142,18 @@ static func get_general_blocks() -> Array[Block]:
 	b.category = "Lifecycle"
 	block_list.append(b)
 
+	b = BLOCKS["statement_block"].instantiate()
+	b.block_format = "Await scene ready"
+	b.statement = (
+		"""
+		if not get_tree().root.is_node_ready():
+			await get_tree().root.ready
+		"""
+		. dedent()
+	)
+	b.category = "Lifecycle"
+	block_list.append(b)
+
 	# Control
 	b = BLOCKS["control_block"].instantiate()
 	b.block_formats = ["if    {condition: BOOL}"]
@@ -191,20 +203,27 @@ static func get_general_blocks() -> Array[Block]:
 	b = BLOCKS["entry_block"].instantiate()
 	# HACK: make signals work with new entry nodes. NIL instead of STRING type allows
 	# plain text input for function name. Should revamp signals later
-	b.block_format = "On signal {signal: NIL}"
-	b.statement = "func signal_{signal}():"
+	b.block_format = "Define method {method_name: NIL}"
+	b.statement = "func {method_name}():"
 	b.category = "Signal"
 	block_list.append(b)
 
 	b = BLOCKS["statement_block"].instantiate()
-	b.block_format = "Send signal {signal: STRING} to group {group: STRING}"
-	b.statement = 'if get_tree().root.has_node("SignalManager"):\n' + '\tget_tree().root.get_node_or_null("SignalManager").broadcast_signal({group}, {signal})'
+	b.block_format = "Call method {method_name: STRING} in group {group: STRING}"
+	b.statement = "get_tree().call_group({group}, {method_name})"
 	b.category = "Signal"
 	block_list.append(b)
 
 	b = BLOCKS["statement_block"].instantiate()
-	b.block_format = "Send signal {signal: STRING} to node {node: NODE_PATH}"
-	b.statement = 'if get_tree().root.has_node("SignalManager"):\n' + '\tget_tree().root.get_node_or_null("SignalManager").send_signal_to_node({node}, {signal})'
+	b.block_format = "Call method {method_name: STRING} in node {node_path: NODE_PATH}"
+	b.statement = (
+		"""
+		var node = get_node({node_path})
+		if node:
+			node.call({method_name})
+		"""
+		. dedent()
+	)
 	b.category = "Signal"
 	block_list.append(b)
 
@@ -345,14 +364,29 @@ static func get_general_blocks() -> Array[Block]:
 	b = BLOCKS["statement_block"].instantiate()
 	b.block_type = Types.BlockType.EXECUTE
 	b.block_format = "Load file {file_path: STRING} as sound {name: STRING}"
-	b.statement = "VAR_DICT[{name}] = AudioStreamPlayer.new()\nVAR_DICT[{name}].name = {name}\nVAR_DICT[{name}].set_stream(load({file_path}))\nadd_child(VAR_DICT[{name}])"
+	b.statement = (
+		"""
+		VAR_DICT[{name}] = AudioStreamPlayer.new()
+		VAR_DICT[{name}].name = {name}
+		VAR_DICT[{name}].set_stream(load({file_path}))
+		add_child(VAR_DICT[{name}])
+		"""
+		. dedent()
+	)
 	b.category = "Sound"
 	block_list.append(b)
 
 	b = BLOCKS["statement_block"].instantiate()
 	b.block_type = Types.BlockType.EXECUTE
 	b.block_format = "Play the sound {name: STRING} with Volume dB {db: FLOAT} and Pitch Scale {pitch: FLOAT}"
-	b.statement = "VAR_DICT[{name}].volume_db = {db}\nVAR_DICT[{name}].pitch_scale = {pitch}\nVAR_DICT[{name}].play()"
+	b.statement = (
+		"""
+		VAR_DICT[{name}].volume_db = {db}
+		VAR_DICT[{name}].pitch_scale = {pitch}
+		VAR_DICT[{name}].play()
+		"""
+		. dedent()
+	)
 	b.defaults = {"db": "0.0", "pitch": "1.0"}
 	b.category = "Sound"
 	block_list.append(b)
@@ -450,14 +484,32 @@ static func get_built_in_blocks(_class_name: String) -> Array[Block]:
 				b.block_format = "On [body: NODE_PATH] %s" % [verb]
 				# HACK: Blocks refer to nodes by path but the callback receives the node itself;
 				# convert to path
-				b.statement = "func _on_body_%s(_body: Node):\n\tvar body: NodePath = _body.get_path()" % [verb]
+				b.statement = (
+					(
+						"""
+						func _on_body_%s(_body: Node):
+							var body: NodePath = _body.get_path()
+						"""
+						. dedent()
+					)
+					% [verb]
+				)
 				b.signal_name = "body_%s" % [verb]
 				b.category = "Signal"
 				block_list.append(b)
 
 			var b = BLOCKS["statement_block"].instantiate()
 			b.block_format = "Set Physics Position {position: VECTOR2}"
-			b.statement = "PhysicsServer2D.body_set_state(get_rid(),PhysicsServer2D.BODY_STATE_TRANSFORM,Transform2D.IDENTITY.translated({position}))"
+			b.statement = (
+				"""
+				PhysicsServer2D.body_set_state(
+					get_rid(),
+					PhysicsServer2D.BODY_STATE_TRANSFORM,
+					Transform2D.IDENTITY.translated({position})
+				)
+				"""
+				. dedent()
+			)
 			b.category = "Movement"
 			block_list.append(b)
 
@@ -473,7 +525,16 @@ static func get_built_in_blocks(_class_name: String) -> Array[Block]:
 				b.block_format = "On [body: NODE_PATH] %s" % [verb]
 				# HACK: Blocks refer to nodes by path but the callback receives the node itself;
 				# convert to path
-				b.statement = "func _on_body_%s(_body: Node2D):\n\tvar body: NodePath = _body.get_path()" % [verb]
+				b.statement = (
+					(
+						"""
+						func _on_body_%s(_body: Node2D):
+							var body: NodePath = _body.get_path()
+						"""
+						. dedent()
+					)
+					% [verb]
+				)
 				b.signal_name = "body_%s" % [verb]
 				b.category = "Signal"
 				block_list.append(b)

addons/block_code/ui/picker/categories/category_factory.gd

@@ -15,10 +15,6 @@ run/main_scene="res://addons/block_code/examples/pong_game/pong_game.tscn"
 config/features=PackedStringArray("4.2", "GL Compatibility")
 config/icon="res://icon.svg"
 
-[autoload]
-
-SignalManager="*res://addons/block_code/block_code_node/utilities/signal_manager.gd"
-
 [editor_plugins]
 
 enabled=PackedStringArray("res://addons/block_code/plugin.cfg", "res://addons/gut/plugin.cfg", "res://addons/plugin_refresher/plugin.cfg")