From f2bcc9d0a3d6d41d0121375a6dc749fbcbedb1a1 Mon Sep 17 00:00:00 2001 From: Anna Clemens Date: Mon, 22 Nov 2021 23:20:18 -0500 Subject: [PATCH] style: run formatter --- Glamaholic/Commands.cs | 2 +- Glamaholic/FodyWeavers.xml | 7 ++++--- Glamaholic/GameFunctions.cs | 5 +++-- Glamaholic/Plugin.cs | 6 +++--- Glamaholic/PluginUi.cs | 2 +- Glamaholic/Ui/Helpers/HelperUtil.cs | 2 +- Glamaholic/Util.cs | 10 +++++----- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Glamaholic/Commands.cs b/Glamaholic/Commands.cs index 6c45810..8fb08f1 100755 --- a/Glamaholic/Commands.cs +++ b/Glamaholic/Commands.cs @@ -16,7 +16,7 @@ namespace Glamaholic { public void Dispose() { this.Plugin.CommandManager.RemoveHandler("/glamaholic"); } - + private void OnCommand(string command, string arguments) { this.Plugin.Ui.ToggleMainInterface(); } diff --git a/Glamaholic/FodyWeavers.xml b/Glamaholic/FodyWeavers.xml index 37de851..9d080e9 100755 --- a/Glamaholic/FodyWeavers.xml +++ b/Glamaholic/FodyWeavers.xml @@ -1,3 +1,4 @@ - - - + + + \ No newline at end of file diff --git a/Glamaholic/GameFunctions.cs b/Glamaholic/GameFunctions.cs index fe1cb9e..bea6e7a 100755 --- a/Glamaholic/GameFunctions.cs +++ b/Glamaholic/GameFunctions.cs @@ -57,7 +57,7 @@ namespace Glamaholic { this._armoirePtr = this.Plugin.SigScanner.GetStaticAddressFromSig(Signatures.ArmoirePointer); this._tryOn = Marshal.GetDelegateForFunctionPointer(this.Plugin.SigScanner.ScanText(Signatures.TryOn)); this._examineNamePtr = this.Plugin.SigScanner.GetStaticAddressFromSig(Signatures.ExamineNamePointer); - + this.Plugin.ChatGui.ChatMessage += this.OnChat; } @@ -193,7 +193,7 @@ namespace Glamaholic { continue; } } - + *slotPtr = slot; if (item.ItemId == 0) { this._clearGlamourPlateSlot((IntPtr) agent, slot); @@ -290,6 +290,7 @@ namespace Glamaholic { } else { usedStains[address] = 1; } + goto NoBreakLabels; } } diff --git a/Glamaholic/Plugin.cs b/Glamaholic/Plugin.cs index 1f13884..7f1bfd7 100755 --- a/Glamaholic/Plugin.cs +++ b/Glamaholic/Plugin.cs @@ -12,16 +12,16 @@ namespace Glamaholic { [PluginService] internal DalamudPluginInterface Interface { get; init; } - + [PluginService] internal ChatGui ChatGui { get; init; } - + [PluginService] internal CommandManager CommandManager { get; init; } [PluginService] internal DataManager DataManager { get; init; } - + [PluginService] internal GameGui GameGui { get; init; } diff --git a/Glamaholic/PluginUi.cs b/Glamaholic/PluginUi.cs index 935bba4..b2c02f1 100755 --- a/Glamaholic/PluginUi.cs +++ b/Glamaholic/PluginUi.cs @@ -102,7 +102,7 @@ namespace Glamaholic { if (mirage.ItemId == 0) { continue; } - + this.Plugin.Functions.TryOn(mirage.ItemId, mirage.StainId); SetTryOnSave(true); } diff --git a/Glamaholic/Ui/Helpers/HelperUtil.cs b/Glamaholic/Ui/Helpers/HelperUtil.cs index 5a7a7c8..7063fdb 100755 --- a/Glamaholic/Ui/Helpers/HelperUtil.cs +++ b/Glamaholic/Ui/Helpers/HelperUtil.cs @@ -21,7 +21,7 @@ namespace Glamaholic.Ui.Helpers { if (addon == null) { return null; } - + var root = addon->RootNode; if (root == null) { return null; diff --git a/Glamaholic/Util.cs b/Glamaholic/Util.cs index 6729a1d..5bad434 100755 --- a/Glamaholic/Util.cs +++ b/Glamaholic/Util.cs @@ -10,7 +10,7 @@ namespace Glamaholic { internal const string PlateAddon = "MiragePrismMiragePlate"; private const string BoxAddon = "MiragePrismPrismBox"; private const string ArmoireAddon = "CabinetWithdraw"; - + private static unsafe bool IsOpen(AtkUnitBase* addon) { return addon != null && addon->IsVisible; } @@ -19,7 +19,7 @@ namespace Glamaholic { var addon = (AtkUnitBase*) gui.GetAddonByName(name, 1); return IsOpen(addon); } - + internal static bool IsEditingPlate(GameGui gui) { var plateOpen = IsOpen(gui, PlateAddon); var boxOpen = IsOpen(gui, BoxAddon); @@ -27,7 +27,7 @@ namespace Glamaholic { return plateOpen && (boxOpen || armoireOpen); } - + internal static bool DrawTextInput(string id, ref string input, uint max = 512, string message = "Press Enter to save.", ImGuiInputTextFlags flags = ImGuiInputTextFlags.None) { ImGui.SetNextItemWidth(-1); var ret = ImGui.InputText($"##{id}", ref input, max, ImGuiInputTextFlags.EnterReturnsTrue | flags); @@ -36,7 +36,7 @@ namespace Glamaholic { return ret && input.Length > 0; } - + internal static bool IconButton(FontAwesomeIcon icon, string? id = null, string? tooltip = null, bool small = false) { var label = icon.ToIconString(); if (id != null) { @@ -57,7 +57,7 @@ namespace Glamaholic { return ret; } - + internal static void TextUnformattedWrapped(string text) { ImGui.PushTextWrapPos(); ImGui.TextUnformatted(text);