diff --git a/project/addons/discord-rpc-gd/.gitignore b/project/addons/discord-rpc-gd/.gitignore index 4e59e4f..7c14169 100644 --- a/project/addons/discord-rpc-gd/.gitignore +++ b/project/addons/discord-rpc-gd/.gitignore @@ -1 +1,3 @@ -bin/.gdignore \ No newline at end of file +bin/.gdignore +*.TMP +bin/windows/~*.dll \ No newline at end of file diff --git a/project/addons/discord-rpc-gd/bin/windows/~discord_game_sdk_binding_debug.dll b/project/addons/discord-rpc-gd/bin/windows/~discord_game_sdk_binding_debug.dll deleted file mode 100644 index 2b52a76..0000000 Binary files a/project/addons/discord-rpc-gd/bin/windows/~discord_game_sdk_binding_debug.dll and /dev/null differ diff --git a/project/addons/discord-rpc-gd/nodes/Debug.tscn b/project/addons/discord-rpc-gd/nodes/Debug.tscn index 6953f83..e9501cc 100644 --- a/project/addons/discord-rpc-gd/nodes/Debug.tscn +++ b/project/addons/discord-rpc-gd/nodes/Debug.tscn @@ -8,13 +8,16 @@ resource_name = "Debug" script/source = "extends Node +@onready var animation_player: AnimationPlayer = $Panel/TextureRect/AnimationPlayer + func _ready(): DiscordRPC.connect(\"activity_join_request\",_on_activity_join_request) -func _process(_delta): +func _process(_delta) -> void: if(DiscordRPC.get_is_discord_working()): $Panel/TextureRect.self_modulate = Color(\"#3eff8d\") - $Panel/TextureRect/AnimationPlayer.play(\"pulsate\") + if !animation_player.is_playing(): + animation_player.play(\"pulsate\") debug_text_update() else: $Panel/TextureRect.self_modulate = Color(\"#797979\") @@ -22,7 +25,7 @@ func _process(_delta): debug_text_update() -func debug_text_update(): +func debug_text_update() -> void: $Panel/Info.text = \"Application ID : {id} Details: {details} State: {state} @@ -47,32 +50,32 @@ Is instanced: {instanced} \" $Panel/Info.text = $Panel/Info.text.replace(\"{ppublic}\",str(DiscordRPC.is_public_party)).replace(\"{instanced}\",str(DiscordRPC.instanced)).replace(\"{ssecret}\",DiscordRPC.spectate_secret).replace(\"{jsecret}\",DiscordRPC.join_secret).replace(\"{msecret}\",DiscordRPC.match_secret).replace(\"{mpartysize}\",str(DiscordRPC.max_party_size)).replace(\"{cpartysize}\",str(DiscordRPC.current_party_size)).replace(\"{partyid}\",DiscordRPC.party_id).replace(\"{id}\",str(DiscordRPC.app_id)).replace(\"{details}\",DiscordRPC.details).replace(\"{state}\",DiscordRPC.state).replace(\"{lkey}\",DiscordRPC.large_image).replace(\"{ltext}\",DiscordRPC.large_image_text).replace(\"{skey}\",DiscordRPC.small_image).replace(\"{stext}\",DiscordRPC.small_image_text).replace(\"{stimestamp}\",str(DiscordRPC.start_timestamp)).replace(\"{etimestamp}\",str(DiscordRPC.end_timestamp)) -var user_request = {}; +var user_request: Dictionary = {}; -func _on_activity_join_request(user_requesting): +func _on_activity_join_request(user_requesting: Dictionary) -> void: print(user_requesting) user_request = user_requesting -func _on_accept_join_request_pressed(): +func _on_accept_join_request_pressed() -> void: if(!user_request.is_empty()): DiscordRPC.accept_join_request(user_request.id) -func _on_invite_with_user_id_text_submitted(new_text): +func _on_invite_with_user_id_text_submitted(new_text: String) -> void: DiscordRPC.send_invite(int(new_text),true,\"this is a test invite sent from godot\") -func _on_accept_with_user_id_text_submitted(new_text): +func _on_accept_with_user_id_text_submitted(new_text: String) -> void: DiscordRPC.accept_invite(int(new_text)) -func _on_print_current_user_on_console_pressed(): +func _on_print_current_user_on_console_pressed() -> void: print(DiscordRPC.get_current_user()) -func _on_toggle_sdk_toggled(button_pressed): +func _on_toggle_sdk_toggled(button_pressed: bool) -> void: if(button_pressed): DiscordRPC.unclear() else: DiscordRPC.clear(false) -func _on_print_friends_pressed(): +func _on_print_friends_pressed() -> void: print(DiscordRPC.get_all_relationships()) " @@ -95,18 +98,19 @@ tracks/0/keys = { [sub_resource type="Animation" id="Animation_5u02v"] resource_name = "pulsate" -loop_mode = 1 +length = 0.5 +loop_mode = 2 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true tracks/0/path = NodePath(".:scale") tracks/0/interp = 1 -tracks/0/loop_wrap = true +tracks/0/loop_wrap = false tracks/0/keys = { -"times": PackedFloat32Array(0, 0.5, 1), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PackedFloat32Array(0, 0.5), +"transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [Vector2(0.5, 0.5), Vector2(0.8, 0.8), Vector2(0.5, 0.5)] +"values": [Vector2(0.5, 0.5), Vector2(0.8, 0.8)] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_a7ofc"] @@ -231,9 +235,9 @@ offset_right = 1144.0 offset_bottom = 665.375 grow_vertical = 2 scale = Vector2(0.05, 0.05) +theme_override_styles/focus = SubResource("StyleBoxEmpty_8abo6") theme_override_icons/checked = ExtResource("2_q6tao") theme_override_icons/unchecked = ExtResource("3_5cyem") -theme_override_styles/focus = SubResource("StyleBoxEmpty_8abo6") button_pressed = true [node name="TextureRect" type="TextureRect" parent="Panel"] diff --git a/project/addons/discord-rpc-gd/plugin.cfg b/project/addons/discord-rpc-gd/plugin.cfg index 8eeeb16..8354e0a 100644 --- a/project/addons/discord-rpc-gd/plugin.cfg +++ b/project/addons/discord-rpc-gd/plugin.cfg @@ -3,5 +3,5 @@ name="DiscordRPC" description="Discord RPC Plugin for GDScript in Godot" author="vaporvee" -version="1.3.1" +version="1.3.2" script="plugin.gd" diff --git a/project/addons/discord-rpc-gd/plugin.gd b/project/addons/discord-rpc-gd/plugin.gd index 03985b6..c58da1e 100644 --- a/project/addons/discord-rpc-gd/plugin.gd +++ b/project/addons/discord-rpc-gd/plugin.gd @@ -1,12 +1,12 @@ @tool extends EditorPlugin -const DiscordRPCDebug = preload("res://addons/discord-rpc-gd/nodes/debug.gd") -const DiscordRPCDebug_icon = preload("res://addons/discord-rpc-gd/Debug.svg") -var loaded_DiscordRPCDebug = DiscordRPCDebug.new() +const DiscordRPCDebug: GDScript = preload("res://addons/discord-rpc-gd/nodes/debug.gd") +const DiscordRPCDebug_icon: Texture2D = preload("res://addons/discord-rpc-gd/Debug.svg") +var loaded_DiscordRPCDebug: DiscordRPCDebug = DiscordRPCDebug.new() var restart_window: ConfirmationDialog = preload("res://addons/discord-rpc-gd/restart_window.tscn").instantiate() var plugin_cfg: ConfigFile = ConfigFile.new() -const plugin_data_filename = "/plugin_data.cfg" +const plugin_data_filename: String = "/plugin_data.cfg" func _enter_tree() -> void: add_custom_type("DiscordRPCDebug","Node",DiscordRPCDebug,DiscordRPCDebug_icon) @@ -18,7 +18,7 @@ func _ready() -> void: if !get_editor_interface().get_editor_settings().has_setting("DiscordRPC/EditorPresence/enabled"): get_editor_interface().get_editor_settings().set_setting("DiscordRPC/EditorPresence/enabled",plugin_cfg.get_value("Discord","editor_presence",false)) -func _exit_tree(): +func _exit_tree() -> void: if get_editor_interface().get_editor_settings().has_setting("DiscordRPC/EditorPresence/enabled"): get_editor_interface().get_editor_settings().erase("DiscordRPC/EditorPresence/enabled") diff --git a/project/addons/discord-rpc-gd/restart_window.tscn b/project/addons/discord-rpc-gd/restart_window.tscn index 436b6cc..0135285 100644 --- a/project/addons/discord-rpc-gd/restart_window.tscn +++ b/project/addons/discord-rpc-gd/restart_window.tscn @@ -9,7 +9,7 @@ Button/styles/focus = SubResource("StyleBoxEmpty_1t7mm") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_5vqdt"] -[sub_resource type="Image" id="Image_v4whe"] +[sub_resource type="Image" id="Image_f4u3i"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 227, 227, 227, 36, 224, 224, 224, 168, 224, 224, 224, 233, 224, 224, 224, 236, 224, 224, 224, 170, 231, 231, 231, 31, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 227, 227, 227, 36, 224, 224, 224, 234, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 239, 230, 230, 230, 30, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 168, 224, 224, 224, 255, 224, 224, 224, 186, 224, 224, 224, 32, 224, 224, 224, 33, 224, 224, 224, 187, 224, 224, 224, 255, 225, 225, 225, 167, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 237, 224, 224, 224, 255, 224, 224, 224, 33, 255, 255, 255, 0, 255, 255, 255, 0, 227, 227, 227, 36, 224, 224, 224, 255, 224, 224, 224, 234, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 237, 224, 224, 224, 255, 224, 224, 224, 33, 255, 255, 255, 0, 255, 255, 255, 0, 229, 229, 229, 38, 224, 224, 224, 255, 224, 224, 224, 229, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 164, 224, 224, 224, 255, 224, 224, 224, 187, 225, 225, 225, 34, 227, 227, 227, 36, 224, 224, 224, 192, 224, 224, 224, 255, 224, 224, 224, 162, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 24, 225, 225, 225, 215, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 229, 224, 224, 224, 32, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 24, 224, 224, 224, 216, 224, 224, 224, 255, 224, 224, 224, 210, 224, 224, 224, 161, 224, 224, 224, 232, 224, 224, 224, 231, 225, 225, 225, 159, 230, 230, 230, 30, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 107, 224, 224, 224, 255, 224, 224, 224, 210, 230, 230, 230, 20, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 105, 230, 230, 230, 20, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 221, 224, 224, 224, 130, 255, 255, 255, 1, 255, 255, 255, 1, 225, 225, 225, 134, 224, 224, 224, 224, 225, 225, 225, 223, 224, 224, 224, 132, 255, 255, 255, 1, 255, 255, 255, 6, 224, 224, 224, 137, 224, 224, 224, 231, 224, 224, 224, 255, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 130, 225, 225, 225, 133, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 129, 224, 224, 224, 137, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 65, 224, 224, 224, 255, 224, 224, 224, 220, 225, 225, 225, 223, 224, 224, 224, 255, 226, 226, 226, 61, 224, 224, 224, 65, 224, 224, 224, 255, 224, 224, 224, 222, 224, 224, 224, 231, 224, 224, 224, 255, 227, 227, 227, 62, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 225, 225, 225, 67, 224, 224, 224, 255, 224, 224, 224, 219, 224, 224, 224, 222, 224, 224, 224, 255, 227, 227, 227, 63, 225, 225, 225, 67, 224, 224, 224, 255, 224, 224, 224, 219, 224, 224, 224, 230, 224, 224, 224, 255, 227, 227, 227, 63, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 225, 225, 225, 127, 224, 224, 224, 129, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 225, 225, 225, 126, 225, 225, 225, 135, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 221, 225, 225, 225, 127, 255, 255, 255, 0, 255, 255, 255, 1, 224, 224, 224, 128, 224, 224, 224, 220, 224, 224, 224, 219, 225, 225, 225, 127, 255, 255, 255, 0, 255, 255, 255, 5, 225, 225, 225, 134, 224, 224, 224, 229, 224, 224, 224, 255, 255, 255, 255, 0), "format": "RGBA8", @@ -19,7 +19,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_gdtpn"] -image = SubResource("Image_v4whe") +image = SubResource("Image_f4u3i") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_7v0rg"] diff --git a/project/export_presets.cfg b/project/export_presets.cfg index 6ca76b3..e8d80e7 100644 --- a/project/export_presets.cfg +++ b/project/export_presets.cfg @@ -3,9 +3,11 @@ name="Windows Desktop" platform="Windows Desktop" runnable=true +advanced_options=false dedicated_server=false custom_features="" -export_filter="all_resources" +export_filter="exclude" +export_files=PackedStringArray("res://addons/discord-rpc-gd/bin/discord-rpc-gd.gdextension", "res://addons/discord-rpc-gd/nodes/assets/Checked.svg", "res://addons/discord-rpc-gd/nodes/assets/circle.svg", "res://addons/discord-rpc-gd/nodes/assets/Unchecked.svg", "res://addons/discord-rpc-gd/nodes/debug.gd", "res://addons/discord-rpc-gd/nodes/Debug.tscn", "res://addons/discord-rpc-gd/nodes/discord_autoload.gd", "res://addons/discord-rpc-gd/Debug.svg", "res://addons/discord-rpc-gd/example.gd", "res://addons/discord-rpc-gd/logo.png", "res://addons/discord-rpc-gd/Logo_V2_No_Bg.png", "res://addons/discord-rpc-gd/plugin.gd", "res://addons/discord-rpc-gd/restart_window.tscn") include_filter="" exclude_filter="" export_path="export/windows/discord-rpc-godot-demo.exe" @@ -13,6 +15,7 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false +script_export_mode=2 [preset.0.options] @@ -20,10 +23,8 @@ custom_template/debug="" custom_template/release="" debug/export_console_wrapper=1 binary_format/embed_pck=true -texture_format/bptc=true -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false binary_format/architecture="x86_64" codesign/enable=false codesign/timestamp=true @@ -43,6 +44,8 @@ application/file_description="Discord RPC Godot Test" application/copyright="" application/trademarks="" application/export_angle=0 +application/export_d3d12=0 +application/d3d12_agility_sdk_multiarch=true ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" ssh_remote_deploy/port="22" @@ -60,12 +63,17 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue Remove-Item -Recurse -Force '{temp_dir}'" +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false [preset.1] name="Linux/X11" -platform="Linux/X11" +platform="Linux" runnable=true +advanced_options=false dedicated_server=false custom_features="" export_filter="all_resources" @@ -76,6 +84,7 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false +script_export_mode=2 [preset.1.options] @@ -83,10 +92,8 @@ custom_template/debug="" custom_template/release="" debug/export_console_wrapper=1 binary_format/embed_pck=true -texture_format/bptc=true -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false binary_format/architecture="x86_64" ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" @@ -100,12 +107,17 @@ unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") rm -rf \"{temp_dir}\"" +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false [preset.2] name="macOS" platform="macOS" runnable=true +advanced_options=false dedicated_server=false custom_features="" export_filter="all_resources" @@ -116,6 +128,7 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false +script_export_mode=2 [preset.2.options] @@ -136,6 +149,7 @@ application/copyright_localized={} application/min_macos_version="10.12" application/export_angle=0 display/high_res=true +application/additional_plist_content="" xcode/platform_build="14C18" xcode/sdk_version="13.1" xcode/sdk_build="22C55" @@ -194,6 +208,148 @@ privacy/network_volumes_usage_description="" privacy/network_volumes_usage_description_localized={} privacy/removable_volumes_usage_description="" privacy/removable_volumes_usage_description_localized={} +privacy/tracking_enabled=false +privacy/tracking_domains=PackedStringArray() +privacy/collected_data/name/collected=false +privacy/collected_data/name/linked_to_user=false +privacy/collected_data/name/used_for_tracking=false +privacy/collected_data/name/collection_purposes=0 +privacy/collected_data/email_address/collected=false +privacy/collected_data/email_address/linked_to_user=false +privacy/collected_data/email_address/used_for_tracking=false +privacy/collected_data/email_address/collection_purposes=0 +privacy/collected_data/phone_number/collected=false +privacy/collected_data/phone_number/linked_to_user=false +privacy/collected_data/phone_number/used_for_tracking=false +privacy/collected_data/phone_number/collection_purposes=0 +privacy/collected_data/physical_address/collected=false +privacy/collected_data/physical_address/linked_to_user=false +privacy/collected_data/physical_address/used_for_tracking=false +privacy/collected_data/physical_address/collection_purposes=0 +privacy/collected_data/other_contact_info/collected=false +privacy/collected_data/other_contact_info/linked_to_user=false +privacy/collected_data/other_contact_info/used_for_tracking=false +privacy/collected_data/other_contact_info/collection_purposes=0 +privacy/collected_data/health/collected=false +privacy/collected_data/health/linked_to_user=false +privacy/collected_data/health/used_for_tracking=false +privacy/collected_data/health/collection_purposes=0 +privacy/collected_data/fitness/collected=false +privacy/collected_data/fitness/linked_to_user=false +privacy/collected_data/fitness/used_for_tracking=false +privacy/collected_data/fitness/collection_purposes=0 +privacy/collected_data/payment_info/collected=false +privacy/collected_data/payment_info/linked_to_user=false +privacy/collected_data/payment_info/used_for_tracking=false +privacy/collected_data/payment_info/collection_purposes=0 +privacy/collected_data/credit_info/collected=false +privacy/collected_data/credit_info/linked_to_user=false +privacy/collected_data/credit_info/used_for_tracking=false +privacy/collected_data/credit_info/collection_purposes=0 +privacy/collected_data/other_financial_info/collected=false +privacy/collected_data/other_financial_info/linked_to_user=false +privacy/collected_data/other_financial_info/used_for_tracking=false +privacy/collected_data/other_financial_info/collection_purposes=0 +privacy/collected_data/precise_location/collected=false +privacy/collected_data/precise_location/linked_to_user=false +privacy/collected_data/precise_location/used_for_tracking=false +privacy/collected_data/precise_location/collection_purposes=0 +privacy/collected_data/coarse_location/collected=false +privacy/collected_data/coarse_location/linked_to_user=false +privacy/collected_data/coarse_location/used_for_tracking=false +privacy/collected_data/coarse_location/collection_purposes=0 +privacy/collected_data/sensitive_info/collected=false +privacy/collected_data/sensitive_info/linked_to_user=false +privacy/collected_data/sensitive_info/used_for_tracking=false +privacy/collected_data/sensitive_info/collection_purposes=0 +privacy/collected_data/contacts/collected=false +privacy/collected_data/contacts/linked_to_user=false +privacy/collected_data/contacts/used_for_tracking=false +privacy/collected_data/contacts/collection_purposes=0 +privacy/collected_data/emails_or_text_messages/collected=false +privacy/collected_data/emails_or_text_messages/linked_to_user=false +privacy/collected_data/emails_or_text_messages/used_for_tracking=false +privacy/collected_data/emails_or_text_messages/collection_purposes=0 +privacy/collected_data/photos_or_videos/collected=false +privacy/collected_data/photos_or_videos/linked_to_user=false +privacy/collected_data/photos_or_videos/used_for_tracking=false +privacy/collected_data/photos_or_videos/collection_purposes=0 +privacy/collected_data/audio_data/collected=false +privacy/collected_data/audio_data/linked_to_user=false +privacy/collected_data/audio_data/used_for_tracking=false +privacy/collected_data/audio_data/collection_purposes=0 +privacy/collected_data/gameplay_content/collected=false +privacy/collected_data/gameplay_content/linked_to_user=false +privacy/collected_data/gameplay_content/used_for_tracking=false +privacy/collected_data/gameplay_content/collection_purposes=0 +privacy/collected_data/customer_support/collected=false +privacy/collected_data/customer_support/linked_to_user=false +privacy/collected_data/customer_support/used_for_tracking=false +privacy/collected_data/customer_support/collection_purposes=0 +privacy/collected_data/other_user_content/collected=false +privacy/collected_data/other_user_content/linked_to_user=false +privacy/collected_data/other_user_content/used_for_tracking=false +privacy/collected_data/other_user_content/collection_purposes=0 +privacy/collected_data/browsing_history/collected=false +privacy/collected_data/browsing_history/linked_to_user=false +privacy/collected_data/browsing_history/used_for_tracking=false +privacy/collected_data/browsing_history/collection_purposes=0 +privacy/collected_data/search_hhistory/collected=false +privacy/collected_data/search_hhistory/linked_to_user=false +privacy/collected_data/search_hhistory/used_for_tracking=false +privacy/collected_data/search_hhistory/collection_purposes=0 +privacy/collected_data/user_id/collected=false +privacy/collected_data/user_id/linked_to_user=false +privacy/collected_data/user_id/used_for_tracking=false +privacy/collected_data/user_id/collection_purposes=0 +privacy/collected_data/device_id/collected=false +privacy/collected_data/device_id/linked_to_user=false +privacy/collected_data/device_id/used_for_tracking=false +privacy/collected_data/device_id/collection_purposes=0 +privacy/collected_data/purchase_history/collected=false +privacy/collected_data/purchase_history/linked_to_user=false +privacy/collected_data/purchase_history/used_for_tracking=false +privacy/collected_data/purchase_history/collection_purposes=0 +privacy/collected_data/product_interaction/collected=false +privacy/collected_data/product_interaction/linked_to_user=false +privacy/collected_data/product_interaction/used_for_tracking=false +privacy/collected_data/product_interaction/collection_purposes=0 +privacy/collected_data/advertising_data/collected=false +privacy/collected_data/advertising_data/linked_to_user=false +privacy/collected_data/advertising_data/used_for_tracking=false +privacy/collected_data/advertising_data/collection_purposes=0 +privacy/collected_data/other_usage_data/collected=false +privacy/collected_data/other_usage_data/linked_to_user=false +privacy/collected_data/other_usage_data/used_for_tracking=false +privacy/collected_data/other_usage_data/collection_purposes=0 +privacy/collected_data/crash_data/collected=false +privacy/collected_data/crash_data/linked_to_user=false +privacy/collected_data/crash_data/used_for_tracking=false +privacy/collected_data/crash_data/collection_purposes=0 +privacy/collected_data/performance_data/collected=false +privacy/collected_data/performance_data/linked_to_user=false +privacy/collected_data/performance_data/used_for_tracking=false +privacy/collected_data/performance_data/collection_purposes=0 +privacy/collected_data/other_diagnostic_data/collected=false +privacy/collected_data/other_diagnostic_data/linked_to_user=false +privacy/collected_data/other_diagnostic_data/used_for_tracking=false +privacy/collected_data/other_diagnostic_data/collection_purposes=0 +privacy/collected_data/environment_scanning/collected=false +privacy/collected_data/environment_scanning/linked_to_user=false +privacy/collected_data/environment_scanning/used_for_tracking=false +privacy/collected_data/environment_scanning/collection_purposes=0 +privacy/collected_data/hands/collected=false +privacy/collected_data/hands/linked_to_user=false +privacy/collected_data/hands/used_for_tracking=false +privacy/collected_data/hands/collection_purposes=0 +privacy/collected_data/head/collected=false +privacy/collected_data/head/linked_to_user=false +privacy/collected_data/head/used_for_tracking=false +privacy/collected_data/head/collection_purposes=0 +privacy/collected_data/other_data_types/collected=false +privacy/collected_data/other_data_types/linked_to_user=false +privacy/collected_data/other_data_types/used_for_tracking=false +privacy/collected_data/other_data_types/collection_purposes=0 ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" ssh_remote_deploy/port="22" diff --git a/project/main.gd b/project/main.gd index 68a649f..04d2d6e 100644 --- a/project/main.gd +++ b/project/main.gd @@ -1,12 +1,13 @@ extends Node func _ready() -> void: - set_activity() - DiscordRPC.connect("activity_join_request",_on_activity_join_request) - DiscordRPC.connect("activity_join",_on_activity_join) - DiscordRPC.connect("activity_spectate",_on_activity_spectate) - DiscordRPC.connect("relationships_init",_on_relationship_init) - DiscordRPC.connect("updated_relationship", _on_updated_relationship) + if GDExtensionManager.is_extension_loaded("res://addons/discord-rpc-gd/bin/discord-rpc-gd.gdextension"): + set_activity() + DiscordRPC.connect("activity_join_request",_on_activity_join_request) + DiscordRPC.connect("activity_join",_on_activity_join) + DiscordRPC.connect("activity_spectate",_on_activity_spectate) + DiscordRPC.connect("relationships_init",_on_relationship_init) + DiscordRPC.connect("updated_relationship", _on_updated_relationship) func set_activity() -> void: DiscordRPC.clear(false) @@ -39,11 +40,11 @@ func set_activity() -> void: var user_request: Dictionary; -func _on_activity_join_request(user_requesting) -> void: +func _on_activity_join_request(user_requesting: Dictionary) -> void: print(user_requesting) user_request = user_requesting -func _on_activity_join(secret) -> void: +func _on_activity_join(secret: String) -> void: if(DiscordRPC.join_secret != secret): DiscordRPC.current_party_size = clamp(int(secret) + 1, 0, DiscordRPC.max_party_size) DiscordRPC.party_id = secret.replace("j_","mylobbycanbeeverything_") @@ -52,12 +53,11 @@ func _on_activity_join(secret) -> void: DiscordRPC.spectate_secret = secret.replace("j_","s_") DiscordRPC.refresh() -func _on_activity_spectate(secret) -> void: +func _on_activity_spectate(secret: String) -> void: print(secret) -func _on_relationship_init(): +func _on_relationship_init() -> void: print("initialized") -func _on_updated_relationship(relationship): +func _on_updated_relationship(relationship: Dictionary) -> void: print(relationship) - diff --git a/project/plugin_manager.gd b/project/plugin_manager.gd new file mode 100644 index 0000000..61510e1 --- /dev/null +++ b/project/plugin_manager.gd @@ -0,0 +1 @@ +extends Node diff --git a/project/project.godot b/project/project.godot index 05a1491..960b09f 100644 --- a/project/project.godot +++ b/project/project.godot @@ -13,7 +13,7 @@ config_version=5 config/name="GDExtension DiscordRPC Test Project" config/tags=PackedStringArray("vaporvee") run/main_scene="res://main.tscn" -config/features=PackedStringArray("4.2") +config/features=PackedStringArray("4.3") boot_splash/bg_color=Color(0.25098, 0.305882, 0.929412, 1) boot_splash/image="res://assets/discordgodot_cover.png" boot_splash/fullsize=false @@ -21,7 +21,16 @@ config/icon="res://assets/Logo_V2.png" [autoload] -DiscordRPCLoader="*res://addons/discord-rpc-gd/nodes/discord_autoload.gd" +PluginManager="*res://plugin_manager.gd" + +[debug] + +gdscript/warnings/untyped_declaration=1 +gdscript/warnings/inferred_declaration=1 +gdscript/warnings/unsafe_property_access=1 +gdscript/warnings/unsafe_method_access=1 +gdscript/warnings/unsafe_cast=1 +gdscript/warnings/unsafe_call_argument=1 [display] @@ -31,10 +40,6 @@ window/size/resizable=false project/assembly_name="GDExtension Test Project" -[editor_plugins] - -enabled=PackedStringArray("res://addons/discord-rpc-gd/plugin.cfg") - [filesystem] import/blender/enabled=false