ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-14 12:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat: init subsystems synchronously

Browse source
This commit is contained in:
goat 2021-04-26 21:55:45 +02:00
parent e930c98769
commit 9f22b00fc6
No known key found for this signature in database
GPG key ID: F18F057873895461
2 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Dalamud/Dalamud.cs
View file

@ -187,44 +187,48 @@ namespace Dalamud
/// </summary> /// </summary>
internal DirectoryInfo AssetDirectory => new DirectoryInfo(this.StartInfo.AssetDirectory); internal DirectoryInfo AssetDirectory => new DirectoryInfo(this.StartInfo.AssetDirectory);
public void Start()
{
// Initialize the process information.
this.TargetModule = Process.GetCurrentProcess().MainModule;
this.SigScanner = new SigScanner(this.TargetModule, true);
// Initialize game subsystem
this.Framework = new Framework(this.SigScanner, this);
Log.Information("[SPRE] Framework OK!");
}
/// <summary> /// <summary>
/// Start and initialize Dalamud subsystems. /// Start and initialize Dalamud subsystems.
/// </summary> /// </summary>
public void Start() public void StartSubsystems()
{ {
try try
{ {
this.Configuration = DalamudConfiguration.Load(this.StartInfo.ConfigurationPath); this.Configuration = DalamudConfiguration.Load(this.StartInfo.ConfigurationPath);
// Initialize the process information. Log.Information("[SPOST] Scanner OK!");
this.TargetModule = Process.GetCurrentProcess().MainModule;
this.SigScanner = new SigScanner(this.TargetModule, true);
Log.Information("[START] Scanner OK!");
this.AntiDebug = new AntiDebug(this.SigScanner); this.AntiDebug = new AntiDebug(this.SigScanner);
#if DEBUG #if DEBUG
this.AntiDebug.Enable(); this.AntiDebug.Enable();
#endif #endif
Log.Information("[START] AntiDebug OK!"); Log.Information("[SPOST] AntiDebug OK!");
// Initialize game subsystem
this.Framework = new Framework(this.SigScanner, this);
Log.Information("[START] Framework OK!");
this.WinSock2 = new WinSockHandlers(); this.WinSock2 = new WinSockHandlers();
Log.Information("[START] WinSock OK!"); Log.Information("[SPOST] WinSock OK!");
this.NetworkHandlers = new NetworkHandlers(this, this.StartInfo.OptOutMbCollection); this.NetworkHandlers = new NetworkHandlers(this, this.StartInfo.OptOutMbCollection);
Log.Information("[START] NH OK!"); Log.Information("[SPOST] NH OK!");
this.ClientState = new ClientState(this, this.StartInfo, this.SigScanner); this.ClientState = new ClientState(this, this.StartInfo, this.SigScanner);
Log.Information("[START] CS OK!"); Log.Information("[SPOST] CS OK!");
this.LocalizationManager = new Localization(Path.Combine(this.AssetDirectory.FullName, "UIRes", "loc", "dalamud"), "dalamud_"); this.LocalizationManager = new Localization(Path.Combine(this.AssetDirectory.FullName, "UIRes", "loc", "dalamud"), "dalamud_");
if (!string.IsNullOrEmpty(this.Configuration.LanguageOverride)) if (!string.IsNullOrEmpty(this.Configuration.LanguageOverride))
@ -232,12 +236,12 @@ namespace Dalamud
else else
this.LocalizationManager.SetupWithUiCulture(); this.LocalizationManager.SetupWithUiCulture();
Log.Information("[START] LOC OK!"); Log.Information("[SPOST] LOC OK!");
this.PluginRepository = this.PluginRepository =
new PluginRepository(this, this.StartInfo.PluginDirectory, this.StartInfo.GameVersion); new PluginRepository(this, this.StartInfo.PluginDirectory, this.StartInfo.GameVersion);
Log.Information("[START] PREPO OK!"); Log.Information("[SPOST] PREPO OK!");
var isInterfaceLoaded = false; var isInterfaceLoaded = false;
if (!bool.Parse(Environment.GetEnvironmentVariable("DALAMUD_NOT_HAVE_INTERFACE") ?? "false")) if (!bool.Parse(Environment.GetEnvironmentVariable("DALAMUD_NOT_HAVE_INTERFACE") ?? "false"))
@ -249,7 +253,7 @@ namespace Dalamud
this.InterfaceManager.Enable(); this.InterfaceManager.Enable();
isInterfaceLoaded = true; isInterfaceLoaded = true;
Log.Information("[START] IM OK!"); Log.Information("[SPOST] IM OK!");
this.InterfaceManager.WaitForFontRebuild(); this.InterfaceManager.WaitForFontRebuild();
} }
@ -271,22 +275,22 @@ namespace Dalamud
return; return;
} }
Log.Information("[START] Data OK!"); Log.Information("[SPOST] Data OK!");
this.SeStringManager = new SeStringManager(this.Data); this.SeStringManager = new SeStringManager(this.Data);
Log.Information("[START] SeString OK!"); Log.Information("[SPOST] SeString OK!");
// Initialize managers. Basically handlers for the logic // Initialize managers. Basically handlers for the logic
this.CommandManager = new CommandManager(this, this.StartInfo.Language); this.CommandManager = new CommandManager(this, this.StartInfo.Language);
this.DalamudCommands = new DalamudCommands(this); this.DalamudCommands = new DalamudCommands(this);
this.DalamudCommands.SetupCommands(); this.DalamudCommands.SetupCommands();
Log.Information("[START] CM OK!"); Log.Information("[SPOST] CM OK!");
this.ChatHandlers = new ChatHandlers(this); this.ChatHandlers = new ChatHandlers(this);
Log.Information("[START] CH OK!"); Log.Information("[SPOST] CH OK!");
if (!bool.Parse(Environment.GetEnvironmentVariable("DALAMUD_NOT_HAVE_PLUGINS") ?? "false")) if (!bool.Parse(Environment.GetEnvironmentVariable("DALAMUD_NOT_HAVE_PLUGINS") ?? "false"))
{ {
@ -294,7 +298,7 @@ namespace Dalamud
{ {
this.PluginRepository.CleanupPlugins(); this.PluginRepository.CleanupPlugins();
Log.Information("[START] PRC OK!"); Log.Information("[SPOST] PRC OK!");
this.PluginManager = new PluginManager( this.PluginManager = new PluginManager(
this, this,
@ -302,7 +306,7 @@ namespace Dalamud
this.StartInfo.DefaultPluginDirectory); this.StartInfo.DefaultPluginDirectory);
this.PluginManager.LoadPlugins(); this.PluginManager.LoadPlugins();
Log.Information("[START] PM OK!"); Log.Information("[SPOST] PM OK!");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -311,15 +315,15 @@ namespace Dalamud
} }
this.Framework.Enable(); this.Framework.Enable();
Log.Information("[START] Framework ENABLE!"); Log.Information("[SPOST] Framework ENABLE!");
this.ClientState.Enable(); this.ClientState.Enable();
Log.Information("[START] CS ENABLE!"); Log.Information("[SPOST] CS ENABLE!");
this.DalamudUi = new DalamudInterface(this); this.DalamudUi = new DalamudInterface(this);
this.InterfaceManager.OnDraw += this.DalamudUi.Draw; this.InterfaceManager.OnDraw += this.DalamudUi.Draw;
Log.Information("[START] DUI OK!"); Log.Information("[SPOST] DUI OK!");
this.SystemMenu = new DalamudSystemMenu(this); this.SystemMenu = new DalamudSystemMenu(this);
this.SystemMenu.Enable(); this.SystemMenu.Enable();

4
Dalamud/Game/Internal/Framework.cs
View file

@ -130,6 +130,10 @@ namespace Dalamud.Game.Internal {
} }
private bool HandleFrameworkUpdate(IntPtr framework) { private bool HandleFrameworkUpdate(IntPtr framework) {
// If this is the first time we are running this loop, we need to init Dalamud subsystems synchronously
if (!this.dalamud.IsReady)
this.dalamud.StartSubsystems();
try { try {
Gui.Chat.UpdateQueue(this); Gui.Chat.UpdateQueue(this);
Gui.Toast.UpdateQueue(); Gui.Toast.UpdateQueue();