From 1c6cd863d9f00e900af5f311814d82b57767f080 Mon Sep 17 00:00:00 2001 From: Dark Peace <74102789+rbecker5@users.noreply.github.com> Date: Mon, 7 Nov 2022 21:04:39 +0100 Subject: [PATCH 1/8] SettingInterface --- addons/playerloop/SettingInterface.gd | 9 +++++++ addons/playerloop/SettingInterface.tscn | 35 +++++++++++++++++++++++++ addons/playerloop/plugin.gd | 3 +++ 3 files changed, 47 insertions(+) create mode 100644 addons/playerloop/SettingInterface.gd create mode 100644 addons/playerloop/SettingInterface.tscn diff --git a/addons/playerloop/SettingInterface.gd b/addons/playerloop/SettingInterface.gd new file mode 100644 index 0000000..17abed5 --- /dev/null +++ b/addons/playerloop/SettingInterface.gd @@ -0,0 +1,9 @@ +tool +extends Control + +func _ready() -> void: + Playerloop.request.post("test dock") + print("hey") + +func _on_Submit_pressed() -> void: + Playerloop.config["playerloopSecret"] = $Label.text diff --git a/addons/playerloop/SettingInterface.tscn b/addons/playerloop/SettingInterface.tscn new file mode 100644 index 0000000..b5df534 --- /dev/null +++ b/addons/playerloop/SettingInterface.tscn @@ -0,0 +1,35 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://addons/playerloop/SettingInterface.gd" type="Script" id=1] + +[node name="PlayerLoop" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +script = ExtResource( 1 ) + +[node name="Label" type="LineEdit" parent="."] +margin_left = 4.0 +margin_top = 66.0 +margin_right = 881.0 +margin_bottom = 93.0 +text = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbklkIjo4NzQ1MTMxMn0.AF3v0cEjX0FrVOP54F-YbgyPMA0wXezjnOuCPEJBoP0" +max_length = 108 +expand_to_text_length = true +placeholder_text = "Enter your secret code here" +caret_blink = true + +[node name="Submit" type="Button" parent="."] +margin_left = 959.0 +margin_top = 66.0 +margin_right = 1018.0 +margin_bottom = 89.0 +text = "Submit" + +[node name="Label2" type="Label" parent="."] +margin_left = 32.0 +margin_top = 99.0 +margin_right = 289.0 +margin_bottom = 116.0 +text = "PlayerLoop is connected to [no] project" + +[connection signal="pressed" from="Submit" to="." method="_on_Submit_pressed"] diff --git a/addons/playerloop/plugin.gd b/addons/playerloop/plugin.gd index 6cf3e5c..d18f0c0 100644 --- a/addons/playerloop/plugin.gd +++ b/addons/playerloop/plugin.gd @@ -1,10 +1,13 @@ tool extends EditorPlugin +var interface = preload("res://addons/playerloop/SettingInterface.tscn").instance() func _enter_tree(): add_autoload_singleton("Playerloop", "res://addons/playerloop/Playerloop/playerloop.gd") + add_control_to_container(EditorPlugin.CONTAINER_PROJECT_SETTING_TAB_RIGHT, interface) func _exit_tree(): + remove_control_from_container(EditorPlugin.CONTAINER_PROJECT_SETTING_TAB_RIGHT, interface) remove_autoload_singleton("Playerloop") From 023a45a2476f3e108151e74481a8768813d6f30c Mon Sep 17 00:00:00 2001 From: Dark Peace <74102789+rbecker5@users.noreply.github.com> Date: Mon, 7 Nov 2022 21:07:26 +0100 Subject: [PATCH 2/8] Interface for authentification --- addons/playerloop/SettingInterface.gd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/playerloop/SettingInterface.gd b/addons/playerloop/SettingInterface.gd index 17abed5..79f5c07 100644 --- a/addons/playerloop/SettingInterface.gd +++ b/addons/playerloop/SettingInterface.gd @@ -1,9 +1,5 @@ tool extends Control -func _ready() -> void: - Playerloop.request.post("test dock") - print("hey") - func _on_Submit_pressed() -> void: Playerloop.config["playerloopSecret"] = $Label.text From 0a91fe7e87c3b2c5406029af9c8ab1ddac18de1f Mon Sep 17 00:00:00 2001 From: Dark Peace <74102789+rbecker5@users.noreply.github.com> Date: Mon, 7 Nov 2022 21:15:09 +0100 Subject: [PATCH 3/8] Oops I had leaked my code in that file --- addons/playerloop/SettingInterface.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/playerloop/SettingInterface.tscn b/addons/playerloop/SettingInterface.tscn index b5df534..c8293d8 100644 --- a/addons/playerloop/SettingInterface.tscn +++ b/addons/playerloop/SettingInterface.tscn @@ -12,7 +12,7 @@ margin_left = 4.0 margin_top = 66.0 margin_right = 881.0 margin_bottom = 93.0 -text = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbklkIjo4NzQ1MTMxMn0.AF3v0cEjX0FrVOP54F-YbgyPMA0wXezjnOuCPEJBoP0" +text = "" max_length = 108 expand_to_text_length = true placeholder_text = "Enter your secret code here" From d0603634bac5bc645bfb919f58dd19dc4b7f1087 Mon Sep 17 00:00:00 2001 From: Dark Peace <74102789+rbecker5@users.noreply.github.com> Date: Sun, 13 Nov 2022 11:50:50 +0100 Subject: [PATCH 4/8] Config function to set secret --- addons/playerloop/playerloop.gd | 26 ++++++++++++++++++++++++++ addons/playerloop/plugin.gd | 3 --- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 addons/playerloop/playerloop.gd diff --git a/addons/playerloop/playerloop.gd b/addons/playerloop/playerloop.gd new file mode 100644 index 0000000..273e01b --- /dev/null +++ b/addons/playerloop/playerloop.gd @@ -0,0 +1,26 @@ +class_name PlayerloopSDK +extends Node + +const ENVIRONMENT_VARIABLES : String = "playerloop/config" +var request : PlayerloopRequest +var debug: bool = false +var config : Dictionary = { "playerloopSecret": ""} + +func _ready() -> void: + load_config() + +# Load all config settings from ProjectSettings +func load_config() -> void: + if config.playerloopSecret != "": + load_nodes() + return + printerr("Add your secret in the res://addons/Playerloop/playerloop.gd file, line 13") + +func load_nodes() -> void: + request = PlayerloopRequest.new() + request._secret = config["playerloopSecret"] + add_child(request) + +func config(secret:String): + config["playerloopSecret"] = secret + load_nodes() diff --git a/addons/playerloop/plugin.gd b/addons/playerloop/plugin.gd index d18f0c0..52c7495 100644 --- a/addons/playerloop/plugin.gd +++ b/addons/playerloop/plugin.gd @@ -5,9 +5,6 @@ var interface = preload("res://addons/playerloop/SettingInterface.tscn").instanc func _enter_tree(): add_autoload_singleton("Playerloop", "res://addons/playerloop/Playerloop/playerloop.gd") - add_control_to_container(EditorPlugin.CONTAINER_PROJECT_SETTING_TAB_RIGHT, interface) - func _exit_tree(): - remove_control_from_container(EditorPlugin.CONTAINER_PROJECT_SETTING_TAB_RIGHT, interface) remove_autoload_singleton("Playerloop") From 9f031fb221c710038234a11f509fff79bf79cd34 Mon Sep 17 00:00:00 2001 From: Dark Peace <74102789+rbecker5@users.noreply.github.com> Date: Sun, 13 Nov 2022 11:51:07 +0100 Subject: [PATCH 5/8] Delete SettingInterface.gd --- addons/playerloop/SettingInterface.gd | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 addons/playerloop/SettingInterface.gd diff --git a/addons/playerloop/SettingInterface.gd b/addons/playerloop/SettingInterface.gd deleted file mode 100644 index 79f5c07..0000000 --- a/addons/playerloop/SettingInterface.gd +++ /dev/null @@ -1,5 +0,0 @@ -tool -extends Control - -func _on_Submit_pressed() -> void: - Playerloop.config["playerloopSecret"] = $Label.text From 25a9e30118d02b5302ec14083969b0fe48f89926 Mon Sep 17 00:00:00 2001 From: Dark Peace <74102789+rbecker5@users.noreply.github.com> Date: Sun, 13 Nov 2022 11:51:15 +0100 Subject: [PATCH 6/8] Delete SettingInterface.tscn --- addons/playerloop/SettingInterface.tscn | 35 ------------------------- 1 file changed, 35 deletions(-) delete mode 100644 addons/playerloop/SettingInterface.tscn diff --git a/addons/playerloop/SettingInterface.tscn b/addons/playerloop/SettingInterface.tscn deleted file mode 100644 index c8293d8..0000000 --- a/addons/playerloop/SettingInterface.tscn +++ /dev/null @@ -1,35 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://addons/playerloop/SettingInterface.gd" type="Script" id=1] - -[node name="PlayerLoop" type="Control"] -anchor_right = 1.0 -anchor_bottom = 1.0 -script = ExtResource( 1 ) - -[node name="Label" type="LineEdit" parent="."] -margin_left = 4.0 -margin_top = 66.0 -margin_right = 881.0 -margin_bottom = 93.0 -text = "" -max_length = 108 -expand_to_text_length = true -placeholder_text = "Enter your secret code here" -caret_blink = true - -[node name="Submit" type="Button" parent="."] -margin_left = 959.0 -margin_top = 66.0 -margin_right = 1018.0 -margin_bottom = 89.0 -text = "Submit" - -[node name="Label2" type="Label" parent="."] -margin_left = 32.0 -margin_top = 99.0 -margin_right = 289.0 -margin_bottom = 116.0 -text = "PlayerLoop is connected to [no] project" - -[connection signal="pressed" from="Submit" to="." method="_on_Submit_pressed"] From ca92932ca96eb1991588dd7bff7a0cd715ec4f19 Mon Sep 17 00:00:00 2001 From: Dark Peace <74102789+rbecker5@users.noreply.github.com> Date: Sun, 13 Nov 2022 11:52:09 +0100 Subject: [PATCH 7/8] Delete playerloop.gd --- addons/playerloop/playerloop.gd | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 addons/playerloop/playerloop.gd diff --git a/addons/playerloop/playerloop.gd b/addons/playerloop/playerloop.gd deleted file mode 100644 index 273e01b..0000000 --- a/addons/playerloop/playerloop.gd +++ /dev/null @@ -1,26 +0,0 @@ -class_name PlayerloopSDK -extends Node - -const ENVIRONMENT_VARIABLES : String = "playerloop/config" -var request : PlayerloopRequest -var debug: bool = false -var config : Dictionary = { "playerloopSecret": ""} - -func _ready() -> void: - load_config() - -# Load all config settings from ProjectSettings -func load_config() -> void: - if config.playerloopSecret != "": - load_nodes() - return - printerr("Add your secret in the res://addons/Playerloop/playerloop.gd file, line 13") - -func load_nodes() -> void: - request = PlayerloopRequest.new() - request._secret = config["playerloopSecret"] - add_child(request) - -func config(secret:String): - config["playerloopSecret"] = secret - load_nodes() From 224814d6cdfa0158fd4c89b96fe78d0f8cc8486f Mon Sep 17 00:00:00 2001 From: Dark Peace <74102789+rbecker5@users.noreply.github.com> Date: Sun, 13 Nov 2022 11:52:41 +0100 Subject: [PATCH 8/8] Function config() to add secret code --- addons/playerloop/Playerloop/playerloop.gd | 32 ++++++---------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/addons/playerloop/Playerloop/playerloop.gd b/addons/playerloop/Playerloop/playerloop.gd index e789eb1..273e01b 100644 --- a/addons/playerloop/Playerloop/playerloop.gd +++ b/addons/playerloop/Playerloop/playerloop.gd @@ -2,41 +2,25 @@ class_name PlayerloopSDK extends Node const ENVIRONMENT_VARIABLES : String = "playerloop/config" - -#var report : PlayerloopReport var request : PlayerloopRequest - - var debug: bool = false - -var config : Dictionary = { - "playerloopSecret": "" -} +var config : Dictionary = { "playerloopSecret": ""} func _ready() -> void: load_config() - load_nodes() # Load all config settings from ProjectSettings func load_config() -> void: if config.playerloopSecret != "": - pass - else: - printerr("Add your secret in the res://addons/Playerloop/playerloop.gd file, line 13") - # else: - # var env = ConfigFile.new() - # var err = env.load("res://addons/playerloop/.env") - # if err == OK: - # for key in config.keys(): - # var value : String = env.get_value(ENVIRONMENT_VARIABLES, key, "") - # if value == "": - # printerr("%s has not a valid value." % key) - # else: - # config[key] = value - # else: - # printerr("Unable to read .env file at path 'res://.env'") + load_nodes() + return + printerr("Add your secret in the res://addons/Playerloop/playerloop.gd file, line 13") func load_nodes() -> void: request = PlayerloopRequest.new() request._secret = config["playerloopSecret"] add_child(request) + +func config(secret:String): + config["playerloopSecret"] = secret + load_nodes()