From 5d3913059591cd106a433cec59e816dff39a2d3b Mon Sep 17 00:00:00 2001
From: Serhii Snitsaruk <limbonaut@pm.me>
Date: Wed, 21 Sep 2022 23:56:04 +0200
Subject: [PATCH] LimboUtility as singleton

---
 limbo_utility.cpp  | 39 +++++++++++++++++++++------------------
 limbo_utility.h    |  9 +++++++--
 register_types.cpp |  9 +++++++++
 3 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/limbo_utility.cpp b/limbo_utility.cpp
index 027a8f7..489a97c 100644
--- a/limbo_utility.cpp
+++ b/limbo_utility.cpp
@@ -1,28 +1,31 @@
 /* limbo_utility.cpp */
 
 #include "limbo_utility.h"
-#include "core/class_db.h"
-#include "core/dictionary.h"
-#include "core/print_string.h"
-#include "core/project_settings.h"
 #include "core/variant.h"
 
-String LimboUtility::get_script_class(const Ref<Script> &p_script) {
-	String a_name = "";
-	Array script_classes = GLOBAL_GET("_global_script_classes");
-	String task_filepath = p_script->get_path();
-	for (int i = 0; i < script_classes.size(); i++) {
-		Dictionary a_class = script_classes[i];
-		Variant class_path = a_class["path"];
-		// print_line(vformat("Type: %s Path: %s TaskPath: %s", class_path.get_type(), class_path, task_filepath));
-		if (a_class["path"] == task_filepath) {
-			a_name = a_class["class"];
-			break;
-		}
+LimboUtility *LimboUtility::singleton = nullptr;
+
+LimboUtility *LimboUtility::get_singleton() {
+	return singleton;
+}
+
+String LimboUtility::decorate_var(String p_variable) {
+	String var = p_variable.trim_prefix("$").trim_prefix("\"").trim_suffix("\"");
+	if (var.find(" ") == -1 and not var.empty()) {
+		return vformat("$%s", var);
+	} else {
+		return vformat("$\"%s\"", var);
 	}
-	return a_name;
 }
 
 void LimboUtility::_bind_methods() {
-	// ClassDB::bind_method(D_METHOD("get_class_name", "p_script"), &LimboUtility::get_class_name);
+	ClassDB::bind_method(D_METHOD("decorate_var", "p_variable"), &LimboUtility::decorate_var);
+}
+
+LimboUtility::LimboUtility() {
+	singleton = this;
+}
+
+LimboUtility::~LimboUtility() {
+	singleton = nullptr;
 }
diff --git a/limbo_utility.h b/limbo_utility.h
index 0db1ccc..fb9d980 100644
--- a/limbo_utility.h
+++ b/limbo_utility.h
@@ -4,16 +4,21 @@
 #define LIMBO_UTILITY_H
 
 #include "core/object.h"
-#include "core/script_language.h"
 
 class LimboUtility : public Object {
 	GDCLASS(LimboUtility, Object);
 
 protected:
+	static LimboUtility *singleton;
 	static void _bind_methods();
 
 public:
-	static String get_script_class(const Ref<Script> &p_script);
+	static LimboUtility *get_singleton();
+
+	String decorate_var(String p_variable);
+
+	LimboUtility();
+	~LimboUtility();
 };
 
 #endif // LIMBO_UTILITY_H
\ No newline at end of file
diff --git a/register_types.cpp b/register_types.cpp
index 79820a9..4427666 100644
--- a/register_types.cpp
+++ b/register_types.cpp
@@ -37,6 +37,7 @@
 #include "bt/decorators/bt_run_limit.h"
 #include "bt/decorators/bt_subtree.h"
 #include "bt/decorators/bt_time_limit.h"
+#include "core/os/memory.h"
 #include "limbo_string_names.h"
 #include "limbo_utility.h"
 
@@ -44,6 +45,8 @@
 #include "editor/limbo_ai_editor_plugin.h"
 #endif
 
+static LimboUtility *_limbo_utility = nullptr;
+
 void register_limboai_types() {
 	ClassDB::register_class<Blackboard>();
 	ClassDB::register_class<BTTask>();
@@ -84,6 +87,10 @@ void register_limboai_types() {
 
 	ClassDB::register_class<BTCondition>();
 
+	_limbo_utility = memnew(LimboUtility);
+	ClassDB::register_class<LimboUtility>();
+	Engine::get_singleton()->add_singleton(Engine::Singleton("LimboUtility", LimboUtility::get_singleton()));
+
 #ifdef TOOLS_ENABLED
 	EditorPlugins::add_by_type<LimboAIEditorPlugin>();
 #endif
@@ -93,4 +100,6 @@ void register_limboai_types() {
 
 void unregister_limboai_types() {
 	LimboStringNames::free();
+
+	memdelete(_limbo_utility);
 }