use ModData.Enabled instead of ModData.Config.Enabled

This commit is contained in:
_nebula 2024-03-19 23:43:09 +00:00
parent 083409c47e
commit 9d34423702
3 changed files with 7 additions and 7 deletions

View File

@ -95,10 +95,10 @@ namespace OWML.ModHelper.Menus
InitConfigMenu(OwmlMenu, options, owmlTab); InitConfigMenu(OwmlMenu, options, owmlTab);
owmlButton.OnClick += () => owmlTab.Open(); owmlButton.OnClick += () => owmlTab.Open();
var enabledMods = _modConfigMenus.Where(modConfigMenu => modConfigMenu.ModData.Config.Enabled).ToList(); var enabledMods = _modConfigMenus.Where(modConfigMenu => modConfigMenu.ModData.Enabled).ToList();
var index = CreateBlockOfButtons(options, modsTab, enabledMods, 1, "-- ENABLED MODS --"); var index = CreateBlockOfButtons(options, modsTab, enabledMods, 1, "-- ENABLED MODS --");
foreach (var mod in _noConfigMods.Where(modData => modData.Config.Enabled)) foreach (var mod in _noConfigMods.Where(modData => modData.Enabled))
{ {
index = CreateSeparator(options, modsTab, index, mod.Manifest.Name); index = CreateSeparator(options, modsTab, index, mod.Manifest.Name);
} }
@ -106,7 +106,7 @@ namespace OWML.ModHelper.Menus
var disabledMods = _modConfigMenus.Except(enabledMods).ToList(); var disabledMods = _modConfigMenus.Except(enabledMods).ToList();
index = CreateBlockOfButtons(options, modsTab, disabledMods, index, "-- DISABLED MODS --"); index = CreateBlockOfButtons(options, modsTab, disabledMods, index, "-- DISABLED MODS --");
foreach (var mod in _noConfigMods.Where(modData => !modData.Config.Enabled)) foreach (var mod in _noConfigMods.Where(modData => !modData.Enabled))
{ {
index = CreateSeparator(options, modsTab, index, mod.Manifest.Name); index = CreateSeparator(options, modsTab, index, mod.Manifest.Name);
} }

View File

@ -25,7 +25,7 @@ namespace OWML.ModLoader
} }
// Don't show incompatible OWML version error for disabled mods #369 // Don't show incompatible OWML version error for disabled mods #369
if (!data.Config.Enabled) if (!data.Enabled)
{ {
return true; return true;
} }

View File

@ -105,7 +105,7 @@ namespace OWML.ModLoader
var sortedMods = SortMods(mods); var sortedMods = SortMods(mods);
var modNames = mods.Where(mod => mod.Config.Enabled) var modNames = mods.Where(mod => mod.Enabled)
.Select(mod => mod.Manifest.UniqueName).ToList(); .Select(mod => mod.Manifest.UniqueName).ToList();
_console.WriteLine($"Getting game vendor...", MessageType.Debug); _console.WriteLine($"Getting game vendor...", MessageType.Debug);
@ -127,7 +127,7 @@ namespace OWML.ModLoader
foreach (var modData in sortedMods) foreach (var modData in sortedMods)
{ {
var missingDependencies = modData.Config.Enabled var missingDependencies = modData.Enabled
? modData.Manifest.Dependencies.Where(dependency => !modNames.Contains(dependency)).ToList() ? modData.Manifest.Dependencies.Where(dependency => !modNames.Contains(dependency)).ToList()
: new List<string>(); : new List<string>();
@ -174,7 +174,7 @@ namespace OWML.ModLoader
private Type LoadMod(IModData modData) private Type LoadMod(IModData modData)
{ {
if (!modData.Config.Enabled) if (!modData.Enabled)
{ {
_console.WriteLine($"{modData.Manifest.UniqueName} is disabled", MessageType.Debug); _console.WriteLine($"{modData.Manifest.UniqueName} is disabled", MessageType.Debug);
return null; return null;