Merge 1.0.0 changes

BSIPA-ModList/BSIPA-ModList.csproj

@@ -80,7 +80,7 @@
     <Compile Include="UI\ButtonUI.cs" />
     <Compile Include="UI\DownloadProgressCell.cs" />
     <Compile Include="UI\ModListFlowCoordinator.cs" />
-    <Compile Include="UI\SettingsViewController.cs" />
+    <Compile Include="UI\ViewControllers\SettingsViewController.cs" />
     <Compile Include="UI\ViewControllers\BackButtonNavigationController.cs" />
     <Compile Include="UI\ViewControllers\DownloadProgressViewController.cs" />
     <Compile Include="UI\FloatingNotification.cs" />
@@ -122,7 +122,7 @@
     <EmbeddedResource Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="TMP Exporter\Assets\AssetBundles\fonts\consolas.font">
+    <EmbeddedResource Include="..\TMP Exporter\Assets\AssetBundles\fonts\consolas.font">
       <Link>Bundles\consolas.font</Link>
     </EmbeddedResource>
   </ItemGroup>

BSIPA-ModList/Plugin.cs

@@ -4,6 +4,9 @@ using IPALogger = IPA.Logging.Logger;
 using BSIPA_ModList.UI;
 using UnityEngine;
 using IPA.Logging;
+using BSIPA_ModList.UI.ViewControllers;
+using System.Collections;
+using IPA.Loader;
 
 namespace BSIPA_ModList
 {
@@ -21,6 +24,8 @@ namespace BSIPA_ModList
             Logger.log = logger;
 
             IPA.Updating.BeatMods.Updater.ModListPresent = true;
+
+
         }
 
         public void OnActiveSceneChanged(Scene prevScene, Scene nextScene)
@@ -33,7 +38,20 @@ namespace BSIPA_ModList
 
         public void OnApplicationStart()
         {
+            // Load resources ahead of time
+            MarkdownView.StartLoadResourcesAsync();
+
+            SharedCoroutineStarter.instance.StartCoroutine(LoadPluginIcons());
+        }
 
+        private static IEnumerator LoadPluginIcons()
+        {
+            foreach (var p in PluginManager.AllPlugins)
+            {
+                yield return null;
+                Logger.log.Debug($"Loading icon for {p.Metadata.Name}");
+                var _ = p.Metadata.GetIcon();
+            }
         }
 
         public void OnFixedUpdate()

BSIPA-ModList/UI/ButtonUI.cs

