Fix

Kylemc1413 · Mar 15, 2019 · c3074c6 · c3074c6
1 parent ce19404
commit c3074c6
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 44 deletions.
diff --git a/Beat Saber Utils/Beat Saber Utils.csproj b/Beat Saber Utils/Beat Saber Utils.csproj
@@ -85,7 +85,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Gameplay\Gamemode.cs" />
-    <Compile Include="Gameplay\HarmonyPatches\BeatmapCharacteristicSelectionViewControllerDidActivate.cs" />
     <Compile Include="Gameplay\HarmonyPatches\BeatmapCharacteristicSelectionViewControllerDidDeActivate.cs" />
     <Compile Include="Gameplay\HarmonyPatches\BlahBlahGrabTheLevelData.cs" />
     <Compile Include="Gameplay\HarmonyPatches\ResultsViewControllerSetDataToUI.cs" />

diff --git a/Beat Saber Utils/Gameplay/Gamemode.cs b/Beat Saber Utils/Gameplay/Gamemode.cs
@@ -8,7 +8,7 @@ namespace BS_Utils.Gameplay
 {
     public class Gamemode
     {
-        internal static BeatmapCharacteristicSelectionViewController CharacteristicSelectionViewController;
+        internal static BeatmapCharacteristicSegmentedControlController CharacteristicSelectionViewController;
         internal static SoloFreePlayFlowCoordinator SoloFreePlayFlowCoordinator;
         internal static PartyFreePlayFlowCoordinator PartyFreePlayFlowCoordinator;
         internal static MainMenuViewController MainMenuViewController;
@@ -26,6 +26,14 @@ public static void Init()
                 MainMenuViewController = Resources.FindObjectsOfTypeAll<MainMenuViewController>().FirstOrDefault();
                 if (MainMenuViewController == null) return;
                 MainMenuViewController.didFinishEvent += MainMenuViewController_didFinishEvent;
+
+                if (CharacteristicSelectionViewController == null)
+                {
+                    CharacteristicSelectionViewController = Resources.FindObjectsOfTypeAll<BeatmapCharacteristicSegmentedControlController>().FirstOrDefault();
+                    if (CharacteristicSelectionViewController != null)
+                        CharacteristicSelectionViewController.didSelectBeatmapCharacteristicEvent += CharacteristicSelectionViewController_didSelectBeatmapCharacteristicEvent;
+                }
+
             }
         }
 
@@ -37,9 +45,9 @@ private static void MainMenuViewController_didFinishEvent(MainMenuViewController
                 IsPartyActive = false;
         }
 
-        internal static void CharacteristicSelectionViewController_didSelectBeatmapCharacteristicEvent(BeatmapCharacteristicSelectionViewController arg1, BeatmapCharacteristicSO arg2)
+        internal static void CharacteristicSelectionViewController_didSelectBeatmapCharacteristicEvent(BeatmapCharacteristicSegmentedControlController arg1, BeatmapCharacteristicSO arg2)
         {
-            Utilities.Logger.Log(arg2.characteristicName);
+        //    Utilities.Logger.Log("Prev: " + GameMode + "    New: " + arg2.characteristicName);
             GameMode = arg2.characteristicName;
         }
 

diff --git a/... Utils/Gameplay/HarmonyPatches/BeatmapCharacteristicSelectionViewControllerDidActivate.cs b/... Utils/Gameplay/HarmonyPatches/BeatmapCharacteristicSelectionViewControllerDidActivate.cs
diff --git a/...tils/Gameplay/HarmonyPatches/BeatmapCharacteristicSelectionViewControllerDidDeActivate.cs b/...tils/Gameplay/HarmonyPatches/BeatmapCharacteristicSelectionViewControllerDidDeActivate.cs
@@ -10,17 +10,19 @@
 using CustomUI.BeatSaber;
 namespace BS_Utils.Gameplay.Harmony_Patches
 {
-    [HarmonyPatch(typeof(BeatmapCharacteristicSelectionViewController),
-          new Type[] {   typeof(VRUI.VRUIViewController.DeactivationType) })]
-    [HarmonyPatch("DidDeactivate", MethodType.Normal)]
+    [HarmonyPatch(typeof(BeatmapCharacteristicSegmentedControlController),
+            new Type[] {
+            typeof(IDifficultyBeatmapSet[]),
+                        typeof(BeatmapCharacteristicSO)
+                                    })]
+
+    [HarmonyPatch("SetData", MethodType.Normal)]
 
     class BeatmapCharacteristicSelectionViewControllerDidDeactivate
     {
-        static void Postfix(BeatmapCharacteristicSelectionViewController __instance, VRUI.VRUIViewController.DeactivationType deactivationType)
+        static void Postfix(BeatmapCharacteristicSegmentedControlController __instance, IDifficultyBeatmapSet[] difficultyBeatmapSets, BeatmapCharacteristicSO selectedBeatmapCharacteristic)
         {
-            if (deactivationType == VRUI.VRUIViewController.DeactivationType.RemovedFromHierarchy)
-                Gamemode.ResetGameMode();      
-
+            Gamemode.CharacteristicSelectionViewController_didSelectBeatmapCharacteristicEvent(__instance, __instance.selectedBeatmapCharacteristic);
         }
     }
 }

diff --git a/Beat Saber Utils/Plugin.cs b/Beat Saber Utils/Plugin.cs
@@ -15,7 +15,7 @@ namespace BS_Utils
     public class Plugin : IPlugin
     {
         public string Name => "Beat Saber Utils";
-        public string Version => "1.2.0";
+        public string Version => "1.2.1";
         internal static bool patched = false;
         internal static HarmonyInstance harmony;
         public static Gameplay.LevelData LevelData = new Gameplay.LevelData();

diff --git a/Beat Saber Utils/Properties/AssemblyInfo.cs b/Beat Saber Utils/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]