fixup! Refactor UI block classes to depend on BlockDefinition

Author: dbnicholson

addons/block_code/ui/blocks/block/block.gd

@@ -3,9 +3,6 @@ class_name Block
 extends MarginContainer
 
 const BlockDefinition = preload("res://addons/block_code/code_generation/block_definition.gd")
-const BlocksCatalog = preload("res://addons/block_code/code_generation/blocks_catalog.gd")
-const BlockSerialization = preload("res://addons/block_code/serialization/block_serialization.gd")
-const Types = preload("res://addons/block_code/types/types.gd")
 
 signal drag_started(block: Block)
 signal modified

addons/block_code/ui/blocks/statement_block/statement_block.gd

@@ -2,8 +2,12 @@
 class_name StatementBlock
 extends Block
 
+const BlocksCatalog = preload("res://addons/block_code/code_generation/blocks_catalog.gd")
 const ParameterInput = preload("res://addons/block_code/ui/blocks/utilities/parameter_input/parameter_input.gd")
 const ParameterInputScene = preload("res://addons/block_code/ui/blocks/utilities/parameter_input/parameter_input.tscn")
+const ParameterOutput = preload("res://addons/block_code/ui/blocks/utilities/parameter_output/parameter_output.gd")
+const ParameterOutputScene = preload("res://addons/block_code/ui/blocks/utilities/parameter_output/parameter_output.tscn")
+const Types = preload("res://addons/block_code/types/types.gd")
 
 @onready var _background := %Background
 @onready var _hbox := %HBoxContainer
@@ -47,6 +51,7 @@ func format():
 
 
 static func format_string(parent_block: Block, attach_to: Node, string: String, _defaults: Dictionary) -> Dictionary:
+	BlocksCatalog.setup()
 	var _arg_name_to_param_input_dict = {}
 	var regex = RegEx.new()
 	regex.compile("\\[([^\\]]+)\\]|\\{([^}]+)\\}")  # Capture things of format {test} or [test]
@@ -83,18 +88,13 @@ static func format_string(parent_block: Block, attach_to: Node, string: String,
 		var param_node: Node
 
 		if copy_block:
-			var parameter_output: ParameterOutput = preload("res://addons/block_code/ui/blocks/utilities/parameter_output/parameter_output.tscn").instantiate()
+			var parameter_output: ParameterOutput = ParameterOutputScene.instantiate()
 			parameter_output.name = "ParameterOutput%d" % start  # Unique path
 
-			# FIXME: This logic could be separated because it is the same as in CategoryFactory get_parameter_output_blocks()
-			var block_definition = BlockDefinition.new()
-			block_definition.name = parent_block.definition.name + "_" + param_name
-			block_definition.category = parent_block.definition.category
-			block_definition.type = Types.BlockType.VALUE
-			block_definition.variant_type = param_type
-			block_definition.display_template = param_name
-			block_definition.code_template = param_name
-			block_definition.scope = parent_block.definition.code_template
+			var block_name = &"%s_%s" % [parent_block.definition.name, param_name]
+			var block_definition = BlocksCatalog.get_block(block_name)
+			if block_definition == null:
+				push_error("Could not locate block definition %s" % block_name)
 
 			parameter_output.block_params = {"definition": block_definition, "color": parent_block.color}
 			parameter_output.block = parent_block