@@ -14,7 +14,7 @@ namespace BSIPA_ModList.UI
     internal class ButtonUI : MonoBehaviour
     {
         private const string ControllerPanel = "MainMenuViewController/SmallButtons";
-        private const string CopyButton = "CreditsButton";
+        private const string CopyButton = "BeatmapEditorButton";
 
         internal static ButtonUI Instance;
 

BSIPA-ModList/UI/DownloadProgressCell.cs

@@ -34,7 +34,7 @@ namespace BSIPA_ModList.UI
             _songNameText = GetComponentsInChildren<TextMeshProUGUI>().First(x => x.name == "SongName");
             _songNameText.enableWordWrapping = false;
             _songNameText.overflowMode = TextOverflowModes.Overflow;
-            _coverImage = GetComponentsInChildren<UnityEngine.UI.Image>().First(x => x.name == "CoverImage");
+            _coverRawImage = GetComponentsInChildren<UnityEngine.UI.RawImage>().First(x => x.name == "CoverImage");
             _bgImage = GetComponentsInChildren<UnityEngine.UI.Image>().First(x => x.name == "BG");
             _highlightImage = GetComponentsInChildren<UnityEngine.UI.Image>().First(x => x.name == "Highlight");
             _beatmapCharacteristicAlphas = new float[0];
@@ -46,7 +46,7 @@ namespace BSIPA_ModList.UI
 
             _songNameText.text = $"{mod.Mod.Name} <size=60%>v{mod.Mod.ResolvedVersion}</size>";
             _authorText.text = "";
-            _coverImage.sprite = mod.Icon;
+            _coverRawImage.texture = mod.Icon.texture;
 
             _bgImage.enabled = true;
             _bgImage.sprite = Sprite.Create(new Texture2D(1, 1), new Rect(0, 0, 1, 1), Vector2.one / 2f);

BSIPA-ModList/UI/FloatingNotification.cs

@@ -16,7 +16,7 @@ namespace BSIPA_ModList.UI
         private Image _loadingBackg;
         private Image _loadingBar;
 
-        private static readonly Vector3 Position = new Vector3(2.3f, 2.3f, 1.35f);
+        private static readonly Vector3 Position = new Vector3(2.25f, 2.3f, 1.55f);
         private static readonly Vector3 Rotation = new Vector3(0, 60, 0);
         private static readonly Vector3 Scale = new Vector3(0.01f, 0.01f, 0.01f);
 

BSIPA-ModList/UI/ViewControllers/DownloadProgressViewController.cs

@@ -152,7 +152,7 @@ namespace BSIPA_ModList.UI.ViewControllers
 
         public float CellSize()
         {
-            return 10f;
+            return 8.5f;
         }
 
         public int NumberOfCells()

BSIPA-ModList/UI/ViewControllers/MarkdownView.cs

@@ -12,6 +12,7 @@ using System.Reflection;
 using UnityEngine.EventSystems;
 using System.Diagnostics;
 using System.Collections;
+using System.IO;
 
 namespace BSIPA_ModList.UI.ViewControllers
 {
@@ -86,39 +87,73 @@ namespace BSIPA_ModList.UI.ViewControllers
                 return uri.Substring(3);
         }
 
+        private static Stream ConsolasAssetBundleFontStream => Assembly.GetExecutingAssembly().GetManifestResourceStream("BSIPA_ModList.Bundles.consolas.font");
+
+        private static AssetBundleCreateRequest _bundleRequest;
         private static AssetBundle _bundle;
         private static AssetBundle Bundle
         {
             get
             {
+                if (_bundle == null && _bundleRequest != null)
+                    throw new InvalidOperationException("Asset bundle is being loaded asynchronously; please wait for that to complete");
                 if (_bundle == null)
-                    _bundle = AssetBundle.LoadFromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("BSIPA_ModList.Bundles.consolas.font"));
+                    _bundle = AssetBundle.LoadFromStream(ConsolasAssetBundleFontStream);
                 return _bundle;
             }
         }
+
+        private static AssetBundleRequest _consolasRequest;
+        private static TMP_FontAsset _unsetConsolas;
         private static TMP_FontAsset _consolas;
         private static TMP_FontAsset Consolas
         {
             get
             {
-                if (_consolas == null)
-                {
-                    _consolas = Bundle?.LoadAsset<TMP_FontAsset>("CONSOLAS");
-                    if (_consolas != null)
-                    {
-                        var originalFont = Resources.FindObjectsOfTypeAll<TMP_FontAsset>().Last(f => f.name == "Teko-Medium SDF No Glow");
-                        var matCopy = Instantiate(originalFont.material);
-                        matCopy.mainTexture = _consolas.material.mainTexture;
-                        matCopy.mainTextureOffset = _consolas.material.mainTextureOffset;
-                        matCopy.mainTextureScale = _consolas.material.mainTextureScale;
-                        _consolas.material = matCopy;
-                        MaterialReferenceManager.AddFontAsset(_consolas);
-                    }
-                }
+                if (_unsetConsolas == null && _consolasRequest != null)
+                    throw new InvalidOperationException("Asset is being loaded asynchronously; please wait for that to complete");
+                if (_unsetConsolas == null)
+                    _unsetConsolas = Bundle?.LoadAsset<TMP_FontAsset>("CONSOLAS");
+                if (_consolas == null && _unsetConsolas != null)
+                    _consolas = SetupFont(_unsetConsolas);
                 return _consolas;
             }
         }
 
