Automatic code cleanup pass

- Optimize all imports
- Remove a broken translation from JP
- Automated code cleanup

FFXIVPlugin/ActionExecutor/FixedCommandStrategy.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using Lumina.Excel;
 using XIVDeck.FFXIVPlugin.Base;
-using XIVDeck.FFXIVPlugin.Game.Chat;
 using XIVDeck.FFXIVPlugin.Resources.Localization;
 
 namespace XIVDeck.FFXIVPlugin.ActionExecutor;

FFXIVPlugin/ActionExecutor/Strategies/EmoteStrategy.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using Lumina.Excel.GeneratedSheets;
 using XIVDeck.FFXIVPlugin.ActionExecutor.Payloads;
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Exceptions;
 using XIVDeck.FFXIVPlugin.Game;
-using XIVDeck.FFXIVPlugin.Game.Chat;
 using XIVDeck.FFXIVPlugin.Game.Managers;
 using XIVDeck.FFXIVPlugin.Resources.Localization;
 using XIVDeck.FFXIVPlugin.Utils.Game;

FFXIVPlugin/ActionExecutor/Strategies/ExtraCommandStrategy.cs

@@ -1,9 +1,7 @@
-using System;
-using FFXIVClientStructs.FFXIV.Client.UI.Misc;
+using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using Lumina.Excel.GeneratedSheets;
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Game.Managers;
-using XIVDeck.FFXIVPlugin.Resources.Localization;
 
 namespace XIVDeck.FFXIVPlugin.ActionExecutor.Strategies; 
 

FFXIVPlugin/ActionExecutor/Strategies/GearsetStrategy.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using XIVDeck.FFXIVPlugin.ActionExecutor.Payloads;
 using XIVDeck.FFXIVPlugin.Base;

FFXIVPlugin/ActionExecutor/Strategies/GeneralActionStrategy.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using Lumina.Excel;
 using Lumina.Excel.GeneratedSheets;
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Exceptions;
-using XIVDeck.FFXIVPlugin.Game.Chat;
 using XIVDeck.FFXIVPlugin.Game.Managers;
 using XIVDeck.FFXIVPlugin.Resources.Localization;
 

FFXIVPlugin/ActionExecutor/Strategies/MacroStrategy.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using FFXIVClientStructs.FFXIV.Client.UI.Shell;
 using XIVDeck.FFXIVPlugin.Base;

FFXIVPlugin/ActionExecutor/Strategies/MarkerStrategy.cs

@@ -1,9 +1,6 @@
-using System;
-
-using FFXIVClientStructs.FFXIV.Client.UI.Misc;
+using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Game.Managers;
-
 using Marker = XIVDeck.FFXIVPlugin.Game.Data.Marker;
 
 namespace XIVDeck.FFXIVPlugin.ActionExecutor.Strategies; 

FFXIVPlugin/ActionExecutor/Strategies/MinionStrategy.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using Lumina.Excel.GeneratedSheets;
 using XIVDeck.FFXIVPlugin.Base;

FFXIVPlugin/ActionExecutor/Strategies/MountStrategy.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using Lumina.Excel.GeneratedSheets;
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Exceptions;
 using XIVDeck.FFXIVPlugin.Game;
-using XIVDeck.FFXIVPlugin.Game.Chat;
 using XIVDeck.FFXIVPlugin.Game.Managers;
 using XIVDeck.FFXIVPlugin.Resources.Localization;
 using XIVDeck.FFXIVPlugin.Utils;

FFXIVPlugin/ActionExecutor/Strategies/OrnamentStrategy.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using Lumina.Excel.GeneratedSheets;
 using XIVDeck.FFXIVPlugin.Base;

FFXIVPlugin/ActionExecutor/Strategies/WaymarkStrategy.cs

@@ -1,6 +1,4 @@
-using System;
-
-using FFXIVClientStructs.FFXIV.Client.UI.Misc;
+using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using Lumina.Excel.GeneratedSheets;
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Game.Managers;

FFXIVPlugin/Base/Injections.cs

@@ -1,8 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using Dalamud.Game;
-using Dalamud.Game.ClientState.Conditions;
-using Dalamud.Game.Gui;
-using Dalamud.Game.Gui.Toast;
 using Dalamud.IoC;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;

FFXIVPlugin/Base/PluginConfig.cs

@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using Dalamud.Configuration;
 using EmbedIO;
 using Newtonsoft.Json;

FFXIVPlugin/Game/Chat/ChatHelper.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Runtime.InteropServices;
-using System.Text;
 using Dalamud.Utility.Signatures;
 using FFXIVClientStructs.FFXIV.Client.System.Framework;
