From b3955379a672c8ef2eb0c474f08faa6835ef8fe2 Mon Sep 17 00:00:00 2001
From: Not Officer <marlon.john007@gmail.com>
Date: Tue, 7 Dec 2021 02:22:37 +0100
Subject: [PATCH] enum cleanups

---
 FModel/Extensions/EnumExtensions.cs        | 11 +++++----
 FModel/ViewModels/LoadingModesViewModel.cs | 11 ++++-----
 FModel/ViewModels/SettingsViewModel.cs     | 28 +++++++++++-----------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/FModel/Extensions/EnumExtensions.cs b/FModel/Extensions/EnumExtensions.cs
index f5242580..eed96e2b 100644
--- a/FModel/Extensions/EnumExtensions.cs
+++ b/FModel/Extensions/EnumExtensions.cs
@@ -1,9 +1,10 @@
-using FModel.Properties;
 using System;
 using System.ComponentModel;
 using System.Resources;
 using System.Runtime.CompilerServices;
 
+using FModel.Properties;
+
 namespace FModel.Extensions
 {
     public static class EnumExtensions
@@ -47,12 +48,12 @@ namespace FModel.Extensions
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static T ToEnum<T>(this string value, T defaultValue)
+        public static T ToEnum<T>(this string value, T defaultValue) where T : struct
         {
-            if (!Enum.TryParse(typeof(T), value, true, out var ret))
+            if (!Enum.TryParse(value, true, out T ret))
                 return defaultValue;
 
-            return (T) ret;
+            return ret;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -81,4 +82,4 @@ namespace FModel.Extensions
             return i == -1 ? (T) values.GetValue(values.Length - 1) : (T) values.GetValue(i);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/FModel/ViewModels/LoadingModesViewModel.cs b/FModel/ViewModels/LoadingModesViewModel.cs
index c06619dd..dbb0a7c4 100644
--- a/FModel/ViewModels/LoadingModesViewModel.cs
+++ b/FModel/ViewModels/LoadingModesViewModel.cs
@@ -1,10 +1,9 @@
-using FModel.Framework;
-using FModel.ViewModels.Commands;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using FModel.Settings;
+
+using FModel.Framework;
+using FModel.ViewModels.Commands;
 
 namespace FModel.ViewModels
 {
@@ -20,6 +19,6 @@ namespace FModel.ViewModels
             Modes = new ReadOnlyObservableCollection<ELoadingMode>(new ObservableCollection<ELoadingMode>(EnumerateLoadingModes()));
         }
 
-        private IEnumerable<ELoadingMode> EnumerateLoadingModes() => Enum.GetValues(UserSettings.Default.LoadingMode.GetType()).Cast<ELoadingMode>();
+        private static IEnumerable<ELoadingMode> EnumerateLoadingModes() => Enum.GetValues<ELoadingMode>();
     }
-}
\ No newline at end of file
+}
diff --git a/FModel/ViewModels/SettingsViewModel.cs b/FModel/ViewModels/SettingsViewModel.cs
index 353dfb00..345a5416 100644
--- a/FModel/ViewModels/SettingsViewModel.cs
+++ b/FModel/ViewModels/SettingsViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -18,8 +18,8 @@ namespace FModel.ViewModels
 {
     public class SettingsViewModel : ViewModel
     {
-        private ThreadWorkerViewModel _threadWorkerView => ApplicationService.ThreadWorkerView;
-        private ApiEndpointViewModel _apiEndpointView => ApplicationService.ApiEndpointView;
+        private static ThreadWorkerViewModel _threadWorkerView => ApplicationService.ThreadWorkerView;
+        private static ApiEndpointViewModel _apiEndpointView => ApplicationService.ApiEndpointView;
         private readonly DiscordHandler _discordHandler = DiscordService.DiscordHandler;
 
         private EUpdateMode _selectedUpdateMode;
@@ -271,19 +271,19 @@ namespace FModel.ViewModels
             return ret;
         }
 
-        private IEnumerable<EUpdateMode> EnumerateUpdateModes() => Enum.GetValues(SelectedUpdateMode.GetType()).Cast<EUpdateMode>();
-        private IEnumerable<string> EnumeratePresets()
+        private static IEnumerable<EUpdateMode> EnumerateUpdateModes() => Enum.GetValues<EUpdateMode>();
+        private static IEnumerable<string> EnumeratePresets()
         {
             yield return Constants._NO_PRESET_TRIGGER;
         }
-        private IEnumerable<EGame> EnumerateUeGames() => Enum.GetValues(SelectedUeGame.GetType()).Cast<EGame>();
-        private IEnumerable<ELanguage> EnumerateAssetLanguages() => Enum.GetValues(SelectedAssetLanguage.GetType()).Cast<ELanguage>();
-        private IEnumerable<EAesReload> EnumerateAesReloads() => Enum.GetValues(SelectedAesReload.GetType()).Cast<EAesReload>();
-        private IEnumerable<EDiscordRpc> EnumerateDiscordRpcs() => Enum.GetValues(SelectedDiscordRpc.GetType()).Cast<EDiscordRpc>();
-        private IEnumerable<ECompressedAudio> EnumerateCompressedAudios() => Enum.GetValues(SelectedCompressedAudio.GetType()).Cast<ECompressedAudio>();
-        private IEnumerable<EIconStyle> EnumerateCosmeticStyles() => Enum.GetValues(SelectedCosmeticStyle.GetType()).Cast<EIconStyle>();
-        private IEnumerable<EMeshFormat> EnumerateMeshExportFormat() => Enum.GetValues(SelectedMeshExportFormat.GetType()).Cast<EMeshFormat>();
-        private IEnumerable<ELodFormat> EnumerateLodExportFormat() => Enum.GetValues(SelectedLodExportFormat.GetType()).Cast<ELodFormat>();
-        private IEnumerable<ETextureFormat> EnumerateTextureExportFormat() => Enum.GetValues(SelectedTextureExportFormat.GetType()).Cast<ETextureFormat>();
+        private static IEnumerable<EGame> EnumerateUeGames() => Enum.GetValues<EGame>().SkipLast(1);
+        private static IEnumerable<ELanguage> EnumerateAssetLanguages() => Enum.GetValues<ELanguage>();
+        private static IEnumerable<EAesReload> EnumerateAesReloads() => Enum.GetValues<EAesReload>();
+        private static IEnumerable<EDiscordRpc> EnumerateDiscordRpcs() => Enum.GetValues<EDiscordRpc>();
+        private static IEnumerable<ECompressedAudio> EnumerateCompressedAudios() => Enum.GetValues<ECompressedAudio>();
+        private static IEnumerable<EIconStyle> EnumerateCosmeticStyles() => Enum.GetValues<EIconStyle>();
+        private static IEnumerable<EMeshFormat> EnumerateMeshExportFormat() => Enum.GetValues<EMeshFormat>();
+        private static IEnumerable<ELodFormat> EnumerateLodExportFormat() => Enum.GetValues<ELodFormat>();
+        private static IEnumerable<ETextureFormat> EnumerateTextureExportFormat() => Enum.GetValues<ETextureFormat>();
     }
 }