diff --git a/BetterSongSearch.csproj b/BetterSongSearch.csproj index 7f1365b..4c15a36 100644 --- a/BetterSongSearch.csproj +++ b/BetterSongSearch.csproj @@ -84,7 +84,15 @@ $(BeatSaberDir)\Beat Saber_Data\Managed\BeatmapCore.dll - E:\SteamLibrary\steamapps\common\Beat Saber\Libs\BeatSaberPlaylistsLib.dll + $(BeatSaberDir)\Libs\BeatSaberPlaylistsLib.dll + + + $(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.AppFlow.dll + False + + + $(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.UnityExtension.dll + False $(BeatSaberDir)\Plugins\BSML.dll diff --git a/UI/BSSFlowCoordinator.cs b/UI/BSSFlowCoordinator.cs index 43cfedb..65cb3b4 100644 --- a/UI/BSSFlowCoordinator.cs +++ b/UI/BSSFlowCoordinator.cs @@ -41,10 +41,11 @@ public static Dictionary> songsWithScores { songsWithScoresShouldProbablyUpdate = false; foreach(var x in playerDataModel.playerData.levelsStatsData) { - if(!x.validScore || x.highScore == 0 || x.levelID.Length < 13 + 40 || !x.levelID.StartsWith("custom_level_", StringComparison.Ordinal)) + var lid = x.Key.songId; + if(!x.Value.validScore || x.Value.highScore == 0 || lid.Length < 13 + 40 || !lid.StartsWith("custom_level_", StringComparison.Ordinal)) continue; - var sh = x.levelID.Substring(13, 40); + var sh = lid.Substring(13, 40); SongDetailsCache.Structs.Song song; // local score level id's can be scuffed if you pass custom levels w/ no songcore installed @@ -53,7 +54,7 @@ public static Dictionary> songsWithScores { continue; } catch { continue; } - if(!song.GetDifficulty(out var diff, (SongDetailsCache.Structs.MapDifficulty)x.difficulty)) + if(!song.GetDifficulty(out var diff, (SongDetailsCache.Structs.MapDifficulty)x.Key.difficulty)) continue; if(!_songsWithScores.TryGetValue(sh, out var h)) @@ -65,7 +66,7 @@ public static Dictionary> songsWithScores { */ //var maxScore = ScoreModel.MaxRawScoreForNumberOfNotes((int)diff.notes); //h[$"{x.beatmapCharacteristic.serializedName}_{x.difficulty}"] = (x.highScore * 100f) / maxScore; - h[$"{x.beatmapCharacteristic.serializedName}_{x.difficulty}"] = 0; + h[$"{x.Key.characteristic.serializedName}_{x.Key.difficulty}"] = 0; } } diff --git a/UI/SelectedSongView.cs b/UI/SelectedSongView.cs index a2be075..de6d895 100644 --- a/UI/SelectedSongView.cs +++ b/UI/SelectedSongView.cs @@ -131,8 +131,9 @@ await Task.WhenAll(new[] { var h = song.GetCustomLevelIdString(); var preview = beatmapLevelsModel?.GetLevelPreviewForLevelId(h); - if(preview != null) try { - levelCollectionViewController?.SongPlayerCrossfadeToLevelAsync(preview); + try { + if(preview != null) + levelCollectionViewController?.SongPlayerCrossfadeToLevelAsync(preview); coverImage.sprite = await SongCore.Loader.CustomLevels.Values.FirstOrDefault(x => x.levelID == h)?.GetCoverImageAsync(songAssetLoadCanceller.Token); } catch { } } diff --git a/manifest.json b/manifest.json index e5679cf..b65b5e6 100644 --- a/manifest.json +++ b/manifest.json @@ -2,9 +2,9 @@ "id": "BetterSongSearch", "name": "BetterSongSearch", "author": "Kinsi55", - "version": "0.7.84", + "version": "0.7.85", "description": "Search and download songs with a lot of filtering and sorting options and without frustration!", - "gameVersion": "1.19.0", + "gameVersion": "1.34.2", "dependsOn": { "BSIPA": "^4.0.5", "BeatSaberMarkupLanguage": "^1.5.3",