Block types: Rename EXECUTE to STATEMENT

For matching the block scene name.

Author: manuq

addons/block_code/blocks_catalog.gd

@@ -18,7 +18,7 @@ static func setup():
 	block_definition.category = "Lifecycle"
 	_catalog[&"ready_block"] = block_definition
 
-	block_definition = BlockDefinition.new(&"print", Types.BlockType.EXECUTE)
+	block_definition = BlockDefinition.new(&"print", Types.BlockType.STATEMENT)
 	block_definition.label_template = "print {text: STRING}"
 	block_definition.code_template = "print({text})"
 	block_definition.defaults = {"text": "Hello"}

addons/block_code/simple_nodes/simple_character/simple_character.gd

@@ -118,7 +118,7 @@ static func get_custom_blocks() -> Array[Block]:
 	# Movement
 	b = CategoryFactory.BLOCKS["statement_block"].instantiate()
 	b.block_name = "simplecharacter_move"
-	b.block_type = Types.BlockType.EXECUTE
+	b.block_type = Types.BlockType.STATEMENT
 	b.block_format = "Move with {player: OPTION} buttons as {kind: OPTION}"
 	# TODO: delta here is assumed to be the parameter name of
 	# the _process or _physics_process method:

addons/block_code/simple_nodes/simple_scoring/simple_scoring.gd

@@ -70,15 +70,15 @@ static func get_custom_blocks() -> Array[Block]:
 	for player in _POSITIONS_FOR_PLAYER:
 		b = CategoryFactory.BLOCKS["statement_block"].instantiate()
 		b.block_name = "simplescoring_set_score"
-		b.block_type = Types.BlockType.EXECUTE
+		b.block_type = Types.BlockType.STATEMENT
 		b.block_format = "Set player %s score to {score: INT}" % player
 		b.statement = "score_%s = {score}" % _POSITIONS_FOR_PLAYER[player]
 		b.category = "Info | Score"
 		block_list.append(b)
 
 		b = CategoryFactory.BLOCKS["statement_block"].instantiate()
 		b.block_name = "simplescoring_change_score"
-		b.block_type = Types.BlockType.EXECUTE
+		b.block_type = Types.BlockType.STATEMENT
 		b.block_format = "Change player %s score by {score: INT}" % player
 		b.statement = "score_%s += {score}" % _POSITIONS_FOR_PLAYER[player]
 		b.category = "Info | Score"

addons/block_code/types/types.gd

@@ -3,7 +3,7 @@ extends Node
 enum BlockType {
 	NONE,
 	ENTRY,
-	EXECUTE,
+	STATEMENT,
 	VALUE,
 	CONTROL,
 }

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

@@ -19,7 +19,7 @@ signal modified
 @export var color: Color = Color(1., 1., 1.)
 
 ## Type of block to check if can be attached to snap point
-@export var block_type: Types.BlockType = Types.BlockType.EXECUTE
+@export var block_type: Types.BlockType = Types.BlockType.STATEMENT
 
 ## Category to add the block to
 @export var category: String

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

@@ -19,7 +19,7 @@ var param_input_strings: Dictionary  # Only loaded from serialized
 func _ready():
 	super()
 
-	if block_type != Types.BlockType.EXECUTE:
+	if block_type != Types.BlockType.STATEMENT:
 		_background.show_top = false
 	_background.color = color
 

addons/block_code/ui/blocks/utilities/snap_point/snap_point.gd

@@ -4,7 +4,7 @@ extends MarginContainer
 
 const Types = preload("res://addons/block_code/types/types.gd")
 
-@export var block_type: Types.BlockType = Types.BlockType.EXECUTE
+@export var block_type: Types.BlockType = Types.BlockType.STATEMENT
 
 @export var snapped_block: Block:
 	get:

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

@@ -460,7 +460,7 @@ static func get_general_blocks() -> Array[Block]:
 #region Sounds
 	b = BLOCKS["statement_block"].instantiate()
 	b.block_name = "load_sound"
-	b.block_type = Types.BlockType.EXECUTE
+	b.block_type = Types.BlockType.STATEMENT
 	b.block_format = "Load file {file_path: STRING} as sound {name: STRING}"
 	b.statement = (
 		"""
@@ -477,7 +477,7 @@ static func get_general_blocks() -> Array[Block]:
 
 	b = BLOCKS["statement_block"].instantiate()
 	b.block_name = "play_sound"
-	b.block_type = Types.BlockType.EXECUTE
+	b.block_type = Types.BlockType.STATEMENT
 	b.block_format = "Play the sound {name: STRING} with Volume dB {db: FLOAT} and Pitch Scale {pitch: FLOAT}"
 	b.statement = (
 		"""
@@ -495,7 +495,7 @@ static func get_general_blocks() -> Array[Block]:
 
 	b = BLOCKS["statement_block"].instantiate()
 	b.block_name = "pause_continue_sound"
-	b.block_type = Types.BlockType.EXECUTE
+	b.block_type = Types.BlockType.STATEMENT
 	b.block_format = "{pause: OPTION} the sound {name: STRING}"
 	b.statement = (
 		"""
@@ -514,7 +514,7 @@ static func get_general_blocks() -> Array[Block]:
 
 	b = BLOCKS["statement_block"].instantiate()
 	b.block_name = "stop_sound"
-	b.block_type = Types.BlockType.EXECUTE
+	b.block_type = Types.BlockType.STATEMENT
 	b.block_format = "Stop the sound {name: STRING}"
 	b.statement = (
 		"""
@@ -793,7 +793,7 @@ static func get_built_in_blocks(_class_name: String) -> Array[Block]:
 		"CharacterBody2D":
 			var b = BLOCKS["statement_block"].instantiate()
 			b.block_name = "characterbody2d_move"
-			b.block_type = Types.BlockType.EXECUTE
+			b.block_type = Types.BlockType.STATEMENT
 			b.block_format = "Move with keys {up: STRING} {down: STRING} {left: STRING} {right: STRING} with speed {speed: VECTOR2}"
 			b.statement = (
 				"var dir = Vector2()\n"
@@ -816,7 +816,7 @@ static func get_built_in_blocks(_class_name: String) -> Array[Block]:
 
 			b = BLOCKS["statement_block"].instantiate()
 			b.block_name = "characterbody2d_move_and_slide"
-			b.block_type = Types.BlockType.EXECUTE
+			b.block_type = Types.BlockType.STATEMENT
 			b.block_format = "Move and slide"
 			b.statement = "move_and_slide()"
 			b.category = "Physics | Velocity"
@@ -882,7 +882,7 @@ static func get_variable_blocks(variables: Array[VariableResource]):
 
 		b = BLOCKS["statement_block"].instantiate()
 		b.block_name = "set_var_%s" % variable.var_name
-		b.block_type = Types.BlockType.EXECUTE
+		b.block_type = Types.BlockType.STATEMENT
 		b.block_format = "Set %s to {value: %s}" % [variable.var_name, type_string]
 		b.statement = "%s = {value}" % [variable.var_name]
 		b.color = BUILTIN_PROPS["Variables"].color

addons/block_code/ui/util.gd

@@ -6,7 +6,7 @@ const Types = preload("res://addons/block_code/types/types.gd")
 
 const SCENE_PER_TYPE = {
 	Types.BlockType.ENTRY: preload("res://addons/block_code/ui/blocks/entry_block/entry_block.tscn"),
-	Types.BlockType.EXECUTE: preload("res://addons/block_code/ui/blocks/statement_block/statement_block.tscn"),
+	Types.BlockType.STATEMENT: preload("res://addons/block_code/ui/blocks/statement_block/statement_block.tscn"),
 }