ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-29 20:03:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into plugin-name

Browse source
This commit is contained in:
kal 2023-03-01 16:27:56 -05:00 • committed by GitHub
commit 97a2c103e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 13220 additions and 7113 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Dalamud/Plugin/DalamudPluginInterface.cs
View file

@ -17,6 +17,7 @@ using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface;
using Dalamud.Interface.Internal;
using Dalamud.Interface.Internal.Windows.PluginInstaller;
using Dalamud.Plugin.Internal;
using Dalamud.Plugin.Internal.Types;
using Dalamud.Plugin.Ipc;
@ -199,6 +200,24 @@ public sealed class DalamudPluginInterface : IDisposable
/// </summary>
public List<string> PluginInternalNames => Service<PluginManager>.Get().InstalledPlugins.Select(p => p.Manifest.InternalName).ToList();
/// <summary>
/// Opens the <see cref="PluginInstallerWindow"/> with the plugin name set as search target.
/// </summary>
/// <returns>Returns false if the DalamudInterface was null.</returns>
public bool OpenPluginInstaller()
{
var dalamudInterface = Service<DalamudInterface>.GetNullable(); // Can be null during boot
if (dalamudInterface == null)
{
return false;
}
dalamudInterface.OpenPluginInstallerPluginInstalled();
dalamudInterface.SetPluginInstallerSearchText(this.pluginName);
return true;
}
#region IPC
/// <inheritdoc cref="DataShare.GetOrCreateData{T}"/>

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

@ -1273,7 +1273,7 @@ Thanks and have fun!";
Debug.Assert(this.bannedPlugins != null, "this.bannedPlugins != null");
if (this.LoadBannedPlugins)
return true;
return false;
var config = Service<DalamudConfiguration>.Get();