Derive block color from category

Stop persisting the color in the serialization.

https://phabricator.endlessm.com/T35591

Author: manuq

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

@@ -138,9 +138,8 @@ func get_serialized_props() -> Array:
 		return serialize_props(["block_name", "label", "color", "block_type", "position", "scope"])
 
 	# TODO: Remove remaining serialization:
-	# - Derive color from category.
 	# - Handle scope in a different way?
-	return serialize_props(["color", "scope"])
+	return serialize_props(["scope"])
 
 
 func _to_string():

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

@@ -12,9 +12,5 @@ var category: BlockCategory
 func _ready():
 	_label.text = category.name
 
-	for _block in category.block_list:
-		var block: Block = _block as Block
-
-		block.color = category.color
-
+	for block: Block in category.block_list:
 		_blocks.add_child(block)

addons/block_code/ui/util.gd

@@ -13,6 +13,11 @@ const SCENE_PER_TYPE = {
 }
 
 
+static func get_category_color(category: String) -> Color:
+	var category_props: Dictionary = Constants.BUILTIN_CATEGORIES_PROPS.get(category, {})
+	return category_props.get("color", Color.SLATE_GRAY)
+
+
 static func instantiate_block(block_definition: BlockDefinition) -> Block:
 	var scene = SCENE_PER_TYPE[block_definition.type]
 	var b = scene.instantiate()
@@ -31,6 +36,8 @@ static func instantiate_block(block_definition: BlockDefinition) -> Block:
 	b.defaults = block_definition.defaults
 	b.tooltip_text = block_definition.description
 	b.category = block_definition.category
+	b.color = get_category_color(block_definition.category)
+
 	return b