eeeeeeeeeeeeeeeeeeeeee

Author: Yuta12342

source/psychlua/FunkinLua.hx

@@ -225,9 +225,17 @@ class FunkinLua {
 		set('mania', PlayState.mania);
 		set('trueMania', Note.ammo[PlayState.mania]);
 
-		// function addProtectedCallback(lua:State, name:String, func:Dynamic) {
-			
-		// }
+		function addProtectedCallback(lua:State, name:String, func:Dynamic) {
+			Lua_helper.add_callback(lua, name, function(...args:Array<Dynamic>) {
+				try {
+					func.apply(this, args);
+				}
+				catch (e:Dynamic) {
+					luaTrace('Error in Lua callback "' + name + '": ' + e, false, false, FlxColor.RED);
+				}
+			});
+		}
+		}
 
 		//Fun cursor things for lua
 		Lua_helper.add_callback(lua, "getCursorMode", function()

source/states/freeplay/OsuFreeplayState.hx

@@ -427,31 +427,37 @@ class OsuFreeplayState extends MusicBeatState
 		for (i in 0...FreeplayManager.songList.length)
 		{
 
+			var week:WeekData = WeekData.weeksLoaded.get(WeekData.weeksList[FreeplayManager.songList[i].week]);
+
+			var difficulties:Array<String> = Difficulty.loadFromWeek(week);
+
+			for (j in 0...difficulties.length)
+			{
+
+
 			var songBox:SongBox = new SongBox(320, 100);
 			songBox.loadGraphic(Paths.image('OSUState/bars/background2'));
 			songBox.setGraphicSize(650, 100);
 			songBox.setColorTransform(-1, -1, -1, 1, FreeplayManager.songList[i].color[0][0], FreeplayManager.songList[i].color[0][1], FreeplayManager.songList[i].color[0][2], 1);
-			songBox.ID = i;
+			songBox.ID = i + j;
 			this.songBox.add(songBox);
 
 			var icon:HealthIcon = new HealthIcon(FreeplayManager.songList[i].songCharacter, false);
 			icon.setPosition(320, 100);
-			icon.ID = i;
+			icon.ID = i + j;
 			icon.setGraphicSize(Std.int(icon.width / 1.7), Std.int(icon.height / 1.7));
 			this.iconGrp.add(icon);
 
 			try {metadata = FreeplayManager.metadata.get(FreeplayManager.songList[i].songName.toLowerCase());}
 			catch(e) {metadata = null;}
 
 			var text:FlxText = new FlxText(0, 0, 500, '', 20);
-			if (metadata != null)
-				text.text = FreeplayManager.songList[i].songName + '\nBy ${metadata.song.artist}';
-			else
-				text.text = FreeplayManager.songList[i].songName + '\nBy Unknown';
+				text.text = FreeplayManager.songList[i].songName + '\n' + difficulties[j];
 			text.alignment = 'left';
-			text.ID = i;
+			text.ID = i + j;
 			this.textGrp.add(text);
 		}
+	}
 
 		maxSelected = songBox.length;