Merge pull request #91 from riconuts/song-bs

SongMetadata.songName and a bunch of Song code stuff
riconuts · Feb 21, 2025 · 15a5567 · 15a5567
2 parents 6b5bd0a + 9a518c2
commit 15a5567
Show file tree

Hide file tree

Showing 8 changed files with 294 additions and 248 deletions.
diff --git a/default_content/base-game/songs/milf/metadata.json b/default_content/base-game/songs/milf/metadata.json
@@ -1,3 +1,4 @@
 {
+	"songName": "M.I.L.F",
 	"artist": "Kawai Sprite"
 }
diff --git a/source/funkin/Paths.hx b/source/funkin/Paths.hx
@@ -252,7 +252,7 @@ class Paths
 
 	inline static public function sound(key:String, ?library:String):Null<Sound>
 	{
-		return returnSound('sounds', key, library);
+		return returnFolderSound('sounds', key, library);
 	}
 
 	inline static public function soundRandom(key:String, min:Int, max:Int, ?library:String)
@@ -262,12 +262,12 @@ class Paths
 
 	inline static public function music(key:String, ?library:String):Null<Sound>
 	{
-		return returnSound('music', key, library);
+		return returnFolderSound('music', key, library);
 	}
 
 	inline static public function track(song:String, track:String):Null<Sound>
 	{
-		return returnSound('songs', '${formatToSongPath(song)}/$track');
+		return returnFolderSound('songs', '${formatToSongPath(song)}/$track');
 	}
 
 	inline static public function voices(song:String):Null<Sound>
@@ -528,29 +528,30 @@ class Paths
 		return getPath('$path/$key.$SOUND_EXT');
 	}
 
-	public static function returnSound(path:String, key:String, ?library:String)
-	{
-		var gottenPath:String = soundPath(path, key, library);
-
-		if (currentTrackedSounds.exists(gottenPath)) {
-			if (!localTrackedAssets.contains(gottenPath))
-				localTrackedAssets.push(gottenPath);
+	inline public static function returnFolderSound(path:String, key:String, ?library:String)
+		return returnSound(soundPath(path, key, library), library);
 
-			return currentTrackedSounds.get(gottenPath);
+	public static function returnSound(path:String, ?library:String)
+	{	
+		if (currentTrackedSounds.exists(path)) {
+			if (!localTrackedAssets.contains(path))
+				localTrackedAssets.push(path);
+
+			return currentTrackedSounds.get(path);
 		}
 
-		var sound = getSound(gottenPath);
+		var sound = getSound(path);
 		if (sound != null) {
-			currentTrackedSounds.set(gottenPath, sound);
+			currentTrackedSounds.set(path, sound);
 
-			if (!localTrackedAssets.contains(gottenPath))
-				localTrackedAssets.push(gottenPath);	
+			if (!localTrackedAssets.contains(path))
+				localTrackedAssets.push(path);	
 
 			return sound;
 		}
 
 		if (Main.showDebugTraces)
-			trace('sound $path, $key => $gottenPath returned null');
+			trace('sound $path returned null');
 
 		return null;
 	}
@@ -571,6 +572,9 @@ class Paths
 		return null;
 	}
 
+	public static inline function getFolderPath(folder:String = ""):String
+		return (folder == "") ? getPreloadPath() : mods(folder);
+
 	////	
 	public static var currentModDirectory(default, set):String = '';
 	static function set_currentModDirectory(v:String){

diff --git a/source/funkin/data/Cache.hx b/source/funkin/data/Cache.hx
@@ -198,11 +198,11 @@ class Cache
 			default:
 				Paths.image(toLoad.path, toLoad.library);
 			case SOUND:
-				Paths.returnSound("sounds", toLoad.path, toLoad.library);
+				Paths.returnFolderSound("sounds", toLoad.path, toLoad.library);
 			case MUSIC:
-				Paths.returnSound("music", toLoad.path, toLoad.library);
+				Paths.returnFolderSound("music", toLoad.path, toLoad.library);
 			case SONG:
-				Paths.returnSound("songs", toLoad.path, toLoad.library);
+				Paths.returnFolderSound("songs", toLoad.path, toLoad.library);
 		}
 
 		#if traceLoading

diff --git a/source/funkin/data/FNFTroll.hx b/source/funkin/data/FNFTroll.hx
@@ -212,7 +212,7 @@ class FNFTroll extends FNFLegacyBasic<TrollJSONFormat> {
 		}
 
 		data.song.metadata ??= {};
-		//data.song.metadata.songName = chart.meta.title;
+		data.song.metadata.songName = chart.meta.title;
 		data.song.metadata.artist = chart.meta.extraData.get("SONG_ARTIST");
 		data.song.metadata.charter = chart.meta.extraData.get("SONG_CHARTER");