Compare commits

...

2 Commits

Author SHA1 Message Date
Bucket Of Chicken f28d92a498 fixed discord not being disabled when the button is unchecked 2025-05-18 21:09:13 +02:00
Bucket Of Chicken 750d0f844a cough cough 2025-05-17 23:32:04 +02:00
5 changed files with 48 additions and 43 deletions
+23 -23
View File
@@ -1,43 +1,43 @@
[gd_scene load_steps=80 format=3 uid="uid://b2sygl55s6fng"]
[ext_resource type="Script" uid="uid://cvqefw0g6ala7" path="res://main.gd" id="1_ubs1p"]
[ext_resource type="Script" path="res://main.gd" id="1_ubs1p"]
[ext_resource type="Texture2D" uid="uid://b8on1case224h" path="res://LoopPressed.png" id="2_iolk5"]
[ext_resource type="Texture2D" uid="uid://daq8wnhtscpjl" path="res://Skip.png" id="3_4vx67"]
[ext_resource type="Script" uid="uid://b4mmbu4weiab5" path="res://wallpaper_manager.gd" id="4_y372l"]
[ext_resource type="Script" path="res://wallpaper_manager.gd" id="4_y372l"]
[ext_resource type="Texture2D" uid="uid://cmr1ij4s7xa27" path="res://IMG_20241015_162213_033(1).jpg" id="5_8v24s"]
[ext_resource type="Texture2D" uid="uid://38c8dfym0svn" path="res://Loop.png" id="5_c2g63"]
[ext_resource type="Texture2D" uid="uid://cekkhyppj88xi" path="res://Headphones.png" id="6_3mi6c"]
[ext_resource type="Texture2D" uid="uid://ba5wdmchyy50n" path="res://nighttime-in-the-hills-henry-porter.jpg" id="6_8abnc"]
[ext_resource type="Texture2D" uid="uid://2vacx4h6vn46" path="res://IMG_20241015_175925_722(1).jpg" id="6_hvupl"]
[ext_resource type="Texture2D" uid="uid://ctb4s2nks73rx" path="res://Play.png" id="8_5v7u3"]
[ext_resource type="Shader" uid="uid://cv5aoaprqfuhx" path="res://CoverShader.gdshader" id="8_4531v"]
[ext_resource type="Shader" uid="uid://dgwslfj43mu1y" path="res://Background1.gdshader" id="8_xtnau"]
[ext_resource type="Shader" uid="uid://b8g2xx06g626m" path="res://Main.gdshader" id="10_20857"]
[ext_resource type="Shader" path="res://CoverShader.gdshader" id="8_4531v"]
[ext_resource type="Shader" path="res://Background1.gdshader" id="8_xtnau"]
[ext_resource type="Shader" path="res://Main.gdshader" id="10_20857"]
[ext_resource type="Texture2D" uid="uid://b00wlqid2jdvi" path="res://BigLogo.png" id="10_xnj6a"]
[ext_resource type="Texture2D" uid="uid://0r1tx6l1lc6x" path="res://settingscog.png" id="11_esjel"]
[ext_resource type="Script" uid="uid://dg68hvw773xu6" path="res://cover.gd" id="12_3v50a"]
[ext_resource type="Script" uid="uid://bxc2fqwlm5ea5" path="res://playlists_panel.gd" id="12_8ie8y"]
[ext_resource type="Script" uid="uid://xnlvpxy2jwxb" path="res://settings_button.gd" id="12_073mb"]
[ext_resource type="Script" path="res://cover.gd" id="12_3v50a"]
[ext_resource type="Script" path="res://playlists_panel.gd" id="12_8ie8y"]
[ext_resource type="Script" path="res://settings_button.gd" id="12_073mb"]
[ext_resource type="Texture2D" uid="uid://myq6n4bshduj" path="res://search.png" id="12_cv2gm"]
[ext_resource type="Script" uid="uid://cchutywgopaq4" path="res://search_bar.gd" id="12_mr42x"]
[ext_resource type="Script" uid="uid://dv2vjibopktug" path="res://select_playlist.gd" id="12_of5fe"]
[ext_resource type="Script" uid="uid://c2t3ignwqoplj" path="res://search_toggle.gd" id="13_5illk"]
[ext_resource type="Script" path="res://search_bar.gd" id="12_mr42x"]
[ext_resource type="Script" path="res://select_playlist.gd" id="12_of5fe"]
[ext_resource type="Script" path="res://search_toggle.gd" id="13_5illk"]
[ext_resource type="PackedScene" uid="uid://dqg674t6kun4e" path="res://Settings.tscn" id="13_7atry"]
[ext_resource type="Script" uid="uid://bsnt1irskti8d" path="res://create_playlists_menu.gd" id="13_asgvh"]
[ext_resource type="Script" path="res://create_playlists_menu.gd" id="13_asgvh"]
[ext_resource type="Texture2D" uid="uid://b5eims5ucn81r" path="res://Loding.png" id="13_de5ej"]
[ext_resource type="Script" uid="uid://ctj7miuviibin" path="res://volume_button.gd" id="14_7q3ja"]
[ext_resource type="Script" path="res://volume_button.gd" id="14_7q3ja"]
[ext_resource type="Texture2D" uid="uid://1rstn6r2wisy" path="res://X.png" id="14_mioc4"]
[ext_resource type="Script" uid="uid://bx75h6xic1hi7" path="res://Spinning.gd" id="14_rhw4k"]
[ext_resource type="Script" uid="uid://chdf40dyj73pq" path="res://yt_tab_button.gd" id="16_2t15p"]
[ext_resource type="Script" uid="uid://bn0iqqmor3b2b" path="res://help_button.gd" id="17_4b8oh"]
[ext_resource type="Script" uid="uid://dkjp64f01dpf4" path="res://songs_menu.gd" id="27_f8wx0"]
[ext_resource type="Script" path="res://Spinning.gd" id="14_rhw4k"]
[ext_resource type="Script" path="res://yt_tab_button.gd" id="16_2t15p"]
[ext_resource type="Script" path="res://help_button.gd" id="17_4b8oh"]
[ext_resource type="Script" path="res://songs_menu.gd" id="27_f8wx0"]
[ext_resource type="PackedScene" uid="uid://bel6i6wdbexw4" path="res://search_results.tscn" id="27_g8wmp"]
[ext_resource type="Texture2D" uid="uid://bmbxyma4ra46p" path="res://Download.png" id="29_v44vi"]
[ext_resource type="Script" uid="uid://drqx8pjalsxqr" path="res://update_checker.gd" id="30_byc5i"]
[ext_resource type="Script" uid="uid://cf1rsngucr7e2" path="res://CustomButtonColor.gd" id="32_pwgec"]
[ext_resource type="Script" uid="uid://cbdcs7oie12g5" path="res://loading_failed_screen.gd" id="37_mkkhu"]
[ext_resource type="Script" path="res://update_checker.gd" id="30_byc5i"]
[ext_resource type="Script" path="res://CustomButtonColor.gd" id="32_pwgec"]
[ext_resource type="Script" path="res://loading_failed_screen.gd" id="37_mkkhu"]
[ext_resource type="AudioStream" uid="uid://n8g3v41u2u48" path="res://Error.wav" id="38_nkjlp"]
[ext_resource type="Script" uid="uid://n3koklp0funr" path="res://birthday_container.gd" id="38_pitc3"]
[ext_resource type="Script" path="res://birthday_container.gd" id="38_pitc3"]
[ext_resource type="AudioStream" uid="uid://bwfw3l3iyv67o" path="res://roblox win sound effect.mp3" id="39_3er0p"]
[ext_resource type="PackedScene" uid="uid://n7cnapaftfse" path="res://playing_now_window.tscn" id="40_ismud"]
@@ -915,7 +915,7 @@ offset_left = -64.0
offset_top = -23.0
grow_horizontal = 0
grow_vertical = 0
text = "v1.5.4"
text = "v1.5.5"
horizontal_alignment = 2
[node name="SettingsButton" type="Button" parent="."]
@@ -1288,11 +1288,11 @@ script = ExtResource("38_pitc3")
[node name="BirthdayParticles" type="GPUParticles2D" parent="BirthdayContainer"]
emitting = false
amount = 120
process_material = SubResource("ParticleProcessMaterial_cr82i")
lifetime = 5.0
one_shot = true
explosiveness = 0.9
visibility_rect = Rect2(-750, -750, 1500, 1000)
process_material = SubResource("ParticleProcessMaterial_cr82i")
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="BirthdayContainer"]
stream = ExtResource("39_3er0p")
+2 -2
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=10 format=3 uid="uid://dqg674t6kun4e"]
[ext_resource type="Script" uid="uid://vnpslgl788du" path="res://settings.gd" id="1_uaa7d"]
[ext_resource type="Script" uid="uid://kt7n1epi3ng8" path="res://eq_settings.gd" id="2_1n4m6"]
[ext_resource type="Script" path="res://settings.gd" id="1_uaa7d"]
[ext_resource type="Script" path="res://eq_settings.gd" id="2_1n4m6"]
[ext_resource type="Texture2D" uid="uid://1rstn6r2wisy" path="res://X.png" id="2_iuivb"]
[ext_resource type="Texture2D" uid="uid://pgij783wgbhn" path="res://File.png" id="2_jmen4"]
+20 -16
View File
@@ -121,9 +121,6 @@ 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"])
@@ -141,6 +138,13 @@ func _ready() -> void:
if data.has("DiscordRichPresenceEnabled"):
settings_menu_child.discord_rich_presence_button.set_pressed_no_signal(data["DiscordRichPresenceEnabled"])
DiscordRichPresenceEnabled = data["DiscordRichPresenceEnabled"]
if data["DiscordRichPresenceEnabled"]:
setUpDiscord()
if data.has("DiscordUsername"):
if data["DiscordUsername"]:
if DiscordRichPresenceEnabled:
DiscordUsername = data["DiscordUsername"]
print("stiff ",data)
if data.has("ReverbEnabled") :
settings_menu_child.reverb_check.button_pressed = data["ReverbEnabled"]
if data.has("ReverbRoomSize") :
@@ -189,7 +193,6 @@ func _ready() -> void:
PlaySongs()
#PlaySongs()
setUpDiscord()
for child in get_children(true):
if child is Control:
child.focus_mode = child is LineEdit
@@ -490,21 +493,22 @@ func _process(_delta: float) -> void:
BackroundSetup = true
if currentSaveTime < 0:
currentSaveTime = SaveInterval
DiscordUsername = DiscordRPC.get_current_user().get("username")
if DiscordRichPresenceEnabled:
DiscordUsername = DiscordRPC.get_current_user().get("username")
if !LoadingSaveFailed:
SaveEverything()
@warning_ignore("integer_division")
if DiscordRPC.large_image != "nullbody":
UpdateSplashes()
if DiscordRPC.get_is_discord_working():
print(DiscordRPC.get_current_user()["username"])
print(TimeSpentListening)
var LText = SplashStrings.pick_random()
if DiscordRPC.large_image != "nullbody":
DiscordRPC.large_image_text = LText
if DiscordRPC.get_is_discord_working():
DiscordRPC.refresh()
if DiscordRichPresenceEnabled:
if DiscordRPC.large_image != "nullbody":
UpdateSplashes()
if DiscordRPC.get_is_discord_working():
print(DiscordRPC.get_current_user()["username"])
print(TimeSpentListening)
var LText = SplashStrings.pick_random()
if DiscordRPC.large_image != "nullbody":
DiscordRPC.large_image_text = LText
if DiscordRPC.get_is_discord_working():
DiscordRPC.refresh()
# "59:59 remaining" timestamp for the activity
if music_player.playing:
TimeSpentListening += _delta
+2 -2
View File
@@ -12,11 +12,11 @@ config_version=5
config/name="Simplaudio"
run/main_scene="res://Main.tscn"
config/features=PackedStringArray("4.5", "Forward Plus")
config/features=PackedStringArray("4.3", "Forward Plus")
run/low_processor_mode=true
boot_splash/bg_color=Color(0, 0, 0, 1)
boot_splash/use_filter=false
boot_splash/image="res://BigLogo.png"
boot_splash/use_filter=false
config/icon="res://Logo2.png"
config/windows_native_icon="res://addons/godot-yt-dlp/src/favicon2.ico"
+1
View File
@@ -148,6 +148,7 @@ func _on_discord_rich_presence_button_toggled(toggled_on: bool) -> void:
Parent.DiscordRichPresenceEnabled = true
else:
Parent.DiscordRichPresenceEnabled = false
Parent.setUpDiscord()
Parent.SaveEverything()