Add "loading dialog" for service init, unify blocking logic (#1779)

* wip

* hacky fix for overlapping event text in profiler

* move IsResumeGameAfterPluginLoad logic to PluginManager

* fix some warnings

* handle exceptions properly

* remove ability to cancel, rename button to "hide" instead

* undo Dalamud.Service refactor for now

* warnings

* add explainer, show which plugins are still loading

* add some text if loading takes more than 3 minutes

* undo wrong CS merge

Dalamud.CorePlugin/PluginImpl.cs

@@ -2,7 +2,6 @@ using System;
 using System.IO;
 
 using Dalamud.Configuration.Internal;
-using Dalamud.Game;
 using Dalamud.Game.Command;
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin;

Dalamud/ClientLanguage.cs

@@ -1,10 +1,11 @@
-namespace Dalamud;
+using Dalamud.Utility;
 
-// TODO(v10): Delete this, and use Dalamud.Common.ClientLanguage instead for everything.
+namespace Dalamud;
 
 /// <summary>
 /// Enum describing the language the game loads in.
 /// </summary>
+[Api10ToDo("Delete this, and use Dalamud.Common.ClientLanguage instead for everything.")]
 public enum ClientLanguage
 {
     /// <summary>

Dalamud/ClientLanguageExtensions.cs

@@ -1,10 +1,11 @@
-using System;
+using Dalamud.Utility;
 
 namespace Dalamud;
 
 /// <summary>
 /// Extension methods for the <see cref="ClientLanguage"/> class.
 /// </summary>
+[Api10ToDo("Delete this, and use Dalamud.Common.ClientLanguage instead for everything.")]
 public static class ClientLanguageExtensions
 {
     /// <summary>

Dalamud/Configuration/Internal/DalamudConfiguration.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;

Dalamud/Configuration/Internal/DevPluginSettings.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace Dalamud.Configuration.Internal;

Dalamud/Configuration/Internal/EnvironmentConfiguration.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Configuration.Internal;
 
 /// <summary>

Dalamud/Dalamud.cs

@@ -33,6 +33,7 @@ internal sealed class Dalamud : IServiceType
 {
     #region Internals
 
+    private static int shownServiceError = 0;
     private readonly ManualResetEvent unloadSignal;
     
     #endregion
@@ -69,53 +70,46 @@ internal sealed class Dalamud : IServiceType
         // Set up FFXIVClientStructs
         this.SetupClientStructsResolver(cacheDir);
         
-        if (!configuration.IsResumeGameAfterPluginLoad)
+        void KickoffGameThread()
         {
+            Log.Verbose("=============== GAME THREAD KICKOFF ===============");
+            Timings.Event("Game thread kickoff");
             NativeFunctions.SetEvent(mainThreadContinueEvent);
+        }
+
+        void HandleServiceInitFailure(Task t)
+        {
+            Log.Error(t.Exception!, "Service initialization failure");
+            
+            if (Interlocked.CompareExchange(ref shownServiceError, 1, 0) != 0)
+                return;
+
+            Util.Fatal(
+                "Dalamud failed to load all necessary services.\n\nThe game will continue, but you may not be able to use plugins.",
+                "Dalamud", false);
+        }
+
         ServiceManager.InitializeEarlyLoadableServices()
-                          .ContinueWith(t =>
+                      .ContinueWith(
+                          t =>
                           {
                               if (t.IsCompletedSuccessfully)
                                   return;
 
-                              Log.Error(t.Exception!, "Service initialization failure");
+                              HandleServiceInitFailure(t);
-                              Util.Fatal(
-                                  "Dalamud failed to load all necessary services.\n\nThe game will continue, but you may not be able to use plugins.",
-                                  "Dalamud", false);
                           });
-        }
-        else
-        {
-            Task.Run(async () =>
-            {
-                try
-                {
-                    var tasks = new[]
-                    {
-                        ServiceManager.InitializeEarlyLoadableServices(),
-                        ServiceManager.BlockingResolved,
-                    };
 
-                    await Task.WhenAny(tasks);
+        ServiceManager.BlockingResolved.ContinueWith(
-                    var faultedTasks = tasks.Where(x => x.IsFaulted).Select(x => (Exception)x.Exception!).ToArray();
+            t =>
-                    if (faultedTasks.Any())
-                        throw new AggregateException(faultedTasks);
-
-                    NativeFunctions.SetEvent(mainThreadContinueEvent);
-
-                    await Task.WhenAll(tasks);
-                }
-                catch (Exception e)
             {
-                    Log.Error(e, "Service initialization failure");
+                if (t.IsCompletedSuccessfully)
-                    Util.Fatal("Dalamud could not initialize correctly. Please report this error. \n\nThe game will continue, but you may not be able to use plugins.", "Dalamud", false);
-                }
-                finally
                 {
-                    NativeFunctions.SetEvent(mainThreadContinueEvent);
+                    KickoffGameThread();
+                    return;
                 }
+
+                HandleServiceInitFailure(t);
             });
-        }
 
         this.DefaultExceptionFilter = NativeFunctions.SetUnhandledExceptionFilter(nint.Zero);
         NativeFunctions.SetUnhandledExceptionFilter(this.DefaultExceptionFilter);

Dalamud/Game/Addon/Events/PluginEventController.cs

@@ -5,6 +5,7 @@ using Dalamud.Game.Gui;
 using Dalamud.Logging.Internal;
 using Dalamud.Memory;
 using Dalamud.Plugin.Services;
+
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
 namespace Dalamud.Game.Addon.Events;

Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs

@@ -10,6 +10,7 @@ using Dalamud.IoC.Internal;
 using Dalamud.Logging.Internal;
 using Dalamud.Memory;
 using Dalamud.Plugin.Services;
+
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
 namespace Dalamud.Game.Addon.Lifecycle;

Dalamud/Game/Addon/Lifecycle/AddonLifecycleReceiveEventListener.cs

@@ -4,6 +4,7 @@ using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using Dalamud.Hooking;
 using Dalamud.Logging.Internal;
 using Dalamud.Memory;
+
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
 namespace Dalamud.Game.Addon.Lifecycle;

Dalamud/Game/BaseAddressResolver.cs

@@ -1,10 +1,7 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 
-using JetBrains.Annotations;
-
 namespace Dalamud.Game;
 
 /// <summary>

Dalamud/Game/ClientState/Aetherytes/AetheryteList.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
+
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using Serilog;
 

Dalamud/Game/ClientState/Buddy/BuddyList.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
@@ -6,6 +5,7 @@ using System.Runtime.InteropServices;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
+
 using Serilog;
 
 namespace Dalamud.Game.ClientState.Buddy;

Dalamud/Game/ClientState/Buddy/BuddyMember.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.ClientState.Resolvers;

Dalamud/Game/ClientState/ClientStateAddressResolver.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState;
 
 /// <summary>

Dalamud/Game/ClientState/Conditions/Condition.cs

@@ -1,6 +1,7 @@
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
+
 using Serilog;
 
 namespace Dalamud.Game.ClientState.Conditions;

Dalamud/Game/ClientState/Fates/Fate.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Numerics;
 
 using Dalamud.Data;

Dalamud/Game/ClientState/Fates/FateTable.cs

@@ -1,10 +1,10 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
+
 using Serilog;
 
 namespace Dalamud.Game.ClientState.Fates;

Dalamud/Game/ClientState/GamePad/GamepadButtons.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.GamePad;
 
 /// <summary>

Dalamud/Game/ClientState/GamePad/GamepadState.cs

@@ -1,10 +1,10 @@
-using System;
 using System.Numerics;
 
 using Dalamud.Hooking;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
+
 using ImGuiNET;
 using Serilog;
 

Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs

@@ -1,6 +1,4 @@
-using System;
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
-
-namespace Dalamud.Game.ClientState.JobGauge.Enums;
 
 /// <summary>
 /// MNK Nadi types.

Dalamud/Game/ClientState/JobGauge/Enums/Sen.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Enums;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/JobGauges.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Reflection;
 
@@ -6,6 +5,7 @@ using Dalamud.Game.ClientState.JobGauge.Types;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
+
 using Serilog;
 
 namespace Dalamud.Game.ClientState.JobGauge;

Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 
 using Dalamud.Game.ClientState.JobGauge.Enums;

Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/BRDGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.JobGauge.Enums;
 using FFXIVClientStructs.FFXIV.Client.Game.Gauge;
 

Dalamud/Game/ClientState/JobGauge/Types/DNCGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/DRGGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/DRKGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/GNBGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/JobGaugeBase.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/JobGaugeBase{T}.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/MCHGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 
 using Dalamud.Game.ClientState.JobGauge.Enums;

Dalamud/Game/ClientState/JobGauge/Types/NINGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/PLDGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/RDMGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.JobGauge.Enums;
 
 namespace Dalamud.Game.ClientState.JobGauge.Types;

Dalamud/Game/ClientState/JobGauge/Types/SCHGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.JobGauge.Enums;
 
 namespace Dalamud.Game.ClientState.JobGauge.Types;

Dalamud/Game/ClientState/JobGauge/Types/SGEGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/SMNGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.JobGauge.Enums;
 using FFXIVClientStructs.FFXIV.Client.Game.Gauge;
 

Dalamud/Game/ClientState/JobGauge/Types/WARGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/JobGauge/Types/WHMGauge.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.JobGauge.Types;
 
 /// <summary>

Dalamud/Game/ClientState/Keys/KeyState.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -6,6 +5,7 @@ using System.Runtime.InteropServices;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
+
 using Serilog;
 
 namespace Dalamud.Game.ClientState.Keys;

Dalamud/Game/ClientState/Keys/VirtualKeyAttribute.cs

@@ -1,6 +1,4 @@
-using System;
+namespace Dalamud.Game.ClientState.Keys;
-
-namespace Dalamud.Game.ClientState.Keys;
 
 /// <summary>
 /// Attribute describing a VirtualKey.

Dalamud/Game/ClientState/Objects/Enums/StatusFlags.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.ClientState.Objects.Enums;
 
 /// <summary>

Dalamud/Game/ClientState/Objects/SubKinds/EventObj.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.Objects.Types;
 
 namespace Dalamud.Game.ClientState.Objects.SubKinds;

Dalamud/Game/ClientState/Objects/SubKinds/Npc.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.Objects.Types;
 
 namespace Dalamud.Game.ClientState.Objects.SubKinds;

Dalamud/Game/ClientState/Objects/TargetManager.cs

@@ -1,8 +1,7 @@
-using System;
-
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
+
 #pragma warning disable CS0618
 
 namespace Dalamud.Game.ClientState.Objects;

Dalamud/Game/ClientState/Objects/Types/BattleChara.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.Statuses;
 using Dalamud.Utility;
 

Dalamud/Game/ClientState/Objects/Types/GameObject.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Numerics;
 
 using Dalamud.Game.ClientState.Objects.Enums;

Dalamud/Game/ClientState/Party/PartyList.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
@@ -6,6 +5,7 @@ using System.Runtime.InteropServices;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
+
 using Serilog;
 
 namespace Dalamud.Game.ClientState.Party;

Dalamud/Game/ClientState/Party/PartyMember.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Numerics;
 
 using Dalamud.Game.ClientState.Objects;

Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs

@@ -1,4 +1,5 @@
 using Dalamud.Data;
+
 using Lumina.Excel;
 
 namespace Dalamud.Game.ClientState.Resolvers;

Dalamud/Game/ClientState/Statuses/Status.cs

@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.ClientState.Resolvers;

Dalamud/Game/ClientState/Statuses/StatusList.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;

Dalamud/Game/Command/CommandInfo.cs

@@ -1,5 +1,3 @@
-using System.Reflection;
-
 namespace Dalamud.Game.Command;
 
 /// <summary>

Dalamud/Game/Config/ConfigChangeEvent.cs

@@ -1,6 +1,4 @@
-using System;
+namespace Dalamud.Game.Config;
-
-namespace Dalamud.Game.Config;
 
 public abstract record ConfigChangeEvent(Enum Option);
 

Dalamud/Game/Config/ConfigOptionNotFoundException.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.Config;
 
 /// <summary>

Dalamud/Game/Config/GameConfigOptionAttribute.cs

@@ -1,7 +1,3 @@
-using System;
-
-using FFXIVClientStructs.FFXIV.Common.Configuration;
-
 namespace Dalamud.Game.Config;
 
 /// <summary>

Dalamud/Game/Config/IncorrectConfigTypeException.cs

@@ -1,7 +1,3 @@
-using System;
-
-using FFXIVClientStructs.FFXIV.Common.Configuration;
-
 namespace Dalamud.Game.Config;
 
 /// <summary>

Dalamud/Game/FrameworkAddressResolver.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game;
 
 /// <summary>

Dalamud/Game/Gui/ChatGui.cs

@@ -12,7 +12,6 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Logging.Internal;
 using Dalamud.Memory;
-using Dalamud.Plugin.Internal;
 using Dalamud.Plugin.Services;
 using Dalamud.Utility;
 using FFXIVClientStructs.FFXIV.Client.System.String;

Dalamud/Game/Gui/Dtr/DtrBar.cs

@@ -11,6 +11,7 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Logging.Internal;
 using Dalamud.Plugin.Services;
+
 using FFXIVClientStructs.FFXIV.Client.Graphics;
 using FFXIVClientStructs.FFXIV.Client.System.Memory;
 using FFXIVClientStructs.FFXIV.Component.GUI;

Dalamud/Game/Gui/Dtr/DtrBarEntry.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Linq;
-using System.Linq;
 
 using Dalamud.Configuration.Internal;
 using Dalamud.Game.Text.SeStringHandling;

Dalamud/Game/Gui/FlyText/FlyTextGui.cs

@@ -7,6 +7,7 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Memory;
 using Dalamud.Plugin.Services;
+
 using Serilog;
 
 namespace Dalamud.Game.Gui.FlyText;

Dalamud/Game/Gui/GameGuiAddressResolver.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.Gui;
 
 /// <summary>

Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs

@@ -6,6 +6,7 @@ using Dalamud.Hooking;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Dalamud.Plugin.Services;
+
 using Serilog;
 
 namespace Dalamud.Game.Gui.PartyFinder;

Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.Gui.PartyFinder.Types;
 
 /// <summary>

Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.Gui.PartyFinder.Types;
 
 /// <summary>

Dalamud/Game/Gui/PartyFinder/Types/JobFlags.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.Gui.PartyFinder.Types;
 
 /// <summary>

Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.Gui.PartyFinder.Types;
 
 /// <summary>

Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.Gui.PartyFinder.Types;
 
 /// <summary>

Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs

@@ -1,10 +1,10 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
 using Dalamud.Data;
 using Dalamud.Game.Gui.PartyFinder.Internal;
 using Dalamud.Game.Text.SeStringHandling;
+
 using Lumina.Excel.GeneratedSheets;
 
 namespace Dalamud.Game.Gui.PartyFinder.Types;

Dalamud/Game/Gui/PartyFinder/Types/PartyFinderSlot.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.Gui.PartyFinder.Types;
 
 /// <summary>

Dalamud/Game/Internal/AntiDebug.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 #if !DEBUG

Dalamud/Game/Internal/DXGI/ISwapChainAddressResolver.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.Internal.DXGI;
 
 /// <summary>

Dalamud/Game/Internal/DalamudAtkTweaks.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.InteropServices;
 
 using CheapLoc;
@@ -9,6 +8,7 @@ using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Hooking;
 using Dalamud.Interface.Internal;
 using Dalamud.Interface.Windowing;
+
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using Serilog;
 

Dalamud/Game/Libc/LibcFunction.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.InteropServices;
 using System.Text;
 

Dalamud/Game/Libc/LibcFunctionAddressResolver.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Dalamud.Game.Libc;
 
 /// <summary>

Dalamud/Game/Libc/OwnedStdString.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.InteropServices;
 
 namespace Dalamud.Game.Libc;

Dalamud/Game/Libc/StdString.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.InteropServices;
 using System.Text;
 

Dalamud/Game/Network/Internal/MarketBoardUploaders/MarketBoardItemRequest.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 

Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/UniversalisMarketBoardUploader.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types;
 using Dalamud.Game.Network.Structures;
 using Dalamud.Networking.Http;
+
 using Newtonsoft.Json;
 using Serilog;
 

Dalamud/Game/Network/Internal/NetworkHandlers.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

Dalamud/Game/Network/Internal/WinSockHandlers.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
 

Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;

Dalamud/Game/Network/Structures/MarketBoardHistory.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;

Dalamud/Game/Network/Structures/MarketBoardPurchase.cs

@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 
 namespace Dalamud.Game.Network.Structures;

Dalamud/Game/Network/Structures/MarketBoardPurchaseHandler.cs

@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 
 namespace Dalamud.Game.Network.Structures;

Dalamud/Game/SigScanner.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -7,8 +6,6 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-using Dalamud.IoC;
-using Dalamud.IoC.Internal;
 using Iced.Intel;
 using Newtonsoft.Json;
 using Serilog;

Dalamud/Game/Text/Sanitizer/Sanitizer.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

Dalamud/Game/Text/SeStringHandling/Payload.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -6,6 +5,7 @@ using System.IO;
 using Dalamud.Data;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Plugin.Services;
+
 using Newtonsoft.Json;
 using Serilog;
 

Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;

Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 

Dalamud/Game/Text/SeStringHandling/Payloads/NewLinePayload.cs

@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 
 namespace Dalamud.Game.Text.SeStringHandling.Payloads;

Dalamud/Game/Text/SeStringHandling/Payloads/RawPayload.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;