From 6c47d255b0ab166bac2cc5ddd6bd5caf1d4b812b Mon Sep 17 00:00:00 2001
From: CST1229 <68464103+CST1229@users.noreply.github.com>
Date: Mon, 3 Nov 2025 21:10:41 +0100
Subject: [PATCH] Fix some remaining user:// uses to use Global.config_dir
 (#702)

---
 Scripts/Classes/Components/ResourceSetterNew.gd | 4 ++--
 Scripts/Classes/Singletons/Global.gd            | 2 +-
 Scripts/UI/CustomLevelContainer.gd              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Scripts/Classes/Components/ResourceSetterNew.gd b/Scripts/Classes/Components/ResourceSetterNew.gd
index 7ff9fd1b..2b5390cb 100644
--- a/Scripts/Classes/Components/ResourceSetterNew.gd
+++ b/Scripts/Classes/Components/ResourceSetterNew.gd
@@ -297,8 +297,8 @@ func get_variation_json(json := {}) -> Dictionary:
 	return json
 
 func get_config_file(resource_pack := "") -> void:
-	if FileAccess.file_exists("user://resource_packs/" + resource_pack + "/config.json"):
-		config_to_use = JSON.parse_string(FileAccess.open("user://resource_packs/" + resource_pack + "/config.json", FileAccess.READ).get_as_text())
+	if FileAccess.file_exists(Global.config_path.path_join("resource_packs/" + resource_pack + "/config.json")):
+		config_to_use = JSON.parse_string(FileAccess.open(Global.config_path.path_join("resource_packs/" + resource_pack + "/config.json"), FileAccess.READ).get_as_text())
 		if config_to_use == null:
 			Global.log_error("Error parsing Config File! (" + resource_pack + ")")
 			config_to_use = {}
diff --git a/Scripts/Classes/Singletons/Global.gd b/Scripts/Classes/Singletons/Global.gd
index 39f8faf9..7c6b48a7 100644
--- a/Scripts/Classes/Singletons/Global.gd
+++ b/Scripts/Classes/Singletons/Global.gd
@@ -482,7 +482,7 @@ func sanitize_string(string := "") -> String:
 	return string
 
 func get_base_asset_version() -> int:
-	var json = JSON.parse_string(FileAccess.open("user://BaseAssets/pack_info.json", FileAccess.READ).get_as_text())
+	var json = JSON.parse_string(FileAccess.open(Global.config_path.path_join("BaseAssets/pack_info.json"), FileAccess.READ).get_as_text())
 	var version = json.version
 	return get_version_num_int(version)
 
diff --git a/Scripts/UI/CustomLevelContainer.gd b/Scripts/UI/CustomLevelContainer.gd
index 29eee262..da20ceca 100644
--- a/Scripts/UI/CustomLevelContainer.gd
+++ b/Scripts/UI/CustomLevelContainer.gd
@@ -56,8 +56,8 @@ func _ready() -> void:
 	update_visuals()
 
 func update_visuals() -> void:
-	if is_downloaded and FileAccess.file_exists("user://custom_levels/downloaded/thumbnails/" + level_id + ".png"):
-		thumbnail = ImageTexture.create_from_image(Image.load_from_file("user://custom_levels/downloaded/thumbnails/" + level_id + ".png"))
+	if is_downloaded and FileAccess.file_exists(Global.config_path.path_join("custom_levels/downloaded/thumbnails/" + level_id + ".png")):
+		thumbnail = ImageTexture.create_from_image(Image.load_from_file(Global.config_path.path_join("custom_levels/downloaded/thumbnails/" + level_id + ".png")))
 		%Thumbnail.texture = thumbnail
 		%LevelIcon.hide()
 		%Thumbnail.show()