From 779179a0cfe0e04d1b34a23c06a5d352b08d3f6f Mon Sep 17 00:00:00 2001 From: Raymond Date: Mon, 16 Aug 2021 09:00:16 -0400 Subject: [PATCH] Formatting, misc --- Dalamud/Dalamud.cs | 3 +-- Dalamud/Game/Gui/FlyText/FlyTextGui.cs | 2 +- Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs | 1 - .../Internal/Scratchpad/ScratchExecutionManager.cs | 7 +++---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs index b4adb991c..07ab37343 100644 --- a/Dalamud/Dalamud.cs +++ b/Dalamud/Dalamud.cs @@ -35,9 +35,7 @@ namespace Dalamud #region Internals private readonly ManualResetEvent unloadSignal; - private readonly ManualResetEvent finishUnloadSignal; - private bool hasDisposedPlugins = false; #endregion @@ -237,6 +235,7 @@ namespace Dalamud // Initialize FFXIVClientStructs function resolver FFXIVClientStructs.Resolver.Initialize(); + Log.Information("[T1] FFXIVClientStructs initialized!"); } catch (Exception ex) diff --git a/Dalamud/Game/Gui/FlyText/FlyTextGui.cs b/Dalamud/Game/Gui/FlyText/FlyTextGui.cs index 44070d911..64b3a2ea4 100644 --- a/Dalamud/Game/Gui/FlyText/FlyTextGui.cs +++ b/Dalamud/Game/Gui/FlyText/FlyTextGui.cs @@ -133,7 +133,7 @@ namespace Dalamud.Game.Gui.FlyText // Get the UI module and flytext addon pointers var ui = (UIModule*)this.Dalamud.Framework.Gui.GetUIModule(); - var flytext = this.Dalamud.Framework.Gui.GetUiObjectByName("_FlyText", 1); + var flytext = this.Dalamud.Framework.Gui.GetAddonByName("_FlyText", 1); if (ui == null || flytext == IntPtr.Zero) return; diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs index 04bcd1029..69588f085 100644 --- a/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs +++ b/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.IO; diff --git a/Dalamud/Interface/Internal/Scratchpad/ScratchExecutionManager.cs b/Dalamud/Interface/Internal/Scratchpad/ScratchExecutionManager.cs index ba3a501eb..676a34381 100644 --- a/Dalamud/Interface/Internal/Scratchpad/ScratchExecutionManager.cs +++ b/Dalamud/Interface/Internal/Scratchpad/ScratchExecutionManager.cs @@ -4,7 +4,6 @@ using System.Linq; using Dalamud.Plugin; using ImGuiNET; -using Lumina.Excel.GeneratedSheets; using Microsoft.CodeAnalysis.CSharp.Scripting; using Microsoft.CodeAnalysis.Scripting; using Serilog; @@ -65,10 +64,10 @@ namespace Dalamud.Interface.Internal.Scratchpad var options = ScriptOptions.Default .AddReferences(typeof(ImGui).Assembly) .AddReferences(typeof(Dalamud).Assembly) - .AddReferences(typeof(FFXIVClientStructs.Attributes.Addon).Assembly) // FFXIVClientStructs + .AddReferences(typeof(FFXIVClientStructs.Resolver).Assembly) // FFXIVClientStructs .AddReferences(typeof(Lumina.GameData).Assembly) // Lumina - .AddReferences(typeof(TerritoryType).Assembly) // Lumina.Excel - // .WithReferences(MetadataReference.CreateFromFile(typeof(ScratchExecutionManager).Assembly.Location)) + .AddReferences(typeof(Lumina.Excel.GeneratedSheets.TerritoryType).Assembly) // Lumina.Excel + // .WithReferences(MetadataReference.CreateFromFile(typeof(ScratchExecutionManager).Assembly.Location)) .AddImports("System") .AddImports("System.IO") .AddImports("System.Reflection")