Merge pull request #107 from ToniMacaroni/SiraUtil3

ToniMacaroni · web-flow · commit dd1cc9d8031b · 2021-12-22T22:30:27.000+01:00
code quality changes
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,13 @@
+﻿[*.cs]
+
+# UNT0023: Coalescing assignment on Unity objects
+dotnet_diagnostic.UNT0023.severity = error
+
+# UNT0022: Inefficient position/rotation assignment
+dotnet_diagnostic.UNT0022.severity = error
+
+# UNT0007: Null coalescing on Unity objects
+dotnet_diagnostic.UNT0007.severity = error
+
+# UNT0008: Null propagation on Unity objects
+dotnet_diagnostic.UNT0008.severity = error
diff --git a/SaberFactory.sln b/SaberFactory.sln
@@ -1,12 +1,17 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.31911.260
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaberFactory", "SaberFactory\SaberFactory.csproj", "{C287398D-B333-4DFE-9C7E-9518D9D09745}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaberFactory.Unity", "SaberFactory.Unity\SaberFactory.Unity.csproj", "{42D12C91-86D3-4006-8D15-0291488970B6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2B173B38-BE01-4606-9F77-D09B360CBC69}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/SaberFactory/DataStore/TextureAsset.cs b/SaberFactory/DataStore/TextureAsset.cs
@@ -7,7 +7,18 @@ namespace SaberFactory.DataStore
 {
     internal class TextureAsset : IDisposable
     {
-        public Sprite Sprite => _cachedSprite ??= CreateSprite();
+        public Sprite Sprite
+        {
+            get
+            {
+                if (_cachedSprite == null)
+                {
+                    _cachedSprite = CreateSprite();
+                }
+                return _cachedSprite;
+            }
+        }
+
         public bool IsInUse;
         public string Name;
         public EAssetOrigin Origin;
diff --git a/SaberFactory/Editor/Pedestal.cs b/SaberFactory/Editor/Pedestal.cs
@@ -60,8 +60,8 @@ public async Task Instantiate(Vector3 pos, Quaternion rot)
             SaberContainerTransform.localPosition += new Vector3(0, 1, 0);
             SaberContainerTransform.localEulerAngles = new Vector3(-90, 0, 0);
 
-            _rootTransform.position = pos;
-            _rootTransform.rotation = rot;
+            _rootTransform.SetPositionAndRotation(pos, rot);
+
 
             IsVisible = false;
         }
diff --git a/SaberFactory/Editor/SaberGrabController.cs b/SaberFactory/Editor/SaberGrabController.cs
@@ -33,7 +33,11 @@ public void ShowHandle()
             }
 
             _isHandleVisisble = true;
-            _menuPlayerController.leftController?.transform.Find("MenuHandle")?.gameObject.SetActive(_isHandleVisisble);
+
+            if (_menuPlayerController.leftController != null && _menuPlayerController.leftController.transform.Find("MenuHandle") is { } handle)
+            {
+                handle.gameObject.SetActive(_isHandleVisisble);
+            }
         }
 
         public void HideHandle()
@@ -44,7 +48,11 @@ public void HideHandle()
             }
 
             _isHandleVisisble = false;
-            _menuPlayerController.leftController?.transform.Find("MenuHandle")?.gameObject.SetActive(_isHandleVisisble);
+
+            if (_menuPlayerController != null && _menuPlayerController.leftController.transform.Find("MenuHandle") is { } handle)
+            {
+                handle.gameObject.SetActive(_isHandleVisisble);
+            }
         }
     }
 }
diff --git a/SaberFactory/Game/AFHandler.cs b/SaberFactory/Game/AFHandler.cs
@@ -78,7 +78,12 @@ public async Task InitPosition(Transform transform, float xPos)
 
         private async Task<GameObject> GetThruster()
         {
-            return _thruster ??= await _assetLoader.LoadAsset<GameObject>("Thruster");
+            if (_thruster == null)
+            {
+                _thruster = await _assetLoader.LoadAsset<GameObject>("Thruster");
+            }
+
+            return _thruster;
         }
     }
 }
diff --git a/SaberFactory/Game/EventPlayer.cs b/SaberFactory/Game/EventPlayer.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using IPA.Utilities;
+using ModestTree;
 using SaberFactory.Configuration;
 using SaberFactory.Models;
 using UnityEngine;
@@ -18,11 +19,14 @@ internal class EventPlayer : IDisposable
 
         [Inject] private readonly GameEnergyCounter _energyCounter = null;
 