+        private static TMP_FontAsset SetupFont(TMP_FontAsset f)
+        {
+            var originalFont = Resources.FindObjectsOfTypeAll<TMP_FontAsset>().Last(f2 => f2.name == "Teko-Medium SDF No Glow");
+            var matCopy = Instantiate(originalFont.material);
+            matCopy.mainTexture = f.material.mainTexture;
+            matCopy.mainTextureOffset = f.material.mainTextureOffset;
+            matCopy.mainTextureScale = f.material.mainTextureScale;
+            f.material = matCopy;
+            f = Instantiate(f);
+            MaterialReferenceManager.AddFontAsset(f);
+            return f;
+        }
+
+        internal static void StartLoadResourcesAsync()
+        {
+            SharedCoroutineStarter.instance.StartCoroutine(LoadResourcesAsync());
+        }
+        private static IEnumerator LoadResourcesAsync()
+        {
+            Logger.md.Debug("Starting to load resources");
+
+            _bundleRequest = AssetBundle.LoadFromStreamAsync(ConsolasAssetBundleFontStream);
+            yield return _bundleRequest;
+            _bundle = _bundleRequest.assetBundle;
+
+            Logger.md.Debug("Bundle loaded");
+
+            _consolasRequest = _bundle.LoadAssetAsync<TMP_FontAsset>("CONSOLAS");
+            yield return _consolasRequest;
+            _unsetConsolas = _consolasRequest.asset as TMP_FontAsset;
+
+            Logger.md.Debug("Font loaded");
+        }
+
         protected void Awake()
         {
             if (Consolas == null)

BSIPA-ModList/UI/ViewControllers/ModCells.cs

@@ -44,7 +44,7 @@ namespace BSIPA_ModList.UI.ViewControllers
             {
                 var desc = Plugin.Manifest.Description;
                 if (string.IsNullOrWhiteSpace(desc))
-                    desc = "<color=#BFBFBF><i>No description</i>";
+                    desc = "*No description*";
 
                 infoView = BeatSaberUI.CreateViewController<ModInfoViewController>();
                 infoView.Init(icon, Plugin.Name, "v" + Plugin.Version.ToString(), subtext,
@@ -87,7 +87,7 @@ namespace BSIPA_ModList.UI.ViewControllers
             {
                 var desc = Plugin.Manifest.Description;
                 if (string.IsNullOrWhiteSpace(desc))
-                    desc = "<color=#BFBFBF><i>No description</i>";
+                    desc = "*No description*";
 
                 infoView = BeatSaberUI.CreateViewController<ModInfoViewController>();
                 infoView.Init(icon, Plugin.Name, "v" + Plugin.Version.ToString(), authorText,
@@ -109,7 +109,7 @@ namespace BSIPA_ModList.UI.ViewControllers
             this.list = list;
 
             if (string.IsNullOrWhiteSpace(subtext))
-                subtext = "<color=#BFBFBF><i>Unspecified Author</i>";
+                subtext = "<color=#BFBFBF><i>Unspecified Author</i></color>";
 
             icon = Utilities.DefaultLibraryIcon;
         }
@@ -124,7 +124,7 @@ namespace BSIPA_ModList.UI.ViewControllers
             {
                 var desc = Plugin.Manifest.Description;
                 if (string.IsNullOrWhiteSpace(desc))
-                    desc = "<color=#BFBFBF><i>No description</i>";
+                    desc = "*No description*";
 
                 infoView = BeatSaberUI.CreateViewController<ModInfoViewController>();
                 infoView.Init(icon, Plugin.Name, "v" + Plugin.Version.ToString(), subtext,

BSIPA-ModList/UI/ViewControllers/ModInfoViewController.cs

@@ -76,7 +76,9 @@ namespace BSIPA_ModList.UI
                 rowTransform = Instantiate(rowTransformOriginal, rectTransform);
                 rowTransform.anchorMin = new Vector2(0f, 0f);
                 rowTransform.anchorMax = new Vector2(1f, .15f);
-                rowTransform.anchoredPosition = new Vector2(-3.5f, -2f);
+                rowTransform.anchoredPosition = new Vector2(-3.5f, 4f);
+                rowTransform.sizeDelta = Vector2.zero;
+                Destroy(rowTransform.GetComponent<StartMiddleEndButtonsGroup>());
 
                 foreach (Transform child in rowTransform)
                 {
@@ -86,32 +88,35 @@ namespace BSIPA_ModList.UI
 
                 if (links?.ProjectHome != null)
                 {
-                    linkHomeButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Home",
+                    linkHomeButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Home", anchoredPosition: Vector2.zero, sizeDelta: new Vector2(20, 10),
                         onClick: () => Process.Start(links.ProjectHome.ToString()));
                     linkHomeButton.GetComponentInChildren<HorizontalLayoutGroup>().padding = new RectOffset(6, 6, 0, 0);
                     addedLink = true;
                 }
                 if (links?.ProjectSource != null)
                 {
-                    linkSourceButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Source",
+                    linkSourceButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Source", anchoredPosition: Vector2.zero, sizeDelta: new Vector2(20, 10),
                         onClick: () => Process.Start(links.ProjectSource.ToString()));
                     linkSourceButton.GetComponentInChildren<HorizontalLayoutGroup>().padding = new RectOffset(6, 6, 0, 0);
                     addedLink = true;
                 }
                 if (links?.Donate != null)
                 {
-                    linkDonateButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Donate",
+                    linkDonateButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "Donate", anchoredPosition: Vector2.zero, sizeDelta: new Vector2(20, 10),
                         onClick: () => Process.Start(links.Donate.ToString()));
                     linkDonateButton.GetComponentInChildren<HorizontalLayoutGroup>().padding = new RectOffset(6, 6, 0, 0);
                     addedLink = true;
                 }
                 if (moreInfoLink != null)
                 {
-                    linkDonateButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "More Info",
+                    linkDonateButton = BeatSaberUI.CreateUIButton(rowTransform, "QuitButton", buttonText: "More Info", anchoredPosition: Vector2.zero, sizeDelta: new Vector2(20, 10),
                         onClick: () => Process.Start(moreInfoLink.ToString()));
                     linkDonateButton.GetComponentInChildren<HorizontalLayoutGroup>().padding = new RectOffset(6, 6, 0, 0);
                     addedLink = true;
                 }
+
+                foreach (var cmp in rowTransform.GetComponentsInChildren<StartMiddleEndButtonBackgroundController>())
+                    cmp.SetMiddleSprite();
             }
             if (UpdateInfo != null && !addedLink)
                 StartCoroutine(GetMoreInfoLink());

BSIPA-ModList/UI/ViewControllers/ModListController.cs

@@ -22,6 +22,8 @@ namespace BSIPA_ModList.UI
             var cell = base.CellForIdx(idx) as LevelListTableCell;
             var nameText = cell.GetPrivateField<TextMeshProUGUI>("_songNameText");
             nameText.overflowMode = TextOverflowModes.Overflow;
+            var authorText = cell.GetPrivateField<TextMeshProUGUI>("_authorText");
+            authorText.overflowMode = TextOverflowModes.Overflow;
             return cell;
         }
 

BSIPA-ModList/UI/SettingsViewController.cs → BSIPA-ModList/UI/ViewControllers/SettingsViewController.cs

@@ -33,6 +33,9 @@ namespace BSIPA_ModList.UI
                 SelfConfig.LoaderConfig.Store(SelfConfig.SelfConfigRef.Value);
             };
 
+            autoCheck.Init();
+            autoUpdate.Init();
+
             return menu.viewController;
         }
     }

