From 9d344237025d80a3e8cee892da3e7c997b4e8098 Mon Sep 17 00:00:00 2001 From: _nebula <41904486+misternebula@users.noreply.github.com> Date: Tue, 19 Mar 2024 23:43:09 +0000 Subject: [PATCH] use ModData.Enabled instead of ModData.Config.Enabled --- src/OWML.ModHelper.Menus/ModsMenu.cs | 6 +++--- src/OWML.ModLoader/ModVersionChecker.cs | 2 +- src/OWML.ModLoader/Owo.cs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/OWML.ModHelper.Menus/ModsMenu.cs b/src/OWML.ModHelper.Menus/ModsMenu.cs index ca773160..04ffc96c 100644 --- a/src/OWML.ModHelper.Menus/ModsMenu.cs +++ b/src/OWML.ModHelper.Menus/ModsMenu.cs @@ -95,10 +95,10 @@ namespace OWML.ModHelper.Menus InitConfigMenu(OwmlMenu, options, owmlTab); 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 --"); - 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); } @@ -106,7 +106,7 @@ namespace OWML.ModHelper.Menus var disabledMods = _modConfigMenus.Except(enabledMods).ToList(); 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); } diff --git a/src/OWML.ModLoader/ModVersionChecker.cs b/src/OWML.ModLoader/ModVersionChecker.cs index e0aff0d8..0d83c17b 100644 --- a/src/OWML.ModLoader/ModVersionChecker.cs +++ b/src/OWML.ModLoader/ModVersionChecker.cs @@ -25,7 +25,7 @@ namespace OWML.ModLoader } // Don't show incompatible OWML version error for disabled mods #369 - if (!data.Config.Enabled) + if (!data.Enabled) { return true; } diff --git a/src/OWML.ModLoader/Owo.cs b/src/OWML.ModLoader/Owo.cs index 77f46fea..1f0793c4 100644 --- a/src/OWML.ModLoader/Owo.cs +++ b/src/OWML.ModLoader/Owo.cs @@ -105,7 +105,7 @@ namespace OWML.ModLoader 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(); _console.WriteLine($"Getting game vendor...", MessageType.Debug); @@ -127,7 +127,7 @@ namespace OWML.ModLoader foreach (var modData in sortedMods) { - var missingDependencies = modData.Config.Enabled + var missingDependencies = modData.Enabled ? modData.Manifest.Dependencies.Where(dependency => !modNames.Contains(dependency)).ToList() : new List(); @@ -174,7 +174,7 @@ namespace OWML.ModLoader private Type LoadMod(IModData modData) { - if (!modData.Config.Enabled) + if (!modData.Enabled) { _console.WriteLine($"{modData.Manifest.UniqueName} is disabled", MessageType.Debug); return null;