diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index 84ca51b42..e6c842eae 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -1124,7 +1124,7 @@ namespace Dalamud.Interface.Internal.Windows } // Outdated API level - if (plugin.Manifest.DalamudApiLevel < PluginManager.DalamudApiLevel) + if (plugin.IsOutdated) { label += Locs.PluginTitleMod_OutdatedError; trouble = true; @@ -1174,7 +1174,7 @@ namespace Dalamud.Interface.Internal.Windows ImGui.TextWrapped(manifest.Description); } - if (plugin.Manifest.DalamudApiLevel < PluginManager.DalamudApiLevel) + if (plugin.IsOutdated) { ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed); ImGui.TextWrapped(Locs.PluginBody_Outdated); @@ -1263,7 +1263,7 @@ namespace Dalamud.Interface.Internal.Windows var disabled = this.updateStatus == OperationStatus.InProgress || this.installStatus == OperationStatus.InProgress; // Disable everything if the plugin is outdated - disabled = disabled || (plugin.Manifest.DalamudApiLevel < PluginManager.DalamudApiLevel && !configuration.LoadAllApiLevels); + disabled = disabled || (plugin.IsOutdated && !configuration.LoadAllApiLevels); if (plugin.State == PluginState.InProgress) { diff --git a/Dalamud/Plugin/Internal/LocalPlugin.cs b/Dalamud/Plugin/Internal/LocalPlugin.cs index e5f26c418..0b2b1d91f 100644 --- a/Dalamud/Plugin/Internal/LocalPlugin.cs +++ b/Dalamud/Plugin/Internal/LocalPlugin.cs @@ -173,6 +173,11 @@ namespace Dalamud.Plugin.Internal /// public bool IsDisabled => this.Manifest.Disabled; + /// + /// Gets a value indicating whether this plugin's API level is out of date. + /// + public bool IsOutdated => this.Manifest.DalamudApiLevel < PluginManager.DalamudApiLevel; + /// /// Gets a value indicating whether the plugin is for testing use only. /// diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs index 5b87abbb1..d8bf6b802 100644 --- a/Dalamud/Plugin/Internal/PluginManager.cs +++ b/Dalamud/Plugin/Internal/PluginManager.cs @@ -561,7 +561,7 @@ namespace Dalamud.Plugin.Internal Log.Information(ex, $"Dev plugin failed to load, adding anyways: {dllFile.Name}"); plugin.Disable(); // Disable here, otherwise you can't enable+load later } - else if (plugin.Manifest.DalamudApiLevel < DalamudApiLevel) + else if (plugin.IsOutdated) { // Out of date plugins get added so they can be updated. Log.Information(ex, $"Plugin was outdated, adding anyways: {dllFile.Name}");