Fix mod loader mod enable/disable functionality.

Author: FilUnderscore

Source/Mod/Mod.cs

@@ -31,7 +31,7 @@ public bool Loaded
         }
 
         protected bool forceloaded = false;
-        private bool preloaded = true;
+        internal bool preloaded = true;
         internal bool initialized = false;
 
         public bool NextState
@@ -64,6 +64,7 @@ public Mod(Info.ModInfo info, Manifest.ModManifest manifest, global::Mod instanc
             this.Manifest = manifest;
             this.instance = instance;
             this.modDisableState = modDisableState;
+            this.initialized = true;
         }
 
         public EModDisableState GetModDisableState()
@@ -81,7 +82,7 @@ public EModDisableState GetModDisableState()
 
         public string GetModDisableStateReason()
         {
-            switch (this.modDisableState)
+            switch (this.GetModDisableState())
             {
                 case EModDisableState.Allowed:
                     return "";

Source/Mod/ModLoader.cs

@@ -108,9 +108,9 @@ public void SetSelfAndDetectMods(global::Mod _modInstance)
             }
         }
 
-        public bool IsModEnabled(Mod mod)
+        public bool IsModEnabled(global::Mod mod)
         {
-            return !disabledModNames.Contains(mod.Info.Name);
+            return !disabledModNames.Contains(mod.Name);
         }
 
         public Mod GetModFromInstance(global::Mod instance)
@@ -136,6 +136,7 @@ public bool SaveModChanges()
                     if (mod.NextState)
                     {
                         lines.RemoveAll(modName => mod.Info.Name.EqualsCaseInsensitive(modName));
+                        disabledModNames.Remove(mod.Info.Name);
                         mod.Load();
                     }
                     else if(!lines.Contains(mod.Info.Name))

Source/Mod/ModLoaderPatches.cs

@@ -4,47 +4,34 @@ namespace CustomModManager.Mod
 {
     internal sealed class ModLoaderPatches
     {
-        // Flag to prevent mod DLLs loading after Mod Manager does to prevent disabled mods from loading automatically.
-        public static bool CAN_INIT_MOD_CODE = false;
-
         [HarmonyPatch(typeof(global::Mod))]
         [HarmonyPatch(nameof(global::Mod.InitModCode))]
         private sealed class Mod_InitModCode_Patch
         {
-            private static int PRE_INIT_COUNT = 1; // 1 includes 7 Days To Die itself.
-
-            private static bool Prefix()
+            private static bool Prefix(global::Mod __instance)
             {
-                if (!CAN_INIT_MOD_CODE)
-                    PRE_INIT_COUNT++;
+                Mod modInstance = ModLoader.Instance.GetModFromInstance(__instance);
+                modInstance.preloaded = false;
 
-                return CAN_INIT_MOD_CODE;
-            }
+                bool enabled = ModLoader.Instance.IsModEnabled(__instance);
+                modInstance.initialized = enabled;
 
-            private static int MOD_COUNT
-            {
-                get
-                {
-                    return ModLoader.Instance.GetMods(false).Count;
-                }
+                return enabled;
             }
+        }
 
-            private static void Postfix()
+        [HarmonyPatch(typeof(global::ModManager))]
+        [HarmonyPatch(nameof(global::ModManager.ModLoaded))]
+        private sealed class ModManager_ModLoaded_Patch
+        {
+            private static void Postfix(string _modName, ref bool __result)
             {
-                if (CAN_INIT_MOD_CODE)
-                    return;
-
-                int modCount = MOD_COUNT;
-                CAN_INIT_MOD_CODE = PRE_INIT_COUNT == modCount;
-                
-                if(CAN_INIT_MOD_CODE)
+                if(__result == false)
                 {
-                    foreach(var mod in ModLoader.Instance.GetMods(false))
-                    {
-                        if(ModLoader.Instance.IsModEnabled(mod))
-                            mod.Load();
-                    }
+                    return;
                 }
+
+                __result = ModLoader.Instance.IsModEnabled(ModManager.loadedMods.dict[_modName]);
             }
         }
     }