Merge pull request #2 from rithik-b/dev/sira

SiraUtil 3 Migration
rithik-b · Dec 30, 2021 · 215533e · 215533e
2 parents 8d9bb8a + 6831355
commit 215533e
Show file tree

Hide file tree

Showing 10 changed files with 132 additions and 112 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -0,0 +1,44 @@
+name: Build
+
+on:
+    workflow_dispatch:
+    push:
+        branches: [ master ]
+        paths:
+            - 'TakeMeToResults.sln'
+            - 'TakeMeToResults/**'
+            - '.github/workflows/master.yml'
+
+jobs:
+    Build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - name: Setup dotnet
+              uses: actions/setup-dotnet@v1
+              with:
+                  dotnet-version: 5.0.x
+            - name: Download SIRA References
+              uses: ProjectSIRA/download-sira-stripped@1.0.0
+              with:
+                  manifest: ${{github.workspace}}/TakeMeToResults/manifest.json
+                  sira-server-code: ${{ secrets.SIRA_SERVER_CODE }}
+            - name: Download Mod Dependencies
+              uses: Goobwabber/download-beatmods-deps@1.2
+              with:
+                  manifest: ${{github.workspace}}/TakeMeToResults/manifest.json
+            - name: Build
+              id: Build
+              run: dotnet build --configuration Release
+            - name: GitStatus
+              run: git status
+            - name: Echo Filename
+              run: echo $BUILDTEXT \($ASSEMBLYNAME\)
+              env:
+                  BUILDTEXT: Filename=${{ steps.Build.outputs.filename }}
+                  ASSEMBLYNAME: AssemblyName=${{ steps.Build.outputs.assemblyname }}
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v1
+              with:
+                  name: "TakeMeToResults"
+                  path: ${{ steps.Build.outputs.artifactpath }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -0,0 +1,42 @@
+name: PR Build
+
+on:
+    pull_request:
+        branches: [ master ]
+        paths:
+            - 'TakeMeToResults/**'
+            - '.github/workflows/**.yml'
+
+jobs:
+    Build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - name: Setup dotnet
+              uses: actions/setup-dotnet@v1
+              with:
+                  dotnet-version: 5.0.x
+            - name: Download SIRA References
+              uses: ProjectSIRA/download-sira-stripped@1.0.0
+              with:
+                  manifest: ${{github.workspace}}/TakeMeToResults/manifest.json
+                  sira-server-code: ${{ secrets.SIRA_SERVER_CODE }}
+            - name: Download Mod Dependencies
+              uses: Goobwabber/download-beatmods-deps@1.2
+              with:
+                  manifest: ${{github.workspace}}/TakeMeToResults/manifest.json
+            - name: Build
+              id: Build
+              run: dotnet build --configuration Release
+            - name: GitStatus
+              run: git status
+            - name: Echo Filename
+              run: echo $BUILDTEXT \($ASSEMBLYNAME\)
+              env:
+                  BUILDTEXT: Filename=${{ steps.Build.outputs.filename }}
+                  ASSEMBLYNAME: AssemblyName=${{ steps.Build.outputs.assemblyname }}
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v1
+              with:
+                  name: "TakeMeToResults"
+                  path: ${{ steps.Build.outputs.artifactpath }}
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 A simple mod that adds a button which takes you to the results screen.
 
 ## Download
-Download the latest version of the mod (v1.0.2) [here](https://github.com/rithik-b/TakeMeToResults/releases/tag/1.0.2 "here").
+Download the latest version of the mod (v1.1.0) [here](https://github.com/rithik-b/TakeMeToResults/releases/tag/1.1.0 "here").
 To install, move the dll to your Plugins folder.
 
 **BeatSaberMarkupLanguage (BSML)** and **SiraUtil** are required for this mod, so please download the latest version from ModAssistant.

diff --git a/TakeMeToResults/AffinityPatches/PresentFlowCoordinatorPatch.cs b/TakeMeToResults/AffinityPatches/PresentFlowCoordinatorPatch.cs
@@ -0,0 +1,17 @@
+using HMUI;
+using SiraUtil.Affinity;
+using System;
+
+namespace TakeMeToResults.AffinityPatches
+{
+    internal class PresentFlowCoordinatorPatch : IAffinity
+    {
+        public event Action FlowCoordinatorChanged;
+
+        [AffinityPatch(typeof(FlowCoordinator), "PresentFlowCoordinator")]
+        private void PresentFlowCoordinator()
+        {
+            FlowCoordinatorChanged?.Invoke();
+        }
+    }
+}
diff --git a/TakeMeToResults/HarmonyPatches/FlowCoordinator_PresentFlowCoordinator.cs b/TakeMeToResults/HarmonyPatches/FlowCoordinator_PresentFlowCoordinator.cs
diff --git a/TakeMeToResults/Installers/TakeMeToResultsMenuInstaller.cs b/TakeMeToResults/Installers/TakeMeToResultsMenuInstaller.cs
diff --git a/TakeMeToResults/Plugin.cs b/TakeMeToResults/Plugin.cs
@@ -1,25 +1,14 @@
 using IPA;
-using IPA.Config;
-using IPA.Config.Stores;
 using SiraUtil.Zenject;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using TakeMeToResults.Installers;
-using UnityEngine;
+using TakeMeToResults.AffinityPatches;
+using TakeMeToResults.UI;
 using IPALogger = IPA.Logging.Logger;
 
 namespace TakeMeToResults
 {
     [Plugin(RuntimeOptions.DynamicInit)]
     public class Plugin
     {
-        public const string HarmonyId = "com.github.rithik-b.TakeMeToResults";
-        internal static readonly HarmonyLib.Harmony harmony = new HarmonyLib.Harmony(HarmonyId);
-
         internal static Plugin Instance { get; private set; }
         internal static IPALogger Log { get; private set; }
 
@@ -33,7 +22,11 @@ public Plugin(IPALogger logger, Zenjector zenjector)
         {
             Instance = this;
             Plugin.Log = logger;
-            zenjector.OnMenu<TakeMeToResultsMenuInstaller>();
+            zenjector.Install(Location.Menu, Container =>
+            {
+                Container.BindInterfacesTo<ResultsButtonController>().AsSingle();
+                Container.BindInterfacesAndSelfTo<PresentFlowCoordinatorPatch>().AsSingle();
+            });
         }
 
         #region BSIPA Config
@@ -57,7 +50,6 @@ public void InitWithConfig(Config conf)
         [OnEnable]
         public void OnEnable()
         {
-            ApplyHarmonyPatches();
         }
 
         /// <summary>
@@ -68,7 +60,6 @@ public void OnEnable()
         [OnDisable]
         public void OnDisable()
         {
-            RemoveHarmonyPatches();
         }
 
         /*
@@ -84,42 +75,5 @@ public async Task OnDisableAsync()
         }
         */
         #endregion
-
-        // Uncomment the methods in this section if using Harmony
-        #region Harmony
-        /// <summary>
-        /// Attempts to apply all the Harmony patches in this assembly.
-        /// </summary>
-        internal static void ApplyHarmonyPatches()
-        {
-            try
-            {
-                Plugin.Log?.Debug("Applying Harmony patches.");
-                harmony.PatchAll(Assembly.GetExecutingAssembly());
-            }
-            catch (Exception ex)
-            {
-                Plugin.Log?.Error("Error applying Harmony patches: " + ex.Message);
-                Plugin.Log?.Debug(ex);
-            }
-        }
-
-        /// <summary>
-        /// Attempts to remove all the Harmony patches that used our HarmonyId.
-        /// </summary>
-        internal static void RemoveHarmonyPatches()
-        {
-            try
-            {
-                // Removes all patches with this HarmonyId
-                harmony.UnpatchAll(HarmonyId);
-            }
-            catch (Exception ex)
-            {
-                Plugin.Log?.Error("Error removing Harmony patches: " + ex.Message);
-                Plugin.Log?.Debug(ex);
-            }
-        }
-        #endregion
     }
 }
diff --git a/TakeMeToResults/TakeMeToResults.csproj b/TakeMeToResults/TakeMeToResults.csproj
@@ -22,10 +22,6 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<Reference Include="0Harmony">
-		  <HintPath>$(BeatSaberDir)\Libs\0Harmony.dll</HintPath>
-		  <Private>False</Private>
-		</Reference>
 		<Reference Include="UnityEngine.CoreModule">
 			<HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
 			<Private>False</Private>

diff --git a/TakeMeToResults/UI/ViewControllers/ResultsButtonController.cs b/TakeMeToResults/UI/ViewControllers/ResultsButtonController.cs
@@ -5,17 +5,18 @@
 using System;
 using System.ComponentModel;
 using System.Reflection;
-using TakeMeToResults.HarmonyPatches;
+using TakeMeToResults.AffinityPatches;
 using UnityEngine;
 using Zenject;
 
-namespace TakeMeToResults.UI.ViewControllers
+namespace TakeMeToResults.UI
 {
     internal class ResultsButtonController : IInitializable, IDisposable, INotifyPropertyChanged
     {
         private readonly TitleViewController titleViewController;
         private readonly ResultsViewController resultsViewController;
         private readonly MainFlowCoordinator mainFlowCoordinator;
+        private readonly PresentFlowCoordinatorPatch presentFlowCoordinatorPatch;
 
         private ViewController leftScreenViewController;
         private ViewController rightScreenViewController;
@@ -30,12 +31,14 @@ internal class ResultsButtonController : IInitializable, IDisposable, INotifyPro
         [UIComponent("results-button")]
         private readonly RectTransform resultsButtonTransform;
 
-        public ResultsButtonController(HierarchyManager hierarchyManager, ResultsViewController resultsViewController, MainFlowCoordinator mainFlowCoordinator)
+        public ResultsButtonController(HierarchyManager hierarchyManager, ResultsViewController resultsViewController, MainFlowCoordinator mainFlowCoordinator,
+            PresentFlowCoordinatorPatch presentFlowCoordinatorPatch)
         {
             ScreenSystem screenSystem = hierarchyManager.GetField<ScreenSystem, HierarchyManager>("_screenSystem");
             titleViewController = screenSystem.titleViewController;
             this.resultsViewController = resultsViewController;
             this.mainFlowCoordinator = mainFlowCoordinator;
+            this.presentFlowCoordinatorPatch = presentFlowCoordinatorPatch;
             ShowOther = ShowOtherViewControllers;
         }
 
@@ -44,18 +47,18 @@ public void Initialize()
             BSMLParser.instance.Parse(Utilities.GetResourceContent(Assembly.GetExecutingAssembly(), "TakeMeToResults.UI.Views.ResultsButton.bsml"), titleViewController.gameObject, this);
             resultsButtonTransform.gameObject.name = "TakeMeToResults";
             resultsViewController.continueButtonPressedEvent += GetViewControllers;
-            FlowCoordinator_PresentFlowCoordinator.FlowCoordinatorChanged += UpdateFlowAndButtonState;
+            presentFlowCoordinatorPatch.FlowCoordinatorChanged += UpdateFlowAndButtonState;
         }
 
         public void Dispose()
         {
             resultsViewController.continueButtonPressedEvent -= GetViewControllers;
-            FlowCoordinator_PresentFlowCoordinator.FlowCoordinatorChanged -= UpdateFlowAndButtonState;
+            presentFlowCoordinatorPatch.FlowCoordinatorChanged -= UpdateFlowAndButtonState;
         }
 
         private void GetViewControllers(ResultsViewController resultsViewController)
         {
-            deepestChildFlowCoordinator = DeepestChildFlowCoordinator(mainFlowCoordinator);
+            deepestChildFlowCoordinator = mainFlowCoordinator.YoungestChildFlowCoordinatorOrSelf();
 
             leftScreenViewController = deepestChildFlowCoordinator.GetField<ViewController, FlowCoordinator>("_leftScreenViewController");
             rightScreenViewController = deepestChildFlowCoordinator.GetField<ViewController, FlowCoordinator>("_rightScreenViewController");
@@ -68,7 +71,7 @@ private void GetViewControllers(ResultsViewController resultsViewController)
 
         private void UpdateFlowAndButtonState()
         {
-            deepestChildFlowCoordinator = DeepestChildFlowCoordinator(mainFlowCoordinator);
+            deepestChildFlowCoordinator = mainFlowCoordinator.YoungestChildFlowCoordinatorOrSelf();
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ButtonActive)));
         }
 
@@ -109,17 +112,6 @@ private void ShowOtherViewControllers()
             }
         }
 
