Merge pull request #28 from endlessm/plugin-cleanup

Plugin cleanup

Author: wjt

addons/block_code/block_code_plugin.gd

@@ -5,12 +5,44 @@ extends EditorPlugin
 const MainPanel := preload("res://addons/block_code/ui/main_panel.tscn")
 static var main_panel
 
-var script_ok_button: Button
-var script_ok_prev_connection: Dictionary
-var prev_opened_script_idx: int
-
 var old_feature_profile: String = ""
 
+const DISABLED_CLASSES := [
+	"BlockScriptData",
+	"DragManager",
+	"InstructionTree",
+	"EditorInterfaceAccess",
+	"SimpleCharacter",
+	"Types",
+	"BasicBlock",
+	"Block",
+	"ControlBlock",
+	"ParameterBlock",
+	"StatementBlock",
+	"DragDropArea",
+	"SnapPoint",
+	"NodeBlockCanvas",
+	"SerializedBlockTreeNodeArray",
+	"SerializedBlockTreeNode",
+	"SerializedBlock",
+	"PackedSceneTreeNodeArray",
+	"PackedSceneTreeNode",
+	"BlockCanvas",
+	"NodeCanvas",
+	"NodeClass",
+	"NodeClassList",
+	"NodeData",
+	"NodePreview",
+	"NodeList",
+	"CategoryFactory",
+	"BlockCategoryDisplay",
+	"BlockCategory",
+	"Picker",
+	"TitleBar",
+	"MainPanel",
+	"BlockCodePlugin"
+]
+
 
 func _enter_tree():
 	main_panel = MainPanel.instantiate()
@@ -25,50 +57,14 @@ func _enter_tree():
 	add_autoload_singleton("SignalManager", "res://addons/block_code/block_code_node/utilities/signal_manager.gd")
 
 	# Remove unwanted class nodes from create node
-	var remove_list := [
-		"BlockScriptData",
-		"DragManager",
-		"InstructionTree",
-		"EditorInterfaceAccess",
-		"SimpleCharacter",
-		"Types",
-		"BasicBlock",
-		"Block",
-		"ControlBlock",
-		"ParameterBlock",
-		"StatementBlock",
-		"DragDropArea",
-		"SnapPoint",
-		"NodeBlockCanvas",
-		"SerializedBlockTreeNodeArray",
-		"SerializedBlockTreeNode",
-		"SerializedBlock",
-		"PackedSceneTreeNodeArray",
-		"PackedSceneTreeNode",
-		"BlockCanvas",
-		"NodeCanvas",
-		"NodeClass",
-		"NodeClassList",
-		"NodeData",
-		"NodePreview",
-		"NodeList",
-		"CategoryFactory",
-		"BlockCategoryDisplay",
-		"BlockCategory",
-		"Picker",
-		"TitleBar",
-		"MainPanel",
-		"BlockCodePlugin"
-	]
-
 	old_feature_profile = EditorInterface.get_current_feature_profile()
 
 	var editor_paths: EditorPaths = EditorInterface.get_editor_paths()
 	if editor_paths:
 		var config_dir := editor_paths.get_config_dir()
 		var new_profile := EditorFeatureProfile.new()
 		new_profile.load_from_file(config_dir + "/feature_profiles/" + old_feature_profile + ".profile")
-		for _class_name in remove_list:
+		for _class_name in DISABLED_CLASSES:
 			new_profile.set_disable_class(_class_name, true)
 
 		var dir = config_dir + "/feature_profiles/block_code.profile"
@@ -93,10 +89,6 @@ func _exit_tree():
 			EditorInterface.set_current_feature_profile("")
 
 
-func _reconnect_signal(_signal: Signal, _data: Dictionary):
-	_signal.connect(_data.callable, _data.flags)
-
-
 func _has_main_screen():
 	return true
 

addons/block_code/ui/main_panel.gd

@@ -7,8 +7,6 @@ var eia: EditorInterfaceAccess
 @onready var _picker: Picker = %Picker
 @onready var _block_canvas: BlockCanvas = %NodeBlockCanvas
 @onready var _drag_manager: DragManager = %DragManager
-#@onready var _node_canvas := %NodeCanvas
-#@onready var _node_list: NodeList = %NodeList
 @onready var _title_bar: TitleBar = %TitleBar
 
 var block_code_tab: Button
@@ -23,8 +21,6 @@ func _ready():
 	_block_canvas.reconnect_block.connect(_drag_manager.connect_block_canvas_signals)
 	_drag_manager.block_dropped.connect(save_script)
 	_drag_manager.block_modified.connect(save_script)
-	#_node_list.node_selected.connect(_title_bar.node_selected)
-	#_title_bar.node_name_changed.connect(_node_list.on_node_name_changed)
 
 	eia = EditorInterfaceAccess.new()
 
@@ -33,7 +29,7 @@ func _ready():
 
 
 func _on_button_pressed():
-	pass
+	_print_generated_script()
 
 
 func switch_script(block_code_node: BlockCode):
@@ -78,11 +74,10 @@ func _input(event):
 			else:
 				_drag_manager.drag_ended()
 
-	# HACK: play the topmost block
-	if event is InputEventKey:
-		if event.keycode == KEY_F and event.pressed:
-			if _current_bsd:
-				var script: String = _block_canvas.generate_script_from_current_window(_current_bsd.script_inherits)
 
-				print(script)
-				print("Debug script! (not saved)")
+func _print_generated_script():
+	if _current_bsd == null:
+		return
+	var script: String = _block_canvas.generate_script_from_current_window(_current_bsd.script_inherits)
+	print(script)
+	print("Debug script! (not saved)")