use blockdefinition from categoryfactory

Author: dbnicholson

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

@@ -2,6 +2,8 @@ class_name CategoryFactory
 extends Object
 
 const BlockCategory = preload("res://addons/block_code/ui/picker/categories/block_category.gd")
+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 Types = preload("res://addons/block_code/types/types.gd")
 const Util = preload("res://addons/block_code/ui/util.gd")
 const Constants = preload("res://addons/block_code/ui/constants.gd")
@@ -14,7 +16,7 @@ static func _category_cmp(a: BlockCategory, b: BlockCategory) -> bool:
 	return a.name.naturalcasecmp_to(b.name) < 0
 
 
-static func get_categories(blocks: Array[Block], extra_categories: Array[BlockCategory] = []) -> Array[BlockCategory]:
+static func get_categories(blocks: Array[BlockDefinition], extra_categories: Array[BlockCategory] = []) -> Array[BlockCategory]:
 	var cat_map: Dictionary = {}
 	var extra_cat_map: Dictionary = {}
 
@@ -44,59 +46,61 @@ static func get_categories(blocks: Array[Block], extra_categories: Array[BlockCa
 	return cats
 
 
-static func get_general_blocks() -> Array[Block]:
-	var block: Block
-	var block_list: Array[Block] = []
+static func get_general_blocks() -> Array[BlockDefinition]:
+	var block: BlockDefinition
+	var block_list: Array[BlockDefinition] = []
+
+	BlocksCatalog.setup()
 
 	# Lifecycle
 	for block_name in [&"ready", &"process", &"physics_process", &"queue_free"]:
-		block = Util.instantiate_block_by_name(block_name)
+		block = BlocksCatalog.get_block(block_name)
 		block_list.append(block)
 
 	# Loops
 	for block_name in [&"for", &"while", &"break", &"continue", &"await_scene_ready"]:
-		block = Util.instantiate_block_by_name(block_name)
+		block = BlocksCatalog.get_block(block_name)
 		block_list.append(block)
 
 	# Logs
-	block = Util.instantiate_block_by_name(&"print")
+	block = BlocksCatalog.get_block(&"print")
 	block_list.append(block)
 
 	# Communication
 	for block_name in [&"define_method", &"call_method_group", &"call_method_node"]:
-		block = Util.instantiate_block_by_name(block_name)
+		block = BlocksCatalog.get_block(block_name)
 		block_list.append(block)
 
 	for block_name in [&"add_to_group", &"add_node_to_group", &"remove_from_group", &"remove_node_from_group", &"is_in_group", &"is_node_in_group"]:
-		block = Util.instantiate_block_by_name(block_name)
+		block = BlocksCatalog.get_block(block_name)
 		block_list.append(block)
 
 	# Variables
-	block = Util.instantiate_block_by_name(&"vector2")
+	block = BlocksCatalog.get_block(&"vector2")
 	block_list.append(block)
 
 	# Math
 	for block_name in [&"add", &"subtract", &"multiply", &"divide", &"pow", &"randf_range", &"randi_range", &"sin", &"cos", &"tan"]:
-		block = Util.instantiate_block_by_name(block_name)
+		block = BlocksCatalog.get_block(block_name)
 		block_list.append(block)
 
 	# Logic
 	for block_name in [&"if", &"else_if", &"else", &"compare", &"and", &"or", &"not"]:
-		block = Util.instantiate_block_by_name(block_name)
+		block = BlocksCatalog.get_block(block_name)
 		block_list.append(block)
 
 	# Input
-	block = Util.instantiate_block_by_name(&"is_input_actioned")
+	block = BlocksCatalog.get_block(&"is_input_actioned")
 	block_list.append(block)
 
 	# Sounds
 	for block_name in [&"load_sound", &"play_sound", &"pause_continue_sound", &"stop_sound"]:
-		block = Util.instantiate_block_by_name(block_name)
+		block = BlocksCatalog.get_block(block_name)
 		block_list.append(block)
 
 	# Graphics
 	for block_name in [&"viewport_width", &"viewport_height", &"viewport_center"]:
-		block = Util.instantiate_block_by_name(block_name)
+		block = BlocksCatalog.get_block(block_name)
 		block_list.append(block)
 
 	return block_list