diff --git a/Main.tscn b/Main.tscn index b7dca78..d00f549 100644 --- a/Main.tscn +++ b/Main.tscn @@ -775,10 +775,12 @@ offset_top = 24.0 offset_right = -328.0 offset_bottom = 80.0 grow_horizontal = 2 +focus_mode = 0 text = "Select Songs" script = ExtResource("27_f8wx0") [node name="SearchResults" parent="." instance=ExtResource("27_g8wmp")] +visible = false layout_mode = 1 anchors_preset = -1 anchor_left = 0.0 diff --git a/main.gd b/main.gd index fb9d0c1..26eb0a7 100644 --- a/main.gd +++ b/main.gd @@ -32,7 +32,7 @@ extends Control @onready var delete_confirm: ConfirmationDialog = $deleteConfirm @onready var search_bar: LineEdit = $SearchBar - +var DiscordUsername:String const PLAYLIST_DISPLAY = preload("res://PlaylistDisplay.tscn") const PAUSE = preload("res://Pause.png") @@ -109,6 +109,9 @@ func _ready() -> void: child.PlaylistSongs = Playlists[Playlist] playlists_holder.add_child(child) if data != null: + if data.has("DiscordUsername"): + DiscordUsername = data["DiscordUsername"] + print("stiff ",data) if data.has("Volume"): print(data["Volume"]) SetVolume(data["Volume"]) @@ -171,31 +174,49 @@ func _ready() -> void: DirectorySelected(Strin) PlaySongs() #PlaySongs() - DiscordRPC.app_id = 1276916292170809426 - DiscordRPC.refresh() - # this is boolean if everything worked - print("Discord working: " + str(DiscordRPC.get_is_discord_working())) - # Set the first custom text row of the activity here - if textSongs.size() >= CurrentIDX: - if textSongs.size() > CurrentIDX: - DiscordRPC.details = textSongs[CurrentIDX] - # Set the second custom text row of the activity here - DiscordRPC.state = "" - # Image key for small image from "Art Assets" from the Discord Developer website - DiscordRPC.large_image = "logo" - # Tooltip text for the large image - SplashStrings = ["the party just started!"] - var LText = SplashStrings.pick_random() - print(LText) - DiscordRPC.large_image_text = LText - # Image key for large image from "Art Assets" from the Discord Developer website - DiscordRPC.small_image = "" - # Tooltip text for the small image - DiscordRPC.small_image_text = "Nothing" - # "02:41 elapsed" timestamp for the activity - # Always refresh after changing the values! - DiscordRPC.refresh() + setUpDiscord() + for child in get_children(true): + if child is Control: + child.focus_mode = child is LineEdit + +func setUpDiscord(): + DiscordRPC.app_id = 13 + print("stibidiii ",DiscordRPC.get_current_user()) + if DiscordUsername == "vrenthusiest" or DiscordRPC.get_current_user().get("username") == "vrenthusiest": + DiscordRPC.app_id = 1302002529378369568 + else: + DiscordRPC.app_id = 1276916292170809426 + DiscordRPC.refresh() + print("stiff chicks ",DiscordRPC.get_current_user()) + DiscordUsername = DiscordRPC.get_current_user().get("username") + DiscordRPC.refresh() + if DiscordRPC.app_id == 1302002529378369568: + DiscordRPC.large_image = "changed" + DiscordRPC.start_timestamp = Time.get_unix_time_from_system() + else: + DiscordRPC.large_image = "logo" + # this is boolean if everything worked + print("Discord working: " + str(DiscordRPC.get_is_discord_working())) + # Set the first custom text row of the activity here + if textSongs.size() >= CurrentIDX: + if textSongs.size() > CurrentIDX: + DiscordRPC.details = textSongs[CurrentIDX] + # Set the second custom text row of the activity here + DiscordRPC.state = "" + # Image key for small image from "Art Assets" from the Discord Developer website + # Tooltip text for the large image + SplashStrings = ["the party just started!"] + var LText = SplashStrings.pick_random() + print(LText) + DiscordRPC.large_image_text = LText + # Image key for large image from "Art Assets" from the Discord Developer website + DiscordRPC.small_image = "" + # Tooltip text for the small image + DiscordRPC.small_image_text = "Nothing" + # "02:41 elapsed" timestamp for the activity + # Always refresh after changing the values! + DiscordRPC.refresh() func deletesong(idx:int): var currentDir:String= CurrentDir @@ -235,8 +256,9 @@ func SongDragStopped(Changed:bool): pausePlay() UpdateProgressSlider = true - DiscordRPC.start_timestamp = int(Time.get_unix_time_from_system() - (current_progress.value * CurrentSongLenth / current_progress.max_value)) - DiscordRPC.refresh() + if DiscordRPC.app_id != 1302002529378369568: + DiscordRPC.start_timestamp = int(Time.get_unix_time_from_system() - (current_progress.value * CurrentSongLenth / current_progress.max_value)) + DiscordRPC.refresh() func SongDragStarted(): UpdateProgressSlider = false @@ -308,16 +330,15 @@ func PlaySongs(): if music_player.playing: Paused = true - DiscordRPC.state = "Paused" music_player.stream_paused = true play_list.icon = PLAY - print(DiscordRPC.get_current_user()) + if DiscordRPC.app_id != 1302002529378369568: + DiscordRPC.state = "Paused" + print(DiscordRPC.get_current_user()) else: - DiscordRPC.start_timestamp = int(Time.get_unix_time_from_system() - (current_progress.value * CurrentSongLenth / current_progress.max_value)) - print(DiscordRPC.get_current_user()) - if DiscordRPC.get_current_user().get("username") == "_bucketofchicken": - DiscordRPC.state = "i made the music player btw" - else: + if DiscordRPC.app_id != 1302002529378369568: + DiscordRPC.start_timestamp = int(Time.get_unix_time_from_system() - (current_progress.value * CurrentSongLenth / current_progress.max_value)) + print(DiscordRPC.get_current_user()) DiscordRPC.state = "Listening To Music" Paused = false music_player.stream_paused = false @@ -345,7 +366,8 @@ func PlaySongs(): if !CurrentDir.ends_with(CurrentPlaylist): GetSongs(PlaylistsLocation[CurrentPlaylist]) var CurrentSongDir:String = PlaylistsLocation[CurrentPlaylist] + "/" + textSongs[index] - DiscordRPC.details = textSongs[index].replace(".mp3","") + if DiscordRPC.app_id != 1302002529378369568: + DiscordRPC.details = textSongs[index].replace(".mp3","") print(CurrentSongDir) var sonnname:String = textSongs[index] sonnname = sonnname.replace(".mp3", "") @@ -448,6 +470,9 @@ func _process(_delta: float) -> void: BackroundSetup = true if currentSaveTime < 0: currentSaveTime = SaveInterval + + DiscordUsername = DiscordRPC.get_current_user().get("username") + print(DiscordRPC.get_current_user()) SaveEverything() print("yoo") @warning_ignore("integer_division") @@ -462,13 +487,15 @@ func _process(_delta: float) -> void: # "59:59 remaining" timestamp for the activity if music_player.playing: TimeSpentListening += _delta - DiscordRPC.state = "Listening To Music" CurrentPausedIndicatorShaderIntensity = lerp(CurrentPausedIndicatorShaderIntensity,0.0,0.1) + if DiscordRPC.app_id != 1302002529378369568: + DiscordRPC.state = "Listening To Music" else: - DiscordRPC.start_timestamp = int(0) - DiscordRPC.state = "Paused" - if DiscordRPC.get_is_discord_working(): - DiscordRPC.refresh() + if DiscordRPC.app_id != 1302002529378369568: + DiscordRPC.start_timestamp = int(0) + DiscordRPC.state = "Paused" + if DiscordRPC.get_is_discord_working(): + DiscordRPC.refresh() CurrentPausedIndicatorShaderIntensity = lerp(CurrentPausedIndicatorShaderIntensity,1.0,0.1) if DiscordRichPresenceEnabled: DiscordRPC.run_callbacks() @@ -508,30 +535,31 @@ func _process(_delta: float) -> void: func UpdateSplashes(): - if DiscordRPC.get_is_discord_working(): - SplashStrings = ["Total listening time: %s!" % str(str(int(TimeSpentListening/60)/60 ) - + "h : " + str((int(TimeSpentListening) / 60) % 60) + "m : " + - str(int(TimeSpentListening) % 60) + "s"), - "Version: %s" % version.text,"🤷‍♂️","This Changes every ~11 seconds", - "hello everybody my name is %s" % DiscordRPC.get_current_user()["username"], - "wash your dishes, i know you got some","Running on %s" % OS.get_distribution_name(), - "%s is cooking" % DiscordRPC.get_current_user()["username"], "debugging" if OS.has_feature("editor") else "Release build", - "this user chose to show you all this info","Playing a Banger", - ":steamhappy:","This is a sign that crocodiles live in water", - "Space? SPACE?! SPAAAAAAAAAAAAACE!!!", - "i love gd colonge", - "listening with reverb" if settings_menu_child.reverb_check.button_pressed else - "not listening with reverb","the cake is edible", - "what a great song!","this message is useless", - "stop reading these","why are you reading these", - "hello from mars", "hello to mars","there is a fly in my room", - "yippee!","What, are they allergic to bathtubs or something", - "Did you know, a 737 can land with up to 33knots of wind!", - "Welcome to todays JahresSchau", - "ram is very useful","your cpu is tasty","main course: Nvidia GPU", - "SCHOTTLAND FUER IMMER","i eat airborne vehicles","linus trovalds", - "™","＼（〇_ｏ）／","Nuh Uh!","Yuh Huh","Breaching.", - "I get a narcissistic injury when the wall ignores me","totally not using %s" % version.text] + if DiscordRPC.app_id != 1302002529378369568: + if DiscordRPC.get_is_discord_working(): + SplashStrings = ["Total listening time: %s!" % str(str(int(TimeSpentListening/60)/60 ) + + "h : " + str((int(TimeSpentListening) / 60) % 60) + "m : " + + str(int(TimeSpentListening) % 60) + "s"), + "Version: %s" % version.text,"🤷‍♂️","This Changes every ~11 seconds", + "hello everybody my name is %s" % DiscordRPC.get_current_user()["username"], + "wash your dishes, i know you got some","Running on %s" % OS.get_distribution_name(), + "%s is cooking" % DiscordRPC.get_current_user()["username"], "debugging" if OS.has_feature("editor") else "Release build", + "this user chose to show you all this info","Playing a Banger", + ":steamhappy:","This is a sign that crocodiles live in water", + "Space? SPACE?! SPAAAAAAAAAAAAACE!!!", + "i love gd colonge", + "listening with reverb" if settings_menu_child.reverb_check.button_pressed else + "not listening with reverb","the cake is edible", + "what a great song!","this message is useless", + "stop reading these","why are you reading these", + "hello from mars", "hello to mars","there is a fly in my room", + "yippee!","What, are they allergic to bathtubs or something", + "Did you know, a 737 can land with up to 33knots of wind!", + "Welcome to todays JahresSchau", + "ram is very useful","your cpu is tasty","main course: Nvidia GPU", + "SCHOTTLAND FUER IMMER","i eat airborne vehicles","linus trovalds", + "™","＼（〇_ｏ）／","Nuh Uh!","Yuh Huh","Breaching.", + "I get a narcissistic injury when the wall ignores me","totally not using %s" % version.text] func SaveEverything(): @@ -554,7 +582,8 @@ func SaveEverything(): "CompressionRatio" : settings_menu_child.ratio_slider.value , "CompressionGain" : settings_menu_child.gain_slider.value, "CurrentCustomBackroundImageDirectory" : CurrentCustomBackroundImageDirectory, - "PlayAllLists" : PlayAllLists + "PlayAllLists" : PlayAllLists, + "DiscordUsername" : DiscordRPC.get_current_user().get("username") } saveUserdata(Data) savePlaylists() diff --git a/playlist_display.gd b/playlist_display.gd index 3ed238e..6b92783 100644 --- a/playlist_display.gd +++ b/playlist_display.gd @@ -6,7 +6,7 @@ extends Control @onready var options_dropdown: MenuButton = $HSplitContainer/HBoxContainer/OptionsDropdown @onready var confirmation: ConfirmationDialog = $ConfirmationDialog -@onready var Parent:MainScene = get_tree().root.get_child(2) +@onready var Parent:MainScene = get_tree().root.get_child(3) @export var Current:bool var PlaylistLocation:String = "" diff --git a/project.godot b/project.godot index d7d7f24..accda60 100644 --- a/project.godot +++ b/project.godot @@ -24,6 +24,7 @@ config/windows_native_icon="res://addons/godot-yt-dlp/src/favicon2.ico" YtDlp="*res://addons/godot-yt-dlp/src/yt_dlp.gd" MusicMetadataAutoload="*res://MusicMeta-f98d7384de3e2e658dcba3f5b06fb5b57ac2c73c/MusicMeta.gd" +DiscordRPCLoader="*res://addons/discord-rpc-gd/nodes/discord_autoload.gd" [display] diff --git a/update_checker.gd b/update_checker.gd index 9339393..a3e912a 100644 --- a/update_checker.gd +++ b/update_checker.gd @@ -1,5 +1,5 @@ extends Control -@onready var Parent:MainScene = get_tree().root.get_child(2) +@onready var Parent:MainScene = get_tree().root.get_child(3) @onready var version: Label = $"../Version" @onready var http_request := $HTTPRequest as HTTPRequest diff --git a/yt_tab_button.gd b/yt_tab_button.gd index b26185b..88ea45a 100644 --- a/yt_tab_button.gd +++ b/yt_tab_button.gd @@ -11,7 +11,7 @@ var Target:float = 50 var downloadList:bool = false signal ContinueProcess -@onready var Parent:MainScene = get_tree().root.get_child(2) +@onready var Parent:MainScene = get_tree().root.get_child(3) # Called when the node enters the scene tree for the first time. func _ready() -> void: