chore: code cleanup

xhayper · Aug 23, 2024 · 25ff050 · 25ff050
1 parent 57c25eb
commit 25ff050
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/COTL_API/CustomInventory/Patches/CustomInventoryPatches.cs b/COTL_API/CustomInventory/Patches/CustomInventoryPatches.cs
@@ -254,9 +254,10 @@ private static void InventoryItem_AllBurnableFuel(ref List<InventoryItem.ITEM_TY
     private static void CookingData_GetAllFoods(ref InventoryItem.ITEM_TYPE[] __result)
     {
         var copy = __result;
-        __result = __result
-            .Concat(CustomItemList.Where(i => !copy.Contains(i.Key) && i.Value.IsFood).Select(i => i.Key))
-            .ToArray();
+        __result =
+        [
+            .. __result, .. CustomItemList.Where(i => !copy.Contains(i.Key) && i.Value.IsFood).Select(i => i.Key)
+        ];
     }
 
 

diff --git a/COTL_API/CustomLocalization/CustomLocalizationPatches.cs b/COTL_API/CustomLocalization/CustomLocalizationPatches.cs
@@ -68,7 +68,7 @@ private static bool GameSettings_OnLanguageChanged(GameSettings __instance, int
     private static bool GameSettings_GetLanguageIndex(GameSettings __instance, ref int __result)
     {
         __instance._languageSelector._prefilledContent =
-            __instance._languageSelector._prefilledContent.AddRange(LocalizationMap.Keys.ToArray());
+            __instance._languageSelector._prefilledContent.AddRange([.. LocalizationMap.Keys]);
         __instance._languageSelector.UpdateContent(__instance._languageSelector._prefilledContent);
         if (!LanguageList.Contains(SettingsManager.Settings.Game.Language)) return true;
         __result = LanguageUtilities.AllLanguages.Length + LanguageList.IndexOf(SettingsManager.Settings.Game.Language);

diff --git a/COTL_API/Helpers/PluginPaths.cs b/COTL_API/Helpers/PluginPaths.cs
@@ -4,8 +4,7 @@ internal static class PluginPaths
 {
     internal static string ResolvePath(params string[] paths)
     {
-        return Path.Combine(new List<string> { Plugin.Instance != null ? Plugin.Instance.PluginPath : "" }.Concat(paths)
-            .ToArray());
+        return Path.Combine([Plugin.Instance != null ? Plugin.Instance.PluginPath : "", .. paths]);
     }
 
     internal static string ResolveAssetPath(params string[] paths)

diff --git a/COTL_API/Patches/UIFollowerInteractionWheelOverlayControllerPatches.cs b/COTL_API/Patches/UIFollowerInteractionWheelOverlayControllerPatches.cs
@@ -74,7 +74,7 @@ public static void Postfix(
 
             __instance.Hide();
             ____commandHistory.Push(item.CommandItem.Command);
-            __instance.OnItemChosen?.Invoke(____commandHistory.ToArray());
+            __instance.OnItemChosen?.Invoke([.. ____commandHistory]);
         }
     }
 }
diff --git a/COTL_API/UI/UIManager.cs b/COTL_API/UI/UIManager.cs
@@ -79,8 +79,12 @@ private static void UISettingsMenuController_OnShowStarted(UISettingsMenuControl
         originalGraphicsSettings.OnShow -= showDelegate;
         originalGraphicsSettings.OnHide -= hideDelegate;
 
-        __instance.transform.GetComponentInChildren<SettingsTabNavigatorBase>()._tabs = __instance.transform
-            .GetComponentInChildren<SettingsTabNavigatorBase>()._tabs.Append(tab).ToArray();
+        __instance.transform.GetComponentInChildren<SettingsTabNavigatorBase>()._tabs =
+        [
+            .. __instance.transform
+                .GetComponentInChildren<SettingsTabNavigatorBase>()._tabs,
+            tab
+        ];
         var button = newSettings.GetComponentInChildren<MMButton>();
         button.onClick.RemoveAllListeners();
         button.onClick.AddListener(() => stnb.TransitionTo(tab));