-        private FlowCoordinator DeepestChildFlowCoordinator(FlowCoordinator root)
-        {
-            var flow = root.childFlowCoordinator;
-            if (flow == null) return root;
-            if (flow.childFlowCoordinator == null || flow.childFlowCoordinator == flow)
-            {
-                return flow;
-            }
-            return DeepestChildFlowCoordinator(flow);
-        }
-
         [UIValue("button-active")]
         private bool ButtonActive => mainScreenViewController != null && deepestChildFlowCoordinator is SinglePlayerLevelSelectionFlowCoordinator;
     }

diff --git a/TakeMeToResults/manifest.json b/TakeMeToResults/manifest.json
@@ -1,14 +1,18 @@
-{
+{
   "$schema": "https://raw.githubusercontent.com/bsmg/BSIPA-MetadataFileSchema/master/Schema.json",
   "id": "TakeMeToResults",
   "name": "TakeMeToResults",
   "author": "PixelBoom",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "A simple mod that adds a button which takes you to the results screen.",
-  "gameVersion": "1.16.1",
+  "gameVersion": "1.19.0",
     "dependsOn": {
-        "BSIPA": "^4.1.6",
-        "BeatSaberMarkupLanguage": "^1.5.3",
-        "SiraUtil": "^2.5.5"
-    }
+        "BSIPA": "^4.2.1",
+        "BeatSaberMarkupLanguage": "^1.6.0",
+        "SiraUtil": "^3.0.0"
+    },
+    "links": {
+      "project-source": "https://github.com/rithik-b/TakeMeToResults",
+      "donate": "https://ko-fi.com/pixelboom"
+  }
 }