-using FFXIVClientStructs.FFXIV.Client.System.Memory;
 using FFXIVClientStructs.FFXIV.Client.System.String;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using XIVDeck.FFXIVPlugin.Base;

FFXIVPlugin/Game/Chat/ErrorNotifier.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Dalamud.Game.Text.SeStringHandling;
-
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Resources.Localization;
 

FFXIVPlugin/Game/DalamudHooks.cs

@@ -1,5 +1,4 @@
-using System;
-using XIVDeck.FFXIVPlugin.Game.Chat;
+using XIVDeck.FFXIVPlugin.Game.Chat;
 using XIVDeck.FFXIVPlugin.Server.Messages.Outbound;
 
 namespace XIVDeck.FFXIVPlugin.Game; 

FFXIVPlugin/Game/GameHooks.cs

@@ -1,6 +1,5 @@
 using System;
 using Dalamud.Hooking;
-
 using Dalamud.Utility.Signatures;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using XIVDeck.FFXIVPlugin.Base;

FFXIVPlugin/Game/Managers/HotbarManager.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Runtime.InteropServices;
-
 using FFXIVClientStructs.FFXIV.Client.System.Framework;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;

FFXIVPlugin/Game/Managers/IconManager.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-
 using Lumina.Data.Files;
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.IPC.Subscribers;

FFXIVPlugin/Game/UnlockState.cs

@@ -1,7 +1,6 @@
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Client.System.Framework;
 using Lumina.Excel.GeneratedSheets;
-using Swan;
 using XIVDeck.FFXIVPlugin.Base;
 
 namespace XIVDeck.FFXIVPlugin.Game;

FFXIVPlugin/Game/Watchers/HotbarWatcher.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Dalamud.Game;
 using Dalamud.Plugin.Services;
+using FFXIVClientStructs.FFXIV.Client.System.Framework;
 using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Game.Managers;
