ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-31 21:03:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: some more plugin installer stuff

Browse source
This commit is contained in:
goat 2020-02-23 22:34:08 +09:00
parent f40326fde7
commit 877b95eca6
6 changed files with 64 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Dalamud/Dalamud.cs
View file

@ -43,7 +43,7 @@ namespace Dalamud {
public readonly DiscordBotManager BotManager;
public readonly PluginManager PluginManager;
public PluginManager PluginManager { get; private set; }
public readonly ClientState ClientState;
@ -88,8 +88,6 @@ namespace Dalamud {
this.BotManager = new DiscordBotManager(this, this.Configuration.DiscordFeatureConfig);
this.PluginManager = new PluginManager(this, info.PluginDirectory);
this.WinSock2 = new WinSockHandlers();
try {
@ -112,6 +110,7 @@ namespace Dalamud {
this.BotManager.Start();
try {
this.PluginManager = new PluginManager(this, this.StartInfo.PluginDirectory, this.StartInfo.DefaultPluginDirectory);
this.PluginManager.LoadPlugins();
} catch (Exception ex) {
this.Framework.Gui.Chat.PrintError(
@ -211,7 +210,7 @@ namespace Dalamud {
{
if (ImGui.MenuItem("Open Plugin installer"))
{
this.pluginWindow = new PluginInstallerWindow(this.PluginManager, this.StartInfo.PluginDirectory);
this.pluginWindow = new PluginInstallerWindow(this.PluginManager, this.StartInfo.PluginDirectory, this.StartInfo.GameVersion);
this.isImguiDrawPluginWindow = true;
}
if (ImGui.MenuItem("Print plugin info")) {