Merge pull request #93 from halsafar/devel

Fix for BeatSaber 1.3.0

SongBrowserPlugin/DataAccess/SongBrowserModel.cs

@@ -294,7 +294,7 @@ namespace SongBrowser
 
             // Build a map of levelId to sum of all playcounts and sort.
             PlayerDataModelSO playerData = Resources.FindObjectsOfTypeAll<PlayerDataModelSO>().FirstOrDefault();            
-            foreach (var levelData in playerData.currentLocalPlayer.levelsStatsData)
+            foreach (var levelData in playerData.playerData.levelsStatsData)
             {
                 if (!_levelIdToPlayCount.ContainsKey(levelData.levelID))
                 {

SongBrowserPlugin/Plugin.cs

@@ -11,7 +11,7 @@ namespace SongBrowser
 {
     public class Plugin : IBeatSaberPlugin
     {
-        public const string VERSION_NUMBER = "5.4.0";
+        public const string VERSION_NUMBER = "5.5.0";
         public static Plugin Instance;
         public static IPA.Logging.Logger Log;
 

SongBrowserPlugin/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.0")]
-[assembly: AssemblyFileVersion("5.4.0")]
+[assembly: AssemblyVersion("5.5.0")]
+[assembly: AssemblyFileVersion("5.5.0")]

SongBrowserPlugin/UI/Browser/BeatSaberUIController.cs

@@ -225,10 +225,10 @@ namespace SongBrowser.DataAccess
 
                 LevelPacksTableView.SelectCellWithIdx(index);
                 tableView.SelectCellWithIdx(index, true);
-                tableView.ScrollToCellWithIdx(0, TableView.ScrollPositionType.Beginning, false);
+                tableView.ScrollToCellWithIdx(0, TableViewScroller.ScrollPositionType.Beginning, false);
                 for (int i = 0; i < index; i++)
                 {
-                    tableView.PageScrollDown();
+                    tableView.GetPrivateField<TableViewScroller>("_scroller").PageScrollDown();
                 }
 
                 Logger.Debug("Done selecting level pack!");
@@ -305,7 +305,7 @@ namespace SongBrowser.DataAccess
 
             TableView tableView = LevelPackLevelsTableView.GetPrivateField<TableView>("_tableView");
             LevelPackLevelsTableView.HandleDidSelectRowEvent(tableView, selectedIndex);
-            tableView.ScrollToCellWithIdx(selectedIndex, TableView.ScrollPositionType.Beginning, true);
+            tableView.ScrollToCellWithIdx(selectedIndex, TableViewScroller.ScrollPositionType.Beginning, true);
             tableView.SelectCellWithIdx(selectedIndex);            
         }
 

SongBrowserPlugin/UI/Browser/SongBrowserUI.cs

@@ -925,7 +925,7 @@ namespace SongBrowser.UI
                                 Logger.Info("Removed " + removedLevels + " level(s) from song list!");
 
                                 TableView listTableView = levelsTableView.GetPrivateField<TableView>("_tableView");
-                                listTableView.ScrollToCellWithIdx(selectedIndex, TableView.ScrollPositionType.Beginning, false);
+                                listTableView.ScrollToCellWithIdx(selectedIndex, TableViewScroller.ScrollPositionType.Beginning, false);
                                 levelsTableView.SetPrivateField("_selectedRow", selectedIndex);
                                 listTableView.SelectCellWithIdx(selectedIndex, true);
                             }

SongBrowserPlugin/UI/DownloadQueue/DownloadQueueTableCell.cs

@@ -13,11 +13,6 @@ namespace SongBrowser.UI.DownloadQueue
     {
         Song song;
 
-        protected override void Awake()
-        {
-            base.Awake();
-        }
-
         public void Init(Song _song)
         {
             Destroy(GetComponent<LevelListTableCell>());

SongBrowserPlugin/UI/DownloadQueue/DownloadQueueViewController.cs

@@ -50,7 +50,7 @@ namespace SongBrowser.UI.DownloadQueue
                 _pageUpButton.interactable = true;
                 _pageUpButton.onClick.AddListener(delegate ()
                 {
-                    _queuedSongsTableView.PageScrollUp();
+                    _queuedSongsTableView.GetPrivateField<TableViewScroller>("_scroller").PageScrollUp();
                 });
 
                 _pageDownButton = Instantiate(Resources.FindObjectsOfTypeAll<Button>().Last(x => (x.name == "PageDownButton")), rectTransform, false);
@@ -61,7 +61,7 @@ namespace SongBrowser.UI.DownloadQueue
                 _pageDownButton.interactable = true;
                 _pageDownButton.onClick.AddListener(delegate ()
                 {
-                    _queuedSongsTableView.PageScrollDown();
+                    _queuedSongsTableView.GetPrivateField<TableViewScroller>("_scroller").PageScrollDown();
                 });
 
                 var gameObject = new GameObject();
@@ -150,7 +150,7 @@ namespace SongBrowser.UI.DownloadQueue
             Logger.Log($"Removed {removed} songs from queue");
 
             _queuedSongsTableView.ReloadData();
-            _queuedSongsTableView.ScrollToCellWithIdx(0, TableView.ScrollPositionType.Beginning, true);
+            _queuedSongsTableView.ScrollToCellWithIdx(0, TableViewScroller.ScrollPositionType.Beginning, true);
 
             if (queuedSongs.Count(x => x.songQueueState == SongQueueState.Downloading || x.songQueueState == SongQueueState.Queued) == 0)
             {
@@ -172,7 +172,7 @@ namespace SongBrowser.UI.DownloadQueue
             return queuedSongs.Count;
         }
 
-        public TableCell CellForIdx(int row)
+        public TableCell CellForIdx(TableView view, int row)
         {
             LevelListTableCell _tableCell = Instantiate(_songListTableCellInstance);
 

SongBrowserPlugin/UI/Playlists/PlaylistSelectionListViewController.cs

@@ -45,8 +45,8 @@ namespace SongBrowser.UI
                 (_pageUpButton.transform as RectTransform).sizeDelta = new Vector2(40f, 10f);
                 _pageUpButton.interactable = true;
                 _pageUpButton.onClick.AddListener(delegate ()
-                {
-                    _songsTableView.PageScrollUp();
+                {                    
+                    _songsTableView.GetPrivateField<TableViewScroller>("_scroller").PageScrollUp();
                 });
 
                 _pageDownButton = Instantiate(Resources.FindObjectsOfTypeAll<Button>().First(x => (x.name == "PageDownButton")), rectTransform, false);
@@ -57,7 +57,7 @@ namespace SongBrowser.UI
                 _pageDownButton.interactable = true;
                 _pageDownButton.onClick.AddListener(delegate ()
                 {
-                    _songsTableView.PageScrollDown();
+                    _songsTableView.GetPrivateField<TableViewScroller>("_scroller").PageScrollDown();
                 });
 
                 _songListTableCellInstance = Resources.FindObjectsOfTypeAll<LevelListTableCell>().First(x => (x.name == "LevelListTableCell"));
@@ -85,14 +85,14 @@ namespace SongBrowser.UI
                 (_songsTableView.transform as RectTransform).anchoredPosition = new Vector2(0f, 0f);
 
                 _songsTableView.dataSource = this;
-                _songsTableView.ScrollToCellWithIdx(0, TableView.ScrollPositionType.Beginning, false);
+                _songsTableView.ScrollToCellWithIdx(0, TableViewScroller.ScrollPositionType.Beginning, false);
                 _lastSelectedRow = -1;
                 _songsTableView.didSelectCellWithIdxEvent += _songsTableView_DidSelectRowEvent;
             }
             else
             {
                 _songsTableView.ReloadData();
-                _songsTableView.ScrollToCellWithIdx(0, TableView.ScrollPositionType.Beginning, false);
+                _songsTableView.ScrollToCellWithIdx(0, TableViewScroller.ScrollPositionType.Beginning, false);
                 _lastSelectedRow = -1;
             }
         }
@@ -117,7 +117,7 @@ namespace SongBrowser.UI
             if (_songsTableView != null)
             {
                 _songsTableView.ReloadData();
-                _songsTableView.ScrollToCellWithIdx(0, TableView.ScrollPositionType.Center, false);
+                _songsTableView.ScrollToCellWithIdx(0, TableViewScroller.ScrollPositionType.Center, false);
             }
         }
 
@@ -137,7 +137,7 @@ namespace SongBrowser.UI
             return playlistList.Count;
         }
 
-        public TableCell CellForIdx(int row)
+        public TableCell CellForIdx(TableView view, int row)
         {
             LevelListTableCell _tableCell = Instantiate(_songListTableCellInstance);
 

SongBrowserPlugin/manifest.json

@@ -2,10 +2,10 @@
   "$schema": "https://raw.githubusercontent.com/beat-saber-modding-group/BSIPA-MetadataFileSchema/master/Schema.json",
   "author": "Halsafar",
   "description": "Adds sort and filter features to the level selection UI.",
-  "gameVersion": "1.1.0p1",
+  "gameVersion": "1.3.0",
   "id": "SongBrowser",
   "name": "Song Browser",
-  "version": "5.4.0",
+  "version": "5.5.0",
   "dependsOn": {
     "CustomUI": "^1.5.4",
     "SongCore": "^2.0.0",