-        //[Inject] private readonly ObstacleSaberSparkleEffectManager _obstacleSaberSparkleEffectManager = null;
+        [InjectOptional] private ObstacleSaberSparkleEffectManager _obstacleSaberSparkleEffectManager;
 
         [Inject] private readonly PluginConfig _pluginConfig = null;
 
         [Inject] private readonly ScoreController _scoreController = null;
+
+        [Inject] private readonly MonoKernel _monoKernel = null;
+
         private bool _didInit;
 
         [Inject(Id = "LastNoteId")] private float _lastNoteTime;
@@ -36,8 +40,8 @@ public void Dispose()
                 _beatmapObjectManager.noteWasCutEvent -= OnNoteCut;
                 _beatmapObjectManager.noteWasMissedEvent -= OnNoteMiss;
 
-                //_obstacleSaberSparkleEffectManager.sparkleEffectDidStartEvent -= SaberStartCollide;
-                //_obstacleSaberSparkleEffectManager.sparkleEffectDidEndEvent -= SaberEndCollide;
+                _obstacleSaberSparkleEffectManager.sparkleEffectDidStartEvent -= SaberStartCollide;
+                _obstacleSaberSparkleEffectManager.sparkleEffectDidEndEvent -= SaberEndCollide;
 
                 _energyCounter.gameEnergyDidReach0Event -= InvokeOnLevelFail;
 
@@ -64,8 +68,12 @@ public void SetPartEventList(List<PartEvents> partEventsList, SaberType saberTyp
             _beatmapObjectManager.noteWasMissedEvent += OnNoteMiss;
 
             // Sabers clashing
-            //_obstacleSaberSparkleEffectManager.sparkleEffectDidStartEvent += SaberStartCollide;
-            //_obstacleSaberSparkleEffectManager.sparkleEffectDidEndEvent += SaberEndCollide;
+            if (_obstacleSaberSparkleEffectManager == null)
+            {
+                _obstacleSaberSparkleEffectManager = _monoKernel.GetComponentInChildren<ObstacleSaberSparkleEffectManager>();
+            }
+            _obstacleSaberSparkleEffectManager.sparkleEffectDidStartEvent += SaberStartCollide;
+            _obstacleSaberSparkleEffectManager.sparkleEffectDidEndEvent += SaberEndCollide;
 
             // OnLevelFail
             _energyCounter.gameEnergyDidReach0Event += InvokeOnLevelFail;
diff --git a/SaberFactory/Helpers/DebugMenu.cs b/SaberFactory/Helpers/DebugMenu.cs
@@ -11,7 +11,6 @@ public class DebugMenu : MonoBehaviour
         
         private void Start()
         {
-            Debug.LogWarning("Hello");
         }
 
         private void OnGUI()
diff --git a/SaberFactory/Helpers/ShaderPropertyInfo.cs b/SaberFactory/Helpers/ShaderPropertyInfo.cs
@@ -184,7 +184,7 @@ public override void FromJson(JToken token, Material mat, params object[] args)
             public override JToken ToJson(Material mat)
             {
                 var tex = (Texture)GetValue(mat);
-                return JToken.FromObject(tex?.name??"");
+                return JToken.FromObject(tex != null ? tex.name : "");
             }
         }
 
diff --git a/SaberFactory/Installers/PluginGameInstaller.cs b/SaberFactory/Installers/PluginGameInstaller.cs
@@ -6,6 +6,7 @@
 using SaberFactory.Helpers;
 using SaberFactory.Models;
 using SiraUtil.Interfaces;
+using SiraUtil.Sabers;
 using Zenject;
 
 namespace SaberFactory.Installers
@@ -33,7 +34,7 @@ public override void InstallBindings()
             //Container.BindInterfacesAndSelfTo<AFHandler>().AsSingle();
             Container.BindInterfacesAndSelfTo<GameSaberSetup>().AsSingle();
             //Container.Bind<IModelProvider>().To<SFSaberProvider>().AsSingle();
-            Container.BindInstance(SiraUtil.Sabers.SaberModelRegistration.Create<SfSaberModelController>());
+            Container.BindInstance(SaberModelRegistration.Create<SfSaberModelController>());
 
 
 #if DEBUG && TEST_TRAIL
