vaporvee/discord-rpc-godot
1
2
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases 20 Wiki Activity

reverted app_id "fix" and fixed addon file location issues

Browse Source
This commit is contained in:
Yannik
2023-05-12 18:47:28 +02:00
parent ded4f14ab6
commit 7c09847331
6 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding.dll
View File

Binary file not shown.

BIN
project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding_debug.dll
View File

Binary file not shown.

10
project/addons/discord-sdk-gd/export.gd
View File

@@ -4,11 +4,11 @@ extends EditorExportPlugin
func _export_file(path, type, features):
if features[2] == "windows":
if features[4] == "x86_64":
add_shared_object("res://addons/discord-sdk-gd/bin/windows/discord_game_sdk.dll",[],"/")
add_shared_object("bin/windows/discord_game_sdk.dll",[],"/")
elif features[4] == "x86":
add_shared_object("res://addons/discord-sdk-gd/bin/windows/discord_game_sdk_x86.dll",[],"/")
add_shared_object("bin/windows/discord_game_sdk_x86.dll",[],"/")
elif features[2] == "linux":
add_shared_object("res://addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk.so",[],"/")
add_shared_object("bin/linux/libdiscord_game_sdk.so",[],"/")
elif features[2] == "macos":
add_shared_object("res://addons/discord-sdk-gd/bin/macos/libdiscord_game_sdk.dylib",[],"/")
add_shared_object("res://addons/discord-sdk-gd/bin/macos/libdiscord_game_sdk_aarch64.dylib",[],"/")
add_shared_object("bin/macos/libdiscord_game_sdk.dylib",[],"/")
add_shared_object("bin/macos/libdiscord_game_sdk_aarch64.dylib",[],"/")

4
project/addons/discord-sdk-gd/plugin.gd
View File

@@ -1,11 +1,11 @@
@tool
extends EditorPlugin
const ExportPlugin = preload("res://addons/discord-sdk-gd/export.gd")
const ExportPlugin = preload("export.gd")
var loaded_exportplugin = ExportPlugin.new()
func _enter_tree():
add_autoload_singleton("updater_discordsdk", "res://addons/discord-sdk-gd/sdk_utility.gd")
add_autoload_singleton("updater_discordsdk", "sdk_utility.gd")
add_export_plugin(loaded_exportplugin)
func disable_plugin():

30
project/main.gd
View File

@@ -1,20 +1,18 @@
extends Node
func _ready():
# Discord_Activity.app_id = 1099618430065324082
# Discord_Activity.debug()
# Discord_Activity.app_id = 1099618430065324082
# Discord_Activity.details = "A demo activity by vaporvee#1231"
# Discord_Activity.state = "Checkpoint 23/23"
#
# Discord_Activity.large_image = "game"
# Discord_Activity.large_image_text = "Try it now!"
# Discord_Activity.small_image = "boss"
# Discord_Activity.small_image_text = "Fighting the end boss! D:"
#
# #Discord_Activity.start_timestamp = int(Time.get_unix_time_from_system())
# Discord_Activity.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # +1 hour in unix time
#
# Discord_Activity.refresh()
#
Discord_Activity.app_id = 1099618430065324082
Discord_Activity.details = "A demo activity by vaporvee#1231"
Discord_Activity.state = "Checkpoint 23/23"
Discord_Activity.large_image = "game"
Discord_Activity.large_image_text = "Try it now!"
Discord_Activity.small_image = "boss"
Discord_Activity.small_image_text = "Fighting the end boss! D:"
#Discord_Activity.start_timestamp = int(Time.get_unix_time_from_system())
Discord_Activity.end_timestamp = int(Time.get_unix_time_from_system()) + 3600 # +1 hour in unix time
Discord_Activity.refresh()
$Info.text = $Info.text.replace("{discordinfo}",str(Discord_Activity.get_is_discord_working())).replace("{id}",str(Discord_Activity.app_id)).replace("{details}",Discord_Activity.details).replace("{state}",Discord_Activity.state).replace("{lkey}",Discord_Activity.large_image).replace("{ltext}",Discord_Activity.large_image_text).replace("{skey}",Discord_Activity.small_image).replace("{stext}",Discord_Activity.small_image_text).replace("{stimestamp}",str(Discord_Activity.start_timestamp)).replace("{etimestamp}",str(Discord_Activity.end_timestamp))

11
src/discordgodot.cpp
View File

@@ -65,10 +65,6 @@ Discord_Activity::Discord_Activity()
{
ERR_FAIL_COND(singleton != nullptr);
singleton = this;
// intitalize core with discord's dummy application ID to make "is_discord_working" work anytime
app_id = 461618159171141643;
result = discord::Core::Create(app_id, DiscordCreateFlags_NoRequireDiscord, &core);
}
Discord_Activity::~Discord_Activity()
@@ -79,7 +75,7 @@ Discord_Activity::~Discord_Activity()
void Discord_Activity::coreupdate()
{
if (result == discord::Result::Ok && app_id > 0 && app_id != 461618159171141643)
if (result == discord::Result::Ok && app_id > 0)
{
::core->RunCallbacks();
}
@@ -111,9 +107,6 @@ void Discord_Activity::set_app_id(int64_t value)
}
int64_t Discord_Activity::get_app_id()
{
if (app_id = 461618159171141643)
return 0;
else
return app_id;
}
@@ -138,7 +131,7 @@ String Discord_Activity::get_details()
void Discord_Activity::refresh()
{
if (result == discord::Result::Ok && app_id > 0 && app_id != 461618159171141643)
if (result == discord::Result::Ok && app_id > 0)
{
core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {});
core->UserManager().OnCurrentUserUpdate.Connect([]()