Some more refactoring

Author: jan-bures

src/CommunityFixes/CommunityFixesMod.cs

@@ -37,7 +37,7 @@ private void Awake()
 
         foreach (var type in types)
         {
-            if (type.IsAbstract || !HasFixType(type))
+            if (type.IsAbstract || !type.IsSubclassOf(typeof(BaseFix)))
             {
                 continue;
             }
@@ -66,9 +66,7 @@ public override void OnInitialized()
 
     private bool LoadFix(Type type)
     {
-        var fixName = GetFixName(type);
-
-        if (!Config.IsFixEnabled(type, fixName))
+        if (!Config.IsFixEnabled(type))
         {
             return false;
         }
@@ -84,40 +82,4 @@ private bool LoadFix(Type type)
 
         return true;
     }
-
-    private static string GetFixName(Type type)
-    {
-        var attributes = Attribute.GetCustomAttributes(type);
-        foreach (var attribute in attributes)
-        {
-            if (attribute is FixAttribute fix)
-            {
-                return fix.Name;
-            }
-        }
-
-        throw new Exception($"The attribute {typeof(FixAttribute).FullName} has to be declared on a fix class.");
-    }
-
-    private static bool HasFixType(Type type)
-    {
-        if (type == null)
-        {
-            return false;
-        }
-
-        // return all inherited types
-        var currentBaseType = type.BaseType;
-        while (currentBaseType != null)
-        {
-            if (currentBaseType == typeof(BaseFix))
-            {
-                return true;
-            }
-
-            currentBaseType = currentBaseType.BaseType;
-        }
-
-        return false;
-    }
 }

src/CommunityFixes/Configuration.cs

@@ -1,4 +1,5 @@
 using BepInEx.Configuration;
+using CommunityFixes.Fix;
 
 namespace CommunityFixes;
 
@@ -22,9 +23,8 @@ public Configuration(ConfigFile file)
     /// Gets the toggle value for a fix class.
     /// </summary>
     /// <param name="type">Type of the fix class.</param>
-    /// <param name="name">Name of the fix class.</param>
-    /// <returns></returns>
-    public bool IsFixEnabled(Type type, string name)
+    /// <returns>The toggle value for the fix class.</returns>
+    public bool IsFixEnabled(Type type)
     {
         // If the toggle value for a fix class is already defined, we return it
         if (_fixesEnabled.TryGetValue(type, out var isEnabled))
@@ -33,7 +33,8 @@ public bool IsFixEnabled(Type type, string name)
         }
 
         // Otherwise create a new config entry for the fix class and return its default value (true)
-        var configEntry = _file.Bind(TogglesSection, type.Name, true, name);
+        var metadata = FixAttribute.GetForType(type);
+        var configEntry = _file.Bind(TogglesSection, type.Name, true, metadata.Name);
         _fixesEnabled.Add(type, configEntry);
         return configEntry.Value;
     }