diff --git a/SaberFactory/Instances/Trail/SFTrail.cs b/SaberFactory/Instances/Trail/SFTrail.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using SaberFactory.Helpers;
+using TMPro;
 using UnityEngine;
 
 namespace SaberFactory.Instances.Trail
@@ -115,7 +116,11 @@ public override float GetTrailWidth(BladeMovementDataElement lastAddedData)
         public void SetMaterial(Material newMaterial)
         {
             _customMaterial = newMaterial;
-            _trailRenderer?.Cast<SFTrailRenderer>().SetMaterial(_customMaterial);
+
+            if (_trailRenderer != null)
+            {
+                _trailRenderer.Cast<SFTrailRenderer>().SetMaterial(_customMaterial);
+            }
         }
     }
 }
diff --git a/SaberFactory/Misc/VertexPool.cs b/SaberFactory/Misc/VertexPool.cs
@@ -9,7 +9,7 @@ internal class VertexPool
     {
         public const int BlockSize = 108;
 
-        public Mesh MyMesh => _meshFilter?.sharedMesh;
+        public Mesh MyMesh => _meshFilter != null ? _meshFilter.sharedMesh : null;
 
         public float BoundsScheduleTime = 1f;
         public bool ColorChanged;
@@ -73,8 +73,7 @@ private void CreateMeshObj(AltTrail owner, Material material)
             _meshFilter = _gameObject.AddComponent<MeshFilter>();
             var meshrenderer = _gameObject.AddComponent<MeshRenderer>();
 
-            _gameObject.transform.position = Vector3.zero;
-            _gameObject.transform.rotation = Quaternion.identity;
+            _gameObject.transform.SetPositionAndRotation(Vector3.zero, Quaternion.identity);
 
             meshrenderer.shadowCastingMode = ShadowCastingMode.Off;
             meshrenderer.receiveShadows = false;
diff --git a/SaberFactory/Models/PreloadMetaData.cs b/SaberFactory/Models/PreloadMetaData.cs
@@ -5,6 +5,7 @@
 using SaberFactory.Loaders;
 using SaberFactory.UI;
 using SaberFactory.UI.Lib;
+using TMPro;
 using UnityEngine;
 
 namespace SaberFactory.Models
@@ -13,8 +14,32 @@ internal class PreloadMetaData : ICustomListItem
     {
         public AssetTypeDefinition AssetTypeDefinition { get; private set; }
 
-        public Texture2D CoverTex => _coverTex ??= LoadTexture();
-        public Sprite CoverSprite => _coverSprite ??= LoadSprite();
+        public Texture2D CoverTex
+        {
+            get
+            {
+                if (_coverTex == null)
+                {
+                    _coverTex = LoadTexture();
+                }
+
+                return _coverTex;
+            }
+        }
+
+        public Sprite CoverSprite
+        {
+            get
+            {
+                if (_coverSprite == null)
+                {
+                    _coverSprite = LoadSprite();
+                }
+
+                return _coverSprite;
+            }
+        }
+
         public readonly AssetMetaPath AssetMetaPath;
 
         private byte[] _coverData;
diff --git a/SaberFactory/Plugin.cs b/SaberFactory/Plugin.cs
@@ -36,8 +36,9 @@ public async void Init(IPALogger logger, Config conf, Zenjector zenjector, Plugi
                 return;
             }
 
-            zenjector.UseLogger();
+            zenjector.UseLogger(logger);
             zenjector.UseHttpService();
+            zenjector.Expose<ObstacleSaberSparkleEffectManager>("Gameplay");
             zenjector.Install<PluginAppInstaller>(Location.App, logger, pluginConfig, metadata);
             zenjector.Install<PluginMenuInstaller>(Location.Menu);
             zenjector.Install<PluginGameInstaller>(Location.Player | Location.MultiPlayer);
@@ -52,7 +53,7 @@ public void OnEnable()
         [OnDisable]
         public void OnDisable()
         {
-            _harmony.UnpatchAll(HarmonyId);
+            _harmony.UnpatchSelf();
         }
 
         /// <summary>
diff --git a/SaberFactory/SaberFactory.csproj b/SaberFactory/SaberFactory.csproj
@@ -209,6 +209,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <None Include="..\.editorconfig" Link=".editorconfig" />
         <None Include="Directory.Build.props" Condition="Exists('Directory.Build.props')" />
         <None Include="Directory.Build.targets" Condition="Exists('Directory.Build.targets')" />
         <None Include="SaberFactory.csproj.user" Condition="Exists('SaberFactory.csproj.user')" />
@@ -303,6 +304,10 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Microsoft.Unity.Analyzers" Version="1.11.2">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
 </Project>
diff --git a/SaberFactory/UI/CustomSaber/Views/MainView.cs b/SaberFactory/UI/CustomSaber/Views/MainView.cs
@@ -37,7 +37,7 @@ public void ChangeCategory(ENavigationCategory category)
 
         private T AddView<T>(bool switchToView = false, Transform container = null) where T : SubView
         {
-            var view = CreateSubView<T>(container ?? _subViewContainer, switchToView);
+            var view = CreateSubView<T>(container != null ? container : _subViewContainer, switchToView);
             if (view is INavigationCategoryView navView)
             {
                 _navViews.Add(navView.Category, navView);
diff --git a/SaberFactory/UI/CustomSaber/Views/SaberSelectorView.cs b/SaberFactory/UI/CustomSaber/Views/SaberSelectorView.cs
@@ -114,7 +114,7 @@ private async void Setup()
 
             if (CommonHelpers.IsDate(null, 10) &&
                 _pluginConfig.SpecialBackground &&
-                _saberList.transform.GetChild(0)?.GetComponent<ImageView>() is { } imageView)
+                _saberList.transform.GetChild(0) is {} child && child.GetComponent<ImageView>() is { } imageView)
             {
                 imageView.sprite = Utilities.FindSpriteInAssembly("SaberFactory.Resources.UI.halloween_bg.png");
                 imageView.overrideSprite = imageView.sprite;
diff --git a/SaberFactory/UI/Lib/BSML/BackgroundableHandler.cs b/SaberFactory/UI/Lib/BSML/BackgroundableHandler.cs
@@ -93,7 +93,7 @@ private void AddBorder(GameObject go, bool squareSprite = false)
             if (_borderTemplate == null)
             {
                 var button = Resources.FindObjectsOfTypeAll<Button>().FirstOrDefault(x => x.name == "ActionButton");
-                var borderTransform = button?.transform.Find("Border");
+                var borderTransform = button != null ? button.transform.Find("Border") : null;
                 if (borderTransform is null)
                 {
                     return;
@@ -144,8 +144,8 @@ private void InitSprite()
             }
 
             var image = Resources.FindObjectsOfTypeAll<GameObject>()
-                .FirstOrDefault(x => x.name == "MiddleHorizontalTextSegmentedControlCell")?
-                .transform.Find("BG")?
+                .FirstOrDefault(x => x.name == "MiddleHorizontalTextSegmentedControlCell")!
+                .transform.Find("BG")
                 .GetComponent<ImageView>();
             if (image == null)
             {
@@ -168,8 +168,8 @@ private ImageView GetOrAddImageView(Backgroundable backgroundable)
             if (_imageViewPrefab == null)
             {
                 _imageViewPrefab = Resources.FindObjectsOfTypeAll<ImageView>().First(x =>
-                    x.gameObject?.name == "KeyboardWrapper" && x.sprite?.name == "RoundRect10" &&
-                    x.transform.parent?.name == "Wrapper");
+                    (x.gameObject != null ? x.gameObject.name : null) == "KeyboardWrapper" && (x.sprite != null ? x.sprite.name : null) == "RoundRect10" &&
+                    (x.transform.parent != null ? x.transform.parent.name : null) == "Wrapper");
                 if (_imageViewPrefab == null)
                 {
                     return null;
diff --git a/SaberFactory/UI/Lib/BSML/ButtonImageControllerHandler.cs b/SaberFactory/UI/Lib/BSML/ButtonImageControllerHandler.cs
@@ -68,11 +68,17 @@ private void SetSkew(ButtonImageController imageController, string skew)
         {
             imageController.BackgroundImage.SetField("_skew", float.Parse(skew));
             imageController.LineImage.SetField("_skew", float.Parse(skew));
-            imageController.ForegroundImage?.SetField("_skew", float.Parse(skew));
+            if (imageController.ForegroundImage != null)
+            {
+                imageController.ForegroundImage.SetField("_skew", float.Parse(skew));
+            }
 
             imageController.BackgroundImage.SetVerticesDirty();
             imageController.LineImage.SetVerticesDirty();
-            imageController.ForegroundImage?.SetVerticesDirty();
+            if (imageController.ForegroundImage != null)
+            {
+                imageController.ForegroundImage.SetVerticesDirty();
+            }
         }
     }
 }
diff --git a/SaberFactory/UI/Lib/SubViewSwitcher.cs b/SaberFactory/UI/Lib/SubViewSwitcher.cs
diff --git a/SaberFactory/UI/TrailPreviewer.cs b/SaberFactory/UI/TrailPreviewer.cs

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ public async Task Instantiate(Vector3 pos, Quaternion rot)`
`60`	`60`	`SaberContainerTransform.localPosition += new Vector3(0, 1, 0);`
`61`	`61`	`SaberContainerTransform.localEulerAngles = new Vector3(-90, 0, 0);`
`62`	`62`
`63`		`- _rootTransform.position = pos;`
`64`		`- _rootTransform.rotation = rot;`
	`63`	`+ _rootTransform.SetPositionAndRotation(pos, rot);`
	`64`	`+`
`65`	`65`
`66`	`66`	`IsVisible = false;`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,11 @@ public void ShowHandle()`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`_isHandleVisisble = true;`
`36`		`- _menuPlayerController.leftController?.transform.Find("MenuHandle")?.gameObject.SetActive(_isHandleVisisble);`
	`36`	`+`
	`37`	`+ if (_menuPlayerController.leftController != null && _menuPlayerController.leftController.transform.Find("MenuHandle") is { } handle)`
	`38`	`+ {`
	`39`	`+ handle.gameObject.SetActive(_isHandleVisisble);`
	`40`	`+ }`
`37`	`41`	`}`
`38`	`42`
`39`	`43`	`public void HideHandle()`
`@@ -44,7 +48,11 @@ public void HideHandle()`
`44`	`48`	`}`
`45`	`49`
`46`	`50`	`_isHandleVisisble = false;`
`47`		`- _menuPlayerController.leftController?.transform.Find("MenuHandle")?.gameObject.SetActive(_isHandleVisisble);`
	`51`	`+`
	`52`	`+ if (_menuPlayerController != null && _menuPlayerController.leftController.transform.Find("MenuHandle") is { } handle)`
	`53`	`+ {`
	`54`	`+ handle.gameObject.SetActive(_isHandleVisisble);`
	`55`	`+ }`
`48`	`56`	`}`
`49`	`57`	`}`
`50`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,12 @@ public async Task InitPosition(Transform transform, float xPos)`
`78`	`78`
`79`	`79`	`private async Task<GameObject> GetThruster()`
`80`	`80`	`{`
`81`		`- return _thruster ??= await _assetLoader.LoadAsset<GameObject>("Thruster");`
	`81`	`+ if (_thruster == null)`
	`82`	`+ {`
	`83`	`+ _thruster = await _assetLoader.LoadAsset<GameObject>("Thruster");`
	`84`	`+ }`
	`85`	`+`
	`86`	`+ return _thruster;`
`82`	`87`	`}`
`83`	`88`	`}`
`84`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ public class DebugMenu : MonoBehaviour`
`11`	`11`
`12`	`12`	`private void Start()`
`13`	`13`	`{`
`14`		`- Debug.LogWarning("Hello");`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`private void OnGUI()`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public override void FromJson(JToken token, Material mat, params object[] args)`
`184`	`184`	`public override JToken ToJson(Material mat)`
`185`	`185`	`{`
`186`	`186`	`var tex = (Texture)GetValue(mat);`
`187`		`- return JToken.FromObject(tex?.name??"");`
	`187`	`+ return JToken.FromObject(tex != null ? tex.name : "");`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using SaberFactory.Helpers;`
	`3`	`+using TMPro;`
`3`	`4`	`using UnityEngine;`
`4`	`5`
`5`	`6`	`namespace SaberFactory.Instances.Trail`
`@@ -115,7 +116,11 @@ public override float GetTrailWidth(BladeMovementDataElement lastAddedData)`
`115`	`116`	`public void SetMaterial(Material newMaterial)`
`116`	`117`	`{`
`117`	`118`	`_customMaterial = newMaterial;`
`118`		`- _trailRenderer?.Cast<SFTrailRenderer>().SetMaterial(_customMaterial);`
	`119`	`+`
	`120`	`+ if (_trailRenderer != null)`
	`121`	`+ {`
	`122`	`+ _trailRenderer.Cast<SFTrailRenderer>().SetMaterial(_customMaterial);`
	`123`	`+ }`
`119`	`124`	`}`
`120`	`125`	`}`
`121`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,9 @@ public async void Init(IPALogger logger, Config conf, Zenjector zenjector, Plugi`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`
`39`		`- zenjector.UseLogger();`
	`39`	`+ zenjector.UseLogger(logger);`
`40`	`40`	`zenjector.UseHttpService();`
	`41`	`+ zenjector.Expose<ObstacleSaberSparkleEffectManager>("Gameplay");`
`41`	`42`	`zenjector.Install<PluginAppInstaller>(Location.App, logger, pluginConfig, metadata);`
`42`	`43`	`zenjector.Install<PluginMenuInstaller>(Location.Menu);`
`43`	`44`	`zenjector.Install<PluginGameInstaller>(Location.Player \| Location.MultiPlayer);`
`@@ -52,7 +53,7 @@ public void OnEnable()`
`52`	`53`	`[OnDisable]`
`53`	`54`	`public void OnDisable()`
`54`	`55`	`{`
`55`		`- _harmony.UnpatchAll(HarmonyId);`
	`56`	`+ _harmony.UnpatchSelf();`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public void ChangeCategory(ENavigationCategory category)`
`37`	`37`
`38`	`38`	`private T AddView<T>(bool switchToView = false, Transform container = null) where T : SubView`
`39`	`39`	`{`
`40`		`- var view = CreateSubView<T>(container ?? _subViewContainer, switchToView);`
	`40`	`+ var view = CreateSubView<T>(container != null ? container : _subViewContainer, switchToView);`
`41`	`41`	`if (view is INavigationCategoryView navView)`
`42`	`42`	`{`
`43`	`43`	`_navViews.Add(navView.Category, navView);`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ private async void Setup()`
`114`	`114`
`115`	`115`	`if (CommonHelpers.IsDate(null, 10) &&`
`116`	`116`	`_pluginConfig.SpecialBackground &&`
`117`		`- _saberList.transform.GetChild(0)?.GetComponent<ImageView>() is { } imageView)`
	`117`	`+ _saberList.transform.GetChild(0) is {} child && child.GetComponent<ImageView>() is { } imageView)`
`118`	`118`	`{`
`119`	`119`	`imageView.sprite = Utilities.FindSpriteInAssembly("SaberFactory.Resources.UI.halloween_bg.png");`
`120`	`120`	`imageView.overrideSprite = imageView.sprite;`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private void AddBorder(GameObject go, bool squareSprite = false)`
`93`	`93`	`if (_borderTemplate == null)`
`94`	`94`	`{`
`95`	`95`	`var button = Resources.FindObjectsOfTypeAll<Button>().FirstOrDefault(x => x.name == "ActionButton");`
`96`		`- var borderTransform = button?.transform.Find("Border");`
	`96`	`+ var borderTransform = button != null ? button.transform.Find("Border") : null;`
`97`	`97`	`if (borderTransform is null)`
`98`	`98`	`{`
`99`	`99`	`return;`
`@@ -144,8 +144,8 @@ private void InitSprite()`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`var image = Resources.FindObjectsOfTypeAll<GameObject>()`
`147`		`- .FirstOrDefault(x => x.name == "MiddleHorizontalTextSegmentedControlCell")?`
`148`		`- .transform.Find("BG")?`
	`147`	`+ .FirstOrDefault(x => x.name == "MiddleHorizontalTextSegmentedControlCell")!`
	`148`	`+ .transform.Find("BG")`
`149`	`149`	`.GetComponent<ImageView>();`
`150`	`150`	`if (image == null)`
`151`	`151`	`{`
`@@ -168,8 +168,8 @@ private ImageView GetOrAddImageView(Backgroundable backgroundable)`
`168`	`168`	`if (_imageViewPrefab == null)`
`169`	`169`	`{`
`170`	`170`	`_imageViewPrefab = Resources.FindObjectsOfTypeAll<ImageView>().First(x =>`
`171`		`- x.gameObject?.name == "KeyboardWrapper" && x.sprite?.name == "RoundRect10" &&`
`172`		`- x.transform.parent?.name == "Wrapper");`
	`171`	`+ (x.gameObject != null ? x.gameObject.name : null) == "KeyboardWrapper" && (x.sprite != null ? x.sprite.name : null) == "RoundRect10" &&`
	`172`	`+ (x.transform.parent != null ? x.transform.parent.name : null) == "Wrapper");`
`173`	`173`	`if (_imageViewPrefab == null)`
`174`	`174`	`{`
`175`	`175`	`return null;`