CountersSettingsGroup cleanup

NuggoDEV · Sep 9, 2024 · 051f46e · 051f46e
1 parent b062862
commit 051f46e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/Counters+/UI/FlowCoordinators/CountersPlusSettingsFlowCoordinator.cs b/Counters+/UI/FlowCoordinators/CountersPlusSettingsFlowCoordinator.cs
@@ -9,7 +9,6 @@
 using UnityEngine;
 using VRUIControls;
 using Zenject;
-using BeatSaber.Settings;
 using static CountersPlus.Utils.Accessors;
 
 namespace CountersPlus.UI.FlowCoordinators

diff --git a/Counters+/UI/SettingGroups/CountersSettingsGroup.cs b/Counters+/UI/SettingGroups/CountersSettingsGroup.cs
@@ -5,7 +5,6 @@
 using CountersPlus.UI.ViewControllers.Editing;
 using CountersPlus.Utils;
 using HMUI;
-using IPA.Utilities;
 using Zenject;
 
 namespace CountersPlus.UI.SettingGroups
@@ -18,32 +17,29 @@ public class CountersSettingsGroup : SettingsGroup
         public override CustomListTableData.CustomCellInfo CellInfoForIdx(int idx)
         {
             var model = flowCoordinator.Value.AllConfigModels[idx];
-            CountersPlusListTableCell customCellInfo = null; 
             if (model is CustomConfigModel customConfig)
             {
                 if (customConfig.AttachedCustomCounter.BSML != null && !string.IsNullOrEmpty(customConfig.AttachedCustomCounter.BSML.Icon))
                 {
                     try
                     {
-                        customCellInfo = new CountersPlusListTableCell(idx, customConfig.AttachedCustomCounter.Name, null, ImagesUtility.LoadSpriteFromExternalAssemblyResources(
+                        return new CountersPlusListTableCell(idx, customConfig.AttachedCustomCounter.Name, null, ImagesUtility.LoadSpriteFromExternalAssemblyResources(
                             customConfig.AttachedCustomCounter.CounterType.Assembly, customConfig.AttachedCustomCounter.BSML.Icon));
                     }
                     catch
                     {
-                        customCellInfo = new CountersPlusListTableCell(idx, customConfig.AttachedCustomCounter.Name,"\n<i>(Failed to load custom icon.)</i>", LoadSprite("Counters.Custom"));
+                        return new CountersPlusListTableCell(idx, customConfig.AttachedCustomCounter.Name,"\n<i>(Failed to load custom icon.)</i>", LoadSprite("Counters.Custom"));
                     }
                 }
                 else
                 {
-                    customCellInfo = new CountersPlusListTableCell(idx, customConfig.AttachedCustomCounter.Name, null, LoadSprite("Counters.Custom"));
+                    return new CountersPlusListTableCell(idx, customConfig.AttachedCustomCounter.Name, null, LoadSprite("Counters.Custom"));
                 }
             }
             else
             {
-                customCellInfo = new CountersPlusListTableCell(idx, model.DisplayName, null, LoadSprite($"Counters.{model.DisplayName}"));
+                return new CountersPlusListTableCell(idx, model.DisplayName, null, LoadSprite($"Counters.{model.DisplayName}"));
             }
-
-            return customCellInfo;
         }
 
         public override int NumberOfCells() => flowCoordinator.Value.AllConfigModels.Count;

diff --git a/Counters+/UI/ViewControllers/CountersPlusBlankViewController.cs b/Counters+/UI/ViewControllers/CountersPlusBlankViewController.cs
@@ -1,6 +1,5 @@
 using BeatSaberMarkupLanguage.Attributes;
 using BeatSaberMarkupLanguage.ViewControllers;
-using HMUI;
 using System.Collections;
 using UnityEngine;