diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs index 5bf074dc5..53781dafc 100644 --- a/Dalamud/Dalamud.cs +++ b/Dalamud/Dalamud.cs @@ -263,7 +263,7 @@ namespace Dalamud { Log.Information("Dalamud is ready."); } catch (Exception ex) { - Log.Error(ex, "Oh no! Dalamud::Start() failed."); + Log.Error(ex, "Dalamud::Start() failed."); Unload(); } } @@ -308,9 +308,9 @@ namespace Dalamud { AntiDebug.Dispose(); - Log.Debug("Dalamud::Dispose OK!"); + Log.Debug("Dalamud::Dispose() OK!"); } catch (Exception ex) { - Log.Error(ex, "skjdgjjkodsfg"); + Log.Error(ex, "Dalamud::Dispose() failed."); } } diff --git a/Dalamud/EntryPoint.cs b/Dalamud/EntryPoint.cs index 028325c3d..069c5432d 100644 --- a/Dalamud/EntryPoint.cs +++ b/Dalamud/EntryPoint.cs @@ -66,7 +66,7 @@ namespace Dalamud { #endif var newLogger = new LoggerConfiguration() - .WriteTo.Async(a => a.File(logPath, outputTemplate: "{Timestamp:HH:mm:ss.fff}[{Level:u3}] {Message:lj}{NewLine}{Exception}")) + .WriteTo.Async(a => a.File(logPath, outputTemplate: "[{Timestamp:HH:mm:ss.fff}][{Level:u3}] {Message:lj}{NewLine}{Exception}")) .WriteTo.EventSink() .MinimumLevel.ControlledBy(levelSwitch) .CreateLogger(); diff --git a/Dalamud/Interface/DalamudInterface.cs b/Dalamud/Interface/DalamudInterface.cs index f005433c4..da1b60c52 100644 --- a/Dalamud/Interface/DalamudInterface.cs +++ b/Dalamud/Interface/DalamudInterface.cs @@ -22,6 +22,8 @@ namespace Dalamud.Interface { private readonly Dalamud dalamud; + private ulong frameCount = 0; + public DalamudInterface(Dalamud dalamud) { this.dalamud = dalamud; } @@ -243,6 +245,9 @@ namespace Dalamud.Interface if (this.dalamud.Framework.Gui.GameUiHidden) ImGui.BeginMenu("UI is hidden...", false); + ImGui.BeginMenu(this.frameCount.ToString(), false); + this.frameCount++; + ImGui.EndMainMenuBar(); } } diff --git a/Dalamud/Plugin/PluginManager.cs b/Dalamud/Plugin/PluginManager.cs index 810bc1ca3..baaad9466 100644 --- a/Dalamud/Plugin/PluginManager.cs +++ b/Dalamud/Plugin/PluginManager.cs @@ -182,6 +182,8 @@ namespace Dalamud.Plugin return false; } + Log.Verbose("Plugin CreateInstance..."); + var plugin = (IDalamudPlugin)Activator.CreateInstance(type); // this happens for raw plugins that don't specify a PluginDefinition - just generate a dummy one to avoid crashes anywhere @@ -202,6 +204,8 @@ namespace Dalamud.Plugin return false; } + Log.Verbose("Plugin Initialize..."); + var dalamudInterface = new DalamudPluginInterface(this.dalamud, type.Assembly.GetName().Name, this.pluginConfigs, reason); plugin.Initialize(dalamudInterface); diff --git a/lib/ImGuiScene b/lib/ImGuiScene index cc64961aa..ab463eb04 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit cc64961aab96356c3f67ba7ff529448e2d04e4b3 +Subproject commit ab463eb0434c1ffa864adfc3699afc2fe707489d