Merge pull request #24 from iPixelGalaxy/master

Update to 1.34.0+
PauseChampions · Feb 25, 2024 · 190cdf4 · 190cdf4
2 parents a89d9e7 + 67fff76
commit 190cdf4
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 29 deletions.
diff --git a/Hitbloq/Hitbloq.csproj b/Hitbloq/Hitbloq.csproj
@@ -42,10 +42,16 @@
             <HintPath>$(BeatSaberDir)\Plugins\LeaderboardCore.dll</HintPath>
             <Private>False</Private>
         </Reference>
+        <Reference Include="PlatformUserModel">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\PlatformUserModel.dll</HintPath>
+        </Reference>
         <Reference Include="PlaylistManager">
             <HintPath>$(BeatSaberDir)\Plugins\PlaylistManager.dll</HintPath>
             <Private>False</Private>
         </Reference>
+        <Reference Include="Tweening">
+          <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Tweening.dll</HintPath>
+        </Reference>
         <Reference Include="Unity.TextMeshPro">
             <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Unity.TextMeshPro.dll</HintPath>
             <Private>False</Private>
@@ -58,18 +64,12 @@
             <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UI.dll</HintPath>
             <Private>False</Private>
         </Reference>
-        <Reference Include="Main">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Main.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
+        <Reference Include="$(BeatSaberDir)\Beat Saber_Data\Managed\Main.dll" Publicize="True"/>
         <Reference Include="HMLib">
             <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\HMLib.dll</HintPath>
             <Private>False</Private>
         </Reference>
-        <Reference Include="HMUI">
-            <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\HMUI.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
+        <Reference Include="$(BeatSaberDir)\Beat Saber_Data\Managed\HMUI.dll" Publicize="True"/>
         <Reference Include="IPA.Loader">
             <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\IPA.Loader.dll</HintPath>
             <Private>False</Private>
@@ -105,15 +105,15 @@
     </ItemGroup>
 
     <ItemGroup>
-        <None Include="Directory.Build.props" Condition="Exists('Directory.Build.props')"/>
-        <None Include="Directory.Build.targets" Condition="Exists('Directory.Build.targets')"/>
-        <None Include="Hitbloq.csproj.user" Condition="Exists('Hitbloq.csproj.user')"/>
+        <None Include="Directory.Build.props" Condition="Exists('Directory.Build.props')" />
+        <None Include="Directory.Build.targets" Condition="Exists('Directory.Build.targets')" />
+        <None Include="Hitbloq.csproj.user" Condition="Exists('Hitbloq.csproj.user')" />
     </ItemGroup>
 
     <ItemGroup>
-        <EmbeddedResource Include="manifest.json"/>
-        <EmbeddedResource Include="Images\*.png"/>
-        <EmbeddedResource Include="UI\Views\*.bsml"/>
+        <EmbeddedResource Include="manifest.json" />
+        <EmbeddedResource Include="Images\*.png" />
+        <EmbeddedResource Include="UI\Views\*.bsml" />
         <EmbeddedResource Update="UI\Views\HitbloqPoolLeaderboardView.bsml">
             <SubType>Code</SubType>
         </EmbeddedResource>
@@ -123,13 +123,17 @@
     </ItemGroup>
 
     <ItemGroup>
-        <None Remove="UI\Views\HitbloqEventModal.bsml"/>
+        <None Remove="UI\Views\HitbloqEventModal.bsml" />
     </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="BeatSaberModdingTools.Tasks" Version="1.4.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 </Project>
diff --git a/Hitbloq/Other/AutomaticRegistration.cs b/Hitbloq/Other/AutomaticRegistration.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Hitbloq.Entries;
 using Hitbloq.Sources;
@@ -46,7 +47,7 @@ private async Task InitializeAsync()
 			}
 
 			// If a valid platform id doesn't exist, return