BSIPA-ModList/manifest.json

@@ -8,13 +8,13 @@
     "",
     "## An in-game interface client for BSIPA.",
   ],
-  "gameVersion": "0.13.2",
+  "gameVersion": "1.0.0",
   "id": "BSIPA Mod List",
   "name": "BSIPA Mod List",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "icon": "BSIPA_ModList.Icons.self.png",
   "dependsOn": {
-    "BSIPA": "^3.12.18",
+    "BSIPA": "^3.12.19",
     "CustomUI": "^1.5.4"
   },
   "features": [],

IPA.Loader/Config/SelfConfig.cs

@@ -37,7 +37,7 @@ namespace IPA.Config
         }
 
         internal const string IPAName = "Beat Saber IPA";
-        internal const string IPAVersion = "3.12.18"; 
+        internal const string IPAVersion = "3.12.19"; 
 		
         public bool Regenerate = true;
 

IPA.Loader/Loader/manifest.json

@@ -5,10 +5,10 @@
     "#![IPA.Loader.description.md]",
     "A mod loader specifically for Beat Saber."
   ],
-  "gameVersion": "0.13.2",
+  "gameVersion": "1.0.0",
   "id": "BSIPA",
   "name": "Beat Saber IPA",
-  "version": "3.12.18",
+  "version": "3.12.19",
   "icon": "IPA.icon.png",
   "features": [
     "define-feature(print, IPA.Loader.Features.PrintFeature)",

IPA/Program.cs

@@ -23,7 +23,7 @@ namespace IPA
             Unknown
         }
 
