ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-22 08:29:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

check for testing api level in HasTestingVersion() instead

Browse source
This commit is contained in:
goat 2024-07-03 12:20:38 +02:00
parent a4a3318a6e
commit 8d08f46fd7
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -2274,7 +2274,7 @@ internal class PluginInstallerWindow : Window, IDisposable
if (useTesting || manifest.IsTestingExclusive) if (useTesting || manifest.IsTestingExclusive)
flags |= PluginHeaderFlags.IsTesting; flags |= PluginHeaderFlags.IsTesting;
if (this.DrawPluginCollapsingHeader(label, null, manifest, flags, () => this.DrawAvailablePluginContextMenu(manifest, effectiveApiLevel), index)) if (this.DrawPluginCollapsingHeader(label, null, manifest, flags, () => this.DrawAvailablePluginContextMenu(manifest), index))
{ {
if (!wasSeen) if (!wasSeen)
configuration.SeenPluginInternalName.Add(manifest.InternalName); configuration.SeenPluginInternalName.Add(manifest.InternalName);
@ -2352,14 +2352,13 @@ internal class PluginInstallerWindow : Window, IDisposable
ImGui.PopID(); ImGui.PopID();
} }
private void DrawAvailablePluginContextMenu(RemotePluginManifest manifest, int effectiveApiLevel) private void DrawAvailablePluginContextMenu(RemotePluginManifest manifest)
{ {
var configuration = Service<DalamudConfiguration>.Get(); var configuration = Service<DalamudConfiguration>.Get();
var pluginManager = Service<PluginManager>.Get(); var pluginManager = Service<PluginManager>.Get();
var hasTestingVersionAvailable = configuration.DoPluginTest && var hasTestingVersionAvailable = configuration.DoPluginTest &&
PluginManager.HasTestingVersion(manifest) && PluginManager.HasTestingVersion(manifest);
manifest.TestingDalamudApiLevel == effectiveApiLevel;
if (ImGui.BeginPopupContextItem("ItemContextMenu")) if (ImGui.BeginPopupContextItem("ItemContextMenu"))
{ {

3
Dalamud/Plugin/Internal/PluginManager.cs
View file

@ -281,7 +281,8 @@ internal class PluginManager : IInternalDisposableService
if (hasTv) if (hasTv)
{ {
return tv > av; return tv > av &&
manifest.TestingDalamudApiLevel == DalamudApiLevel;
} }
return false; return false;