Fixed(?) a crash when entering multiplayer

Exomanz · Apr 23, 2023 · 43e6acb · 43e6acb
1 parent 8f40faf
commit 43e6acb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/MenuSaberColors/MenuSaberColorManager.cs b/MenuSaberColors/MenuSaberColorManager.cs
@@ -13,7 +13,7 @@ namespace MenuSaberColors
 {
     public class MenuSaberColorManager : MonoBehaviour
     {
-        [Inject] private readonly SiraLog Logger;
+        private SiraLog logger = null!;
 
         public MethodInfo setColorsMethod = typeof(SetSaberGlowColor).GetMethod("SetColors");
         public List<SetSaberGlowColor> leftSideSabers = new List<SetSaberGlowColor>();
@@ -22,8 +22,9 @@ public class MenuSaberColorManager : MonoBehaviour
         private ColorSchemesSettings playerColorSchemesSettings;
 
         [Inject]
-        internal void Construct(PlayerDataModel dataModel)
+        internal void Construct(PlayerDataModel dataModel, SiraLog logger)
         {
+            this.logger = logger;
             playerColorSchemesSettings = dataModel.playerData.colorSchemesSettings;
             Patches.ShouldSaberColorsBeUpdated += this.RefreshData;
         }
@@ -49,7 +50,7 @@ public void RefreshData(MenuEnvironmentManager.MenuEnvironmentType menuEnvironme
             }
             catch (Exception ex)
             {
-                Logger.Error("Error occured while trying to update saber colors.\n" + ex);
+                logger.Error("Error occured while refreshing saber data.\n" + ex);
                 return;
             }
 
@@ -155,9 +156,9 @@ public static Color ToColor(HSBColor hsbColor)
                 return new Color(Mathf.Clamp01(r), Mathf.Clamp01(g), Mathf.Clamp01(b), hsbColor.a);
             }
         }
-
+#pragma warning disable CS0649
         [Inject] private readonly MenuSaberColorManager colorManager;
-
+#pragma warning restore CS0649
         private readonly FieldAccessor<ColorScheme, Color>.Accessor saberAColorAccessor = FieldAccessor<ColorScheme, Color>.GetAccessor("_saberAColor");
         private readonly FieldAccessor<ColorScheme, Color>.Accessor saberBColorAccessor = FieldAccessor<ColorScheme, Color>.GetAccessor("_saberBColor");
         private ColorScheme aprilFools = new ColorScheme("memory-only_menuSaberColors_aprilFoolsColorScheme", "LOL", useNonLocalizedName: false, "OWNED", isEditable: false, new Color(0f, 0f, 0f), new Color(0f, 0f, 0f), new Color(0f, 0f, 0f), new Color(0f, 0f, 0f), supportsEnvironmentColorBoost: false, new Color(0f, 0f, 0f), new Color(0f, 0f, 0f), new Color(0f, 0f, 0f));

diff --git a/MenuSaberColors/Patches.cs b/MenuSaberColors/Patches.cs
@@ -32,6 +32,9 @@ internal void ToggleValueChangedPostfix()
         [AffinityPatch(typeof(MenuEnvironmentManager), nameof(MenuEnvironmentManager.ShowEnvironmentType), AffinityMethodType.Normal)]
         internal void ShowEnvironmentTypePostfix(ref MenuEnvironmentManager.MenuEnvironmentType menuEnvironmentType)
         {
+            if (menuEnvironmentType == MenuEnvironmentManager.MenuEnvironmentType.Lobby)
+                return;
+
             ShouldSaberColorsBeUpdated(menuEnvironmentType);
         }
     }

diff --git a/MenuSaberColors/Plugin.cs b/MenuSaberColors/Plugin.cs
@@ -32,7 +32,7 @@ public Plugin(IPALogger logger, Zenjector zenjector)
             zenjector.Install<ColorManagerInstaller>(Container =>
             {
                 GameObject saberColorManagerGO;
-                bool doesObjectExist = GameObject.Find("MenuSaberColorManager") != null;
+                bool doesObjectExist = GameObject.Find("MenuSaberColorManager") != null!;
 
                 if (doesObjectExist) return;
                 else saberColorManagerGO = new GameObject("MenuSaberColorManager");

diff --git a/MenuSaberColors/Properties/AssemblyInfo.cs b/MenuSaberColors/Properties/AssemblyInfo.cs
@@ -31,5 +31,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.0.7")]
-[assembly: AssemblyFileVersion("1.0.7")]
+[assembly: AssemblyVersion("1.0.8")]
+[assembly: AssemblyFileVersion("1.0.8")]
diff --git a/MenuSaberColors/manifest.json b/MenuSaberColors/manifest.json
@@ -3,9 +3,9 @@
   "id": "MenuSaberColors",
   "name": "MenuSaberColors",
   "author": "Exomanz",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "A PC Port of henri's QonsistentSaberColors, which allows for your menu pointers to be the same color as your selected color scheme!",
-  "gameVersion": "1.27.0",
+  "gameVersion": "1.29.1",
   "dependsOn": {
     "BSIPA": "^4.2.2",
     "SiraUtil": "^3.1.2"