-        public const string FileVersion = "3.12.18";
+        public const string FileVersion = "3.12.19";
 
         public static Version Version => Assembly.GetEntryAssembly().GetName().Version;
 

Refs/BeatSaberCustomUI.xml

@@ -129,6 +129,28 @@
             <param name="sizeDelta">The size of the color picker's RectTransform.</param>
             <returns></returns>
         </member>
+        <member name="M:CustomUI.BeatSaber.BeatSaberUI.CreateTextSegmentedControl(UnityEngine.RectTransform,UnityEngine.Vector2,UnityEngine.Vector2,UnityEngine.Events.UnityAction{System.Int32},System.Single,System.Single)">
+            <summary>
+            Creates a custom TextSegmentedControl component.
+            </summary>
+            <param name="parent">Thet transform to parent the new TextSegmentedControl component to.</param>
+            <param name="anchoredPosition">The position the TextSegmentedControl component should be anchored to.</param>
+            <param name="sizeDelta">The size of the TextSegmentedControl component RectTransform.</param>
+            <param name="onValueChanged">Callback when the user clicks on one of the segments.</param>
+            <param name="fontSize">Size of text in segments.</param>
+            <param name="padding">Size of padding in segments.</param>
+            <returns>The newly created TextSegmentedControl component.</returns>
+        </member>
+        <member name="M:CustomUI.BeatSaber.BeatSaberUI.CreateIconSegmentedControl(UnityEngine.RectTransform,UnityEngine.Vector2,UnityEngine.Vector2,UnityEngine.Events.UnityAction{System.Int32})">
+            <summary>
+            Creates a custom IconSegmentedControl component.
+            </summary>
+            <param name="parent">Thet transform to parent the new IconSegmentedControl component to.</param>
+            <param name="anchoredPosition">The position the IconSegmentedControl component should be anchored to.</param>
+            <param name="sizeDelta">The size of the IconSegmentedControl component RectTransform.</param>
+            <param name="onValueChanged">Callback when the user clicks on one of the segments.</param>
+            <returns>The newly created IconSegmentedControl component.</returns>
+        </member>
         <member name="F:CustomUI.BeatSaber.CustomFlowCoordinator.parentFlowCoordinator">
             <summary>
             The FlowCoordinator that presented this FlowCoordinator