-			var userInfo = await _platformUserModel.GetUserInfo();
+			var userInfo = await _platformUserModel.GetUserInfo(CancellationToken.None);
 			if (userInfo == null)
 			{
 				return;

diff --git a/Hitbloq/Other/SpriteLoader.cs b/Hitbloq/Other/SpriteLoader.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using BeatSaberPlaylistsLib;
 using IPA.Loader;
 using IPA.Utilities.Async;
 using SiraUtil.Web;

diff --git a/Hitbloq/Sources/UserIDSource.cs b/Hitbloq/Sources/UserIDSource.cs
@@ -27,7 +27,7 @@ public UserIDSource(IHttpService siraHttpService, IPlatformUserModel platformUse
 		{
 			if (_hitbloqUserID == null || RegistrationRequested)
 			{
-				var userInfo = await _platformUserModel.GetUserInfo();
+				var userInfo = await _platformUserModel.GetUserInfo(CancellationToken.None);
 				if (userInfo != null)
 				{
 					try

diff --git a/Hitbloq/UI/HitbloqFlowCoordinator.cs b/Hitbloq/UI/HitbloqFlowCoordinator.cs
@@ -39,7 +39,7 @@ internal class HitbloqFlowCoordinator : FlowCoordinator
 
 		private FlowCoordinator? _parentFlowCoordinator;
 
-		protected override void DidActivate(bool firstActivation, bool addedToHierarchy, bool screenSystemEnabling)
+		public override void DidActivate(bool firstActivation, bool addedToHierarchy, bool screenSystemEnabling)
 		{
 			SetTitle("Hitbloq");
 			showBackButton = true;
@@ -55,7 +55,7 @@ protected override void DidActivate(bool firstActivation, bool addedToHierarchy,
 			_hitbloqInfoViewController.URLOpenRequested += OnURLOpenRequested;
 		}
 
-		protected override void DidDeactivate(bool removedFromHierarchy, bool screenSystemDisabling)
+		public override void DidDeactivate(bool removedFromHierarchy, bool screenSystemDisabling)
 		{
 			base.DidDeactivate(removedFromHierarchy, screenSystemDisabling);
 			_hitbloqPoolListViewController.PoolSelectedEvent -= OnPoolSelected;
@@ -112,7 +112,7 @@ private void OnURLOpenRequested(string url)
 			_popupModalsController.ShowYesNoModal(_hitbloqPoolListViewController.rectTransform, $"Would you like to open\n{url}", () => { Application.OpenURL(url); });
 		}
 
-		protected override void BackButtonWasPressed(ViewController topViewController)
+		public override void BackButtonWasPressed(ViewController topViewController)
 		{
 			_hitbloqRankedListViewController.gameObject.SetActive(false);
 			_hitbloqPoolLeaderboardViewController.gameObject.SetActive(false);

diff --git a/Hitbloq/UI/MenuButtonUI.cs b/Hitbloq/UI/MenuButtonUI.cs
@@ -19,10 +19,7 @@ public MenuButtonUI(MainFlowCoordinator mainFlowCoordinator, HitbloqFlowCoordina
 
 		public void Dispose()
 		{
-			if (MenuButtons.IsSingletonAvailable)
-			{
 				MenuButtons.instance.UnregisterButton(_menuButton);
-			}
 		}
 
 		public void Initialize()

diff --git a/Hitbloq/UI/ViewControllers/HitbloqPoolCellController.cs b/Hitbloq/UI/ViewControllers/HitbloqPoolCellController.cs
@@ -127,12 +127,12 @@ await _spriteLoader.DownloadSpriteAsync(_poolListEntry.BannerImageURL, sprite =>
 		private readonly Color _textSelectedColor = new(0, 0.7529412f, 1, 1);
 		private readonly Color _textColor = new(1, 1, 1, 0.7490196f);
 
-		protected override void SelectionDidChange(TransitionType transitionType)
+		public override void SelectionDidChange(TransitionType transitionType)
 		{
 			RefreshBackground();
 		}
 
-		protected override void HighlightDidChange(TransitionType transitionType)
+		public override void HighlightDidChange(TransitionType transitionType)
 		{
 			RefreshBackground();
 		}

diff --git a/Hitbloq/UI/ViewControllers/HitbloqPoolLeaderboardCellController.cs b/Hitbloq/UI/ViewControllers/HitbloqPoolLeaderboardCellController.cs
@@ -197,12 +197,12 @@ await _spriteLoader.DownloadSpriteAsync(_poolLeaderboardEntry.BannerImageURL, sp
 		private readonly Color _crColor = new(0.7254902f, 0.5294118f, 1, 0.7490196f);
 		private readonly Color _crHighlightedColor = new(0.7254902f, 0.5294118f, 1, 1f);
 
-		protected override void SelectionDidChange(TransitionType transitionType)
+		public override void SelectionDidChange(TransitionType transitionType)
 		{
 			RefreshBackground();
 		}
 
-		protected override void HighlightDidChange(TransitionType transitionType)
+		public override void HighlightDidChange(TransitionType transitionType)
 		{
 			RefreshBackground();
 		}

diff --git a/Hitbloq/UI/ViewControllers/HitbloqProfileModalController.cs b/Hitbloq/UI/ViewControllers/HitbloqProfileModalController.cs
@@ -428,7 +428,7 @@ private async Task ShowModalForUserAsync(CancellationToken cancellationToken, in
 				{
 					_addFriendButton.image.sprite = _friendAdded;
 					AddFriendInteractable = false;
-					AddFriendHoverHint = KAlreadyFriendPrompt + (await _platformUserModel.GetUserInfo()).platform;
+					AddFriendHoverHint = KAlreadyFriendPrompt + (await _platformUserModel.GetUserInfo(CancellationToken.None)).platform;
 				}
 				else
 				{

diff --git a/Hitbloq/manifest.json b/Hitbloq/manifest.json
@@ -8,7 +8,7 @@
     "#![Hitbloq.Description.md]",
     "Hitbloq offers a unique competitive experience for Beat Saber through its use of map pools and the relative ranking algorithm."
   ],
-  "gameVersion": "1.20.0",
+  "gameVersion": "1.34.0",
   "icon": "Hitbloq.Images.Logo.png",
   "dependsOn": {
     "BSIPA": "^4.2.1",