@@ -19,7 +19,7 @@ public HotbarWatcher() {
 
     private unsafe void OnGameUpdate(IFramework framework) {
         var hotbarModule =
-            FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance()->GetUiModule()->
+            Framework.Instance()->GetUiModule()->
                 GetRaptureHotbarModule();
 
         List<MicroHotbarSlot> updatedSlots = new();

FFXIVPlugin/Game/Watchers/VolumeWatcher.cs

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Dalamud.Game.Config;
-
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Game.Data;
 using XIVDeck.FFXIVPlugin.Server.Messages.Outbound;

FFXIVPlugin/IPC/IPCManager.cs

@@ -4,7 +4,6 @@
 using System.Reflection;
 using XIVDeck.FFXIVPlugin.Base;
 
-
 namespace XIVDeck.FFXIVPlugin.IPC; 
 
 public class IPCManager : IDisposable {

FFXIVPlugin/IPC/Subscribers/PenumbraIPC.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-
 using Dalamud.Plugin.Ipc;
 using Dalamud.Plugin.Ipc.Exceptions;
 using XIVDeck.FFXIVPlugin.Base;

FFXIVPlugin/IPC/Subscribers/TippyIPC.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using Dalamud.Plugin.Ipc;
 using XIVDeck.FFXIVPlugin.Base;
 
@@ -48,8 +47,6 @@ private void _initializeIpc() {
         }
 
         var versionEndpoint = Injections.PluginInterface.GetIpcSubscriber<int>("Tippy.APIVersion");
-
-        // this line may explode with an exception, but that should be fine as we'd normally catch that higher up./
         var version = versionEndpoint.InvokeFunc();
 
         this._tippyApiVersionSubscriber = versionEndpoint;

FFXIVPlugin/Resources/Localization/UIStrings.ja.resx

@@ -159,9 +159,6 @@
   <data name="SetupNag_ResolutionHelp" xml:space="preserve">
         <value>まだインストールしていない場合は、GitHubから付属の XIVDeck Stream Deck プラグインをダウンロードしてインストールしてください。</value>
     </data>
-  <data name="SetupNag_AlreadyInstalledHelp" xml:space="preserve">
-        <value>XIVDeck Stream Deck プラグインが既にインストールされている場合、設定からポートが正しく設定されていることを確認してください。また、少なくとも1つのボタンを作成してください。</value>
-    </data>
   <data name="SetupNag_CurrentPort" xml:space="preserve">
         <value>現在のポート: {0}</value>
     </data>

FFXIVPlugin/Server/Controllers/ActionController.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-
 using EmbedIO;
 using EmbedIO.Routing;
 using EmbedIO.WebApi;

FFXIVPlugin/Server/Controllers/ClassController.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-
 using EmbedIO;
 using EmbedIO.Routing;
 using EmbedIO.WebApi;

FFXIVPlugin/Server/Helpers/AuthHelper.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Security.Principal;
 using System.Threading.Tasks;
-
 using EmbedIO;
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Resources.Localization;

FFXIVPlugin/Server/Helpers/WSOpcodeAttribute.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-
 using Newtonsoft.Json;
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Resources.Localization;

FFXIVPlugin/Server/Messages/Inbound/WSInitOpcode.cs

@@ -1,6 +1,5 @@
 using System.Reflection;
 using System.Threading.Tasks;
-
 using EmbedIO.WebSockets;
 using Newtonsoft.Json;
 using XIVDeck.FFXIVPlugin.Base;

FFXIVPlugin/Server/Types/SerializableGameClass.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-
 using Lumina.Excel;
 using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;

FFXIVPlugin/Server/XIVDeckWSServer.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-
 using EmbedIO.WebSockets;
 using Newtonsoft.Json;
 using XIVDeck.FFXIVPlugin.Base;

FFXIVPlugin/Server/XIVDeckWebServer.cs

@@ -4,8 +4,9 @@
 using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
-
+using Dalamud.Utility;
 using EmbedIO;
+using Swan.Logging;
 using XIVDeck.FFXIVPlugin.Base;
 using XIVDeck.FFXIVPlugin.Exceptions;
 using XIVDeck.FFXIVPlugin.Game.Chat;
@@ -30,7 +31,7 @@ public class XIVDeckWebServer : IXIVDeckServer {
     private XIVDeckWSServer? _wsServer;
 
     public XIVDeckWebServer(XIVDeckPlugin plugin) {
-        Swan.Logging.Logger.RegisterLogger(this._logShim);
+        Logger.RegisterLogger(this._logShim);
         this._plugin = plugin;
     }
 
@@ -87,7 +88,7 @@ public void StopServer() {
     public void Dispose() {
         this.StopServer();
 
-        Swan.Logging.Logger.UnregisterLogger(this._logShim);
+        Logger.UnregisterLogger(this._logShim);
         this._logShim.Dispose();
 
         GC.SuppressFinalize(this);
@@ -106,7 +107,7 @@ private static HttpListenerMode GetListenerMode() {
 
         // If you're wondering why this is here despite the below line doing the same thing, it's legacy just in case
         // I want to swap the default listener for a specific operating system class.
-        if (Dalamud.Utility.Util.IsWine()) {
+        if (Util.IsWine()) {
             Injections.PluginLog.Information("Linux environment detected; using EmbedIO listener.");
             return HttpListenerMode.EmbedIO;
         }

FFXIVPlugin/UI/ChatLinkWiring.cs

@@ -4,7 +4,6 @@
 using System.Reflection;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
-
 using XIVDeck.FFXIVPlugin.Base;
 
 namespace XIVDeck.FFXIVPlugin.UI;

FFXIVPlugin/UI/Windows/NagWindow.cs

@@ -1,5 +1,4 @@
 using System.Numerics;
-using Dalamud.Interface;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Windowing;
 using ImGuiNET;

FFXIVPlugin/UI/Windows/Nags/ForcedUpdateNag.cs

@@ -1,5 +1,6 @@
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
+using Dalamud.Utility;
 using ImGuiNET;
 using XIVDeck.FFXIVPlugin.Resources.Localization;
 using XIVDeck.FFXIVPlugin.Utils;
@@ -43,7 +44,7 @@ protected override void _internalDraw() {
         }
         ImGui.SameLine();
         if (ImGui.Button(UIStrings.ForcedUpdateNag_SupportButton)) {
-            Dalamud.Utility.Util.OpenLink(Constants.GoatPlaceDiscord);
+            Util.OpenLink(Constants.GoatPlaceDiscord);
         }
         ImGuiComponents.HelpMarker(UIStrings.ForcedUpdateNag_BypassInstructions);
     }

FFXIVPlugin/UI/Windows/Nags/SetupNag.cs

@@ -1,6 +1,7 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
+using Dalamud.Utility;
 using ImGuiNET;
 using XIVDeck.FFXIVPlugin.Resources.Localization;
 using XIVDeck.FFXIVPlugin.Utils;
@@ -73,7 +74,7 @@ protected override void _internalDraw() {
         ImGui.TextColored(ImGuiColors.DalamudGrey, UIStrings.ForcedUpdateNag_SupportInfo);
         ImGui.SameLine();
         if (ImGuiComponents.IconButton(FontAwesomeIcon.Headset)) {
-            Dalamud.Utility.Util.OpenLink(Constants.GoatPlaceDiscord);
+            Util.OpenLink(Constants.GoatPlaceDiscord);
         }
         if (ImGui.IsItemHovered()) ImGui.SetTooltip(UIStrings.SetupNag_JoinDiscord);