mirror of
https://github.com/goatcorp/Dalamud.git
synced 2025-12-23 00:49:17 +01:00
refactor: move Dalamud interface into a class
This commit is contained in:
goat
parent
b37a2d1786
commit
3ee8e02f02
7 changed files with 367 additions and 329 deletions
|
|
@ -51,7 +51,7 @@ namespace Dalamud {
|
||||||
public readonly ClientState ClientState;
|
public readonly ClientState ClientState;
|
||||||
|
|
||||||
public readonly DalamudStartInfo StartInfo;
|
public readonly DalamudStartInfo StartInfo;
|
||||||
private readonly LoggingLevelSwitch loggingLevelSwitch;
|
internal LoggingLevelSwitch LogLevelSwitch { get; }
|
||||||
|
|
||||||
internal readonly DalamudConfiguration Configuration;
|
internal readonly DalamudConfiguration Configuration;
|
||||||
|
|
||||||
|
|
@ -59,6 +59,8 @@ namespace Dalamud {
|
||||||
|
|
||||||
internal InterfaceManager InterfaceManager { get; private set; }
|
internal InterfaceManager InterfaceManager { get; private set; }
|
||||||
|
|
||||||
|
internal DalamudInterface DalamudUi { get; private set; }
|
||||||
|
|
||||||
public DataManager Data { get; private set; }
|
public DataManager Data { get; private set; }
|
||||||
|
|
||||||
internal SeStringManager SeStringManager { get; private set; }
|
internal SeStringManager SeStringManager { get; private set; }
|
||||||
|
|
@ -70,7 +72,7 @@ namespace Dalamud {
|
||||||
|
|
||||||
public Dalamud(DalamudStartInfo info, LoggingLevelSwitch loggingLevelSwitch) {
|
public Dalamud(DalamudStartInfo info, LoggingLevelSwitch loggingLevelSwitch) {
|
||||||
this.StartInfo = info;
|
this.StartInfo = info;
|
||||||
this.loggingLevelSwitch = loggingLevelSwitch;
|
this.LogLevelSwitch = loggingLevelSwitch;
|
||||||
|
|
||||||
this.Configuration = DalamudConfiguration.Load(info.ConfigurationPath);
|
this.Configuration = DalamudConfiguration.Load(info.ConfigurationPath);
|
||||||
|
|
||||||
|
|
@ -114,12 +116,14 @@ namespace Dalamud {
|
||||||
|
|
||||||
PluginRepository = new PluginRepository(this, this.StartInfo.PluginDirectory, this.StartInfo.GameVersion);
|
PluginRepository = new PluginRepository(this, this.StartInfo.PluginDirectory, this.StartInfo.GameVersion);
|
||||||
|
|
||||||
|
DalamudUi = new DalamudInterface(this);
|
||||||
|
|
||||||
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")) {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
InterfaceManager = new InterfaceManager(this, this.SigScanner);
|
InterfaceManager = new InterfaceManager(this, this.SigScanner);
|
||||||
InterfaceManager.OnDraw += BuildDalamudUi;
|
InterfaceManager.OnDraw += DalamudUi.Draw;
|
||||||
|
|
||||||
InterfaceManager.Enable();
|
InterfaceManager.Enable();
|
||||||
isInterfaceLoaded = true;
|
isInterfaceLoaded = true;
|
||||||
|
|
@ -219,287 +223,7 @@ namespace Dalamud {
|
||||||
this.AntiDebug?.Dispose();
|
this.AntiDebug?.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Interface
|
internal void ReplaceExceptionHandler() {
|
||||||
|
|
||||||
private bool isImguiDrawDemoWindow = false;
|
|
||||||
|
|
||||||
#if DEBUG
|
|
||||||
private bool isImguiDrawDevMenu = true;
|
|
||||||
#else
|
|
||||||
private bool isImguiDrawDevMenu = false;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
public bool IsDevMenu
|
|
||||||
{
|
|
||||||
get => this.isImguiDrawDevMenu;
|
|
||||||
set => this.isImguiDrawDevMenu = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool isImguiDrawLogWindow = false;
|
|
||||||
private bool isImguiDrawDataWindow = false;
|
|
||||||
private bool isImguiDrawPluginWindow = false;
|
|
||||||
private bool isImguiDrawCreditsWindow = false;
|
|
||||||
private bool isImguiDrawSettingsWindow = false;
|
|
||||||
private bool isImguiDrawPluginStatWindow = false;
|
|
||||||
private bool isImguiDrawChangelogWindow = false;
|
|
||||||
|
|
||||||
private DalamudLogWindow logWindow;
|
|
||||||
private DalamudDataWindow dataWindow;
|
|
||||||
private DalamudCreditsWindow creditsWindow;
|
|
||||||
private DalamudSettingsWindow settingsWindow;
|
|
||||||
private PluginInstallerWindow pluginWindow;
|
|
||||||
private DalamudPluginStatWindow pluginStatWindow;
|
|
||||||
private DalamudChangelogWindow changelogWindow;
|
|
||||||
|
|
||||||
private void BuildDalamudUi()
|
|
||||||
{
|
|
||||||
if (!this.IsDevMenu && !ClientState.Condition.Any())
|
|
||||||
{
|
|
||||||
ImGui.PushStyleColor(ImGuiCol.Button, new Vector4(0, 0, 0, 0));
|
|
||||||
ImGui.PushStyleColor(ImGuiCol.ButtonActive, new Vector4(0, 0, 0, 0));
|
|
||||||
ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Vector4(0, 0, 0, 0));
|
|
||||||
ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(0, 0, 0, 1));
|
|
||||||
ImGui.PushStyleColor(ImGuiCol.TextSelectedBg, new Vector4(0, 0, 0, 1));
|
|
||||||
ImGui.PushStyleColor(ImGuiCol.Border, new Vector4(0, 0, 0, 1));
|
|
||||||
ImGui.PushStyleColor(ImGuiCol.BorderShadow, new Vector4(0, 0, 0, 1));
|
|
||||||
ImGui.PushStyleColor(ImGuiCol.WindowBg, new Vector4(0, 0, 0, 1));
|
|
||||||
|
|
||||||
ImGui.SetNextWindowPos(new Vector2(0, 0), ImGuiCond.Always);
|
|
||||||
ImGui.SetNextWindowBgAlpha(1);
|
|
||||||
|
|
||||||
if (ImGui.Begin("DevMenu Opener", ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoSavedSettings))
|
|
||||||
{
|
|
||||||
if (ImGui.Button("###devMenuOpener", new Vector2(40, 25)))
|
|
||||||
this.IsDevMenu = true;
|
|
||||||
|
|
||||||
ImGui.End();
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui.PopStyleColor(8);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.IsDevMenu)
|
|
||||||
{
|
|
||||||
if (ImGui.BeginMainMenuBar())
|
|
||||||
{
|
|
||||||
if (ImGui.BeginMenu("Dalamud"))
|
|
||||||
{
|
|
||||||
ImGui.MenuItem("Draw Dalamud dev menu", "", ref this.isImguiDrawDevMenu);
|
|
||||||
ImGui.Separator();
|
|
||||||
if (ImGui.MenuItem("Open Log window"))
|
|
||||||
{
|
|
||||||
this.logWindow = new DalamudLogWindow(CommandManager);
|
|
||||||
this.isImguiDrawLogWindow = true;
|
|
||||||
}
|
|
||||||
if (ImGui.BeginMenu("Set log level..."))
|
|
||||||
{
|
|
||||||
foreach (var logLevel in Enum.GetValues(typeof(LogEventLevel)).Cast<LogEventLevel>()) {
|
|
||||||
if (ImGui.MenuItem(logLevel + "##logLevelSwitch", "", this.loggingLevelSwitch.MinimumLevel == logLevel))
|
|
||||||
{
|
|
||||||
this.loggingLevelSwitch.MinimumLevel = logLevel;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui.EndMenu();
|
|
||||||
}
|
|
||||||
if (AntiDebug == null && ImGui.MenuItem("Enable AntiDebug")) {
|
|
||||||
AntiDebug = new AntiDebug(this.SigScanner);
|
|
||||||
AntiDebug.Enable();
|
|
||||||
}
|
|
||||||
ImGui.Separator();
|
|
||||||
if (ImGui.MenuItem("Open Data window"))
|
|
||||||
{
|
|
||||||
this.dataWindow = new DalamudDataWindow(this);
|
|
||||||
this.isImguiDrawDataWindow = true;
|
|
||||||
}
|
|
||||||
if (ImGui.MenuItem("Open Credits window")) {
|
|
||||||
OnOpenCreditsCommand(null, null);
|
|
||||||
}
|
|
||||||
if (ImGui.MenuItem("Open Settings window"))
|
|
||||||
{
|
|
||||||
OnOpenSettingsCommand(null, null);
|
|
||||||
}
|
|
||||||
if (ImGui.MenuItem("Open Changelog window"))
|
|
||||||
{
|
|
||||||
OpenChangelog();
|
|
||||||
}
|
|
||||||
ImGui.MenuItem("Draw ImGui demo", "", ref this.isImguiDrawDemoWindow);
|
|
||||||
if (ImGui.MenuItem("Dump ImGui info"))
|
|
||||||
OnDebugImInfoCommand(null, null);
|
|
||||||
ImGui.Separator();
|
|
||||||
if (ImGui.MenuItem("Unload Dalamud"))
|
|
||||||
{
|
|
||||||
Unload();
|
|
||||||
}
|
|
||||||
if (ImGui.MenuItem("Kill game"))
|
|
||||||
{
|
|
||||||
Process.GetCurrentProcess().Kill();
|
|
||||||
}
|
|
||||||
if (ImGui.MenuItem("Cause AccessViolation")) {
|
|
||||||
var a = Marshal.ReadByte(IntPtr.Zero);
|
|
||||||
}
|
|
||||||
ImGui.Separator();
|
|
||||||
ImGui.MenuItem(Util.AssemblyVersion, false);
|
|
||||||
ImGui.MenuItem(this.StartInfo.GameVersion, false);
|
|
||||||
|
|
||||||
ImGui.EndMenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ImGui.BeginMenu("Game")) {
|
|
||||||
if (ImGui.MenuItem("Replace ExceptionHandler")) {
|
|
||||||
ReplaceExceptionHandler();
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui.EndMenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ImGui.BeginMenu("Plugins"))
|
|
||||||
{
|
|
||||||
if (ImGui.MenuItem("Open Plugin installer"))
|
|
||||||
{
|
|
||||||
this.pluginWindow = new PluginInstallerWindow(this, this.StartInfo.GameVersion);
|
|
||||||
this.isImguiDrawPluginWindow = true;
|
|
||||||
}
|
|
||||||
ImGui.Separator();
|
|
||||||
if (ImGui.MenuItem("Open Plugin Stats")) {
|
|
||||||
if (!this.isImguiDrawPluginStatWindow) {
|
|
||||||
this.pluginStatWindow = new DalamudPluginStatWindow(this.PluginManager);
|
|
||||||
this.isImguiDrawPluginStatWindow = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (ImGui.MenuItem("Print plugin info")) {
|
|
||||||
foreach (var plugin in this.PluginManager.Plugins) {
|
|
||||||
// TODO: some more here, state maybe?
|
|
||||||
Log.Information($"{plugin.Plugin.Name}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (ImGui.MenuItem("Reload plugins"))
|
|
||||||
{
|
|
||||||
OnPluginReloadCommand(string.Empty, string.Empty);
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui.Separator();
|
|
||||||
ImGui.MenuItem("API Level:" + PluginManager.DALAMUD_API_LEVEL, false);
|
|
||||||
ImGui.MenuItem("Loaded plugins:" + PluginManager?.Plugins.Count, false);
|
|
||||||
ImGui.EndMenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ImGui.BeginMenu("Localization"))
|
|
||||||
{
|
|
||||||
if (ImGui.MenuItem("Export localizable"))
|
|
||||||
{
|
|
||||||
Loc.ExportLocalizable();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ImGui.BeginMenu("Load language..."))
|
|
||||||
{
|
|
||||||
if (ImGui.MenuItem("From Fallbacks"))
|
|
||||||
{
|
|
||||||
Loc.SetupWithFallbacks();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ImGui.MenuItem("From UICulture")) {
|
|
||||||
this.LocalizationManager.SetupWithUiCulture();
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var applicableLangCode in Localization.ApplicableLangCodes) {
|
|
||||||
if (ImGui.MenuItem($"Applicable: {applicableLangCode}"))
|
|
||||||
{
|
|
||||||
this.LocalizationManager.SetupWithLangCode(applicableLangCode);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ImGui.EndMenu();
|
|
||||||
}
|
|
||||||
ImGui.EndMenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.Framework.Gui.GameUiHidden)
|
|
||||||
ImGui.BeginMenu("UI is hidden...", false);
|
|
||||||
|
|
||||||
ImGui.EndMainMenuBar();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.Framework.Gui.GameUiHidden)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (this.isImguiDrawLogWindow)
|
|
||||||
{
|
|
||||||
this.isImguiDrawLogWindow = this.logWindow != null && this.logWindow.Draw();
|
|
||||||
|
|
||||||
if (this.isImguiDrawLogWindow == false)
|
|
||||||
{
|
|
||||||
this.logWindow?.Dispose();
|
|
||||||
this.logWindow = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isImguiDrawDataWindow)
|
|
||||||
{
|
|
||||||
this.isImguiDrawDataWindow = this.dataWindow != null && this.dataWindow.Draw();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isImguiDrawPluginWindow)
|
|
||||||
{
|
|
||||||
this.isImguiDrawPluginWindow = this.pluginWindow != null && this.pluginWindow.Draw();
|
|
||||||
|
|
||||||
if (!this.isImguiDrawPluginWindow)
|
|
||||||
this.pluginWindow = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isImguiDrawCreditsWindow)
|
|
||||||
{
|
|
||||||
this.isImguiDrawCreditsWindow = this.creditsWindow != null && this.creditsWindow.Draw();
|
|
||||||
|
|
||||||
if (this.isImguiDrawCreditsWindow == false)
|
|
||||||
{
|
|
||||||
this.creditsWindow?.Dispose();
|
|
||||||
this.creditsWindow = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isImguiDrawSettingsWindow)
|
|
||||||
{
|
|
||||||
this.isImguiDrawSettingsWindow = this.settingsWindow != null && this.settingsWindow.Draw();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isImguiDrawDemoWindow)
|
|
||||||
ImGui.ShowDemoWindow();
|
|
||||||
|
|
||||||
if (this.isImguiDrawPluginStatWindow) {
|
|
||||||
this.isImguiDrawPluginStatWindow = this.pluginStatWindow != null && this.pluginStatWindow.Draw();
|
|
||||||
if (!this.isImguiDrawPluginStatWindow) {
|
|
||||||
this.pluginStatWindow?.Dispose();
|
|
||||||
this.pluginStatWindow = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isImguiDrawChangelogWindow)
|
|
||||||
{
|
|
||||||
this.isImguiDrawChangelogWindow = this.changelogWindow != null && this.changelogWindow.Draw();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
internal void OpenPluginInstaller()
|
|
||||||
{
|
|
||||||
if (this.pluginWindow == null)
|
|
||||||
{
|
|
||||||
this.pluginWindow = new PluginInstallerWindow(this, this.StartInfo.GameVersion);
|
|
||||||
}
|
|
||||||
this.isImguiDrawPluginWindow ^= true;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void OpenChangelog() {
|
|
||||||
this.changelogWindow = new DalamudChangelogWindow(this);
|
|
||||||
this.isImguiDrawChangelogWindow = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void OpenSettings() {
|
|
||||||
this.settingsWindow = new DalamudSettingsWindow(this);
|
|
||||||
this.isImguiDrawSettingsWindow ^= true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ReplaceExceptionHandler() {
|
|
||||||
var semd = this.SigScanner.ScanText(
|
var semd = this.SigScanner.ScanText(
|
||||||
"40 55 53 56 48 8D AC 24 ?? ?? ?? ?? B8 ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 2B E0 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 85 ?? ?? ?? ?? 48 83 3D ?? ?? ?? ?? ??");
|
"40 55 53 56 48 8D AC 24 ?? ?? ?? ?? B8 ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 2B E0 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 85 ?? ?? ?? ?? 48 83 3D ?? ?? ?? ?? ??");
|
||||||
Log.Debug($"SE debug filter at {semd.ToInt64():X}");
|
Log.Debug($"SE debug filter at {semd.ToInt64():X}");
|
||||||
|
|
@ -508,8 +232,6 @@ namespace Dalamud {
|
||||||
Log.Debug("Reset ExceptionFilter, old: {0}", oldFilter);
|
Log.Debug("Reset ExceptionFilter, old: {0}", oldFilter);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
private void SetupCommands() {
|
private void SetupCommands() {
|
||||||
CommandManager.AddHandler("/xldclose", new CommandInfo(OnUnloadCommand) {
|
CommandManager.AddHandler("/xldclose", new CommandInfo(OnUnloadCommand) {
|
||||||
HelpMessage = Loc.Localize("DalamudUnloadHelp", "Unloads XIVLauncher in-game addon."),
|
HelpMessage = Loc.Localize("DalamudUnloadHelp", "Unloads XIVLauncher in-game addon."),
|
||||||
|
|
@ -583,11 +305,6 @@ namespace Dalamud {
|
||||||
HelpMessage = Loc.Localize("DalamudSettingsHelp", "Change various In-Game-Addon settings like chat channels and the discord bot setup.")
|
HelpMessage = Loc.Localize("DalamudSettingsHelp", "Change various In-Game-Addon settings like chat channels and the discord bot setup.")
|
||||||
});
|
});
|
||||||
|
|
||||||
CommandManager.AddHandler("/xlbugreport", new CommandInfo(OnBugReportCommand) {
|
|
||||||
HelpMessage = Loc.Localize("DalamudBugReport", "Upload a log to be analyzed by our professional development team."),
|
|
||||||
ShowInHelp = false
|
|
||||||
});
|
|
||||||
|
|
||||||
CommandManager.AddHandler("/imdebug", new CommandInfo(OnDebugImInfoCommand) {
|
CommandManager.AddHandler("/imdebug", new CommandInfo(OnDebugImInfoCommand) {
|
||||||
HelpMessage = "ImGui DEBUG",
|
HelpMessage = "ImGui DEBUG",
|
||||||
ShowInHelp = false
|
ShowInHelp = false
|
||||||
|
|
@ -628,8 +345,7 @@ namespace Dalamud {
|
||||||
Framework.Gui.Chat.Print("Reloading...");
|
Framework.Gui.Chat.Print("Reloading...");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
this.PluginManager.UnloadPlugins();
|
PluginManager.ReloadPlugins();
|
||||||
this.PluginManager.LoadPlugins();
|
|
||||||
|
|
||||||
Framework.Gui.Chat.Print("OK");
|
Framework.Gui.Chat.Print("OK");
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
|
|
@ -704,12 +420,11 @@ namespace Dalamud {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
private void OnDebugDrawDevMenu(string command, string arguments) {
|
private void OnDebugDrawDevMenu(string command, string arguments) {
|
||||||
this.IsDevMenu = !this.IsDevMenu;
|
this.DalamudUi.IsDevMenu = !this.DalamudUi.IsDevMenu;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnOpenLog(string command, string arguments) {
|
private void OnOpenLog(string command, string arguments) {
|
||||||
this.logWindow = new DalamudLogWindow(CommandManager);
|
this.DalamudUi.OpenLog();
|
||||||
this.isImguiDrawLogWindow = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDebugImInfoCommand(string command, string arguments) {
|
private void OnDebugImInfoCommand(string command, string arguments) {
|
||||||
|
|
@ -736,16 +451,11 @@ namespace Dalamud {
|
||||||
|
|
||||||
private void OnOpenInstallerCommand(string command, string arguments)
|
private void OnOpenInstallerCommand(string command, string arguments)
|
||||||
{
|
{
|
||||||
OpenPluginInstaller();
|
this.DalamudUi.OpenPluginInstaller();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnOpenCreditsCommand(string command, string arguments)
|
private void OnOpenCreditsCommand(string command, string arguments) {
|
||||||
{
|
DalamudUi.OpenCredits();
|
||||||
var logoGraphic =
|
|
||||||
this.InterfaceManager.LoadImage(
|
|
||||||
Path.Combine(this.StartInfo.WorkingDirectory, "UIRes", "logo.png"));
|
|
||||||
this.creditsWindow = new DalamudCreditsWindow(this, logoGraphic, this.Framework);
|
|
||||||
this.isImguiDrawCreditsWindow = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnSetLanguageCommand(string command, string arguments)
|
private void OnSetLanguageCommand(string command, string arguments)
|
||||||
|
|
@ -767,26 +477,7 @@ namespace Dalamud {
|
||||||
|
|
||||||
private void OnOpenSettingsCommand(string command, string arguments)
|
private void OnOpenSettingsCommand(string command, string arguments)
|
||||||
{
|
{
|
||||||
OpenSettings();
|
this.DalamudUi.OpenSettings();
|
||||||
}
|
|
||||||
|
|
||||||
private void OnBugReportCommand(string command, string arguments) {
|
|
||||||
Task.Run(() => {
|
|
||||||
try {
|
|
||||||
using var file = new FileStream(Path.Combine(this.StartInfo.WorkingDirectory, "dalamud.txt"), FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
|
|
||||||
using var reader = new StreamReader(file, Encoding.UTF8);
|
|
||||||
|
|
||||||
using var client = new WebClient();
|
|
||||||
var response = client.UploadString("https://dalamud-bugbait.herokuapp.com/catch", reader.ReadToEnd());
|
|
||||||
|
|
||||||
this.Framework.Gui.Chat.PrintError(
|
|
||||||
"Your bug report was submitted. A certified technical support specialist will be with you shortly. Please tell them this number: " +
|
|
||||||
response);
|
|
||||||
} catch (Exception ex) {
|
|
||||||
Log.Error(ex, "Bug report failed.");
|
|
||||||
this.Framework.Gui.Chat.PrintError("Could not submit bug report");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ namespace Dalamud.Game {
|
||||||
dalamud.Framework.Gui.Chat.OnChatMessage += OnChatMessage;
|
dalamud.Framework.Gui.Chat.OnChatMessage += OnChatMessage;
|
||||||
|
|
||||||
this.openInstallerWindowLink = this.dalamud.Framework.Gui.Chat.AddChatLinkHandler("Dalamud", 1001, (i, m) => {
|
this.openInstallerWindowLink = this.dalamud.Framework.Gui.Chat.AddChatLinkHandler("Dalamud", 1001, (i, m) => {
|
||||||
this.dalamud.OpenPluginInstaller();
|
this.dalamud.DalamudUi.OpenPluginInstaller();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -212,7 +212,7 @@ namespace Dalamud.Game {
|
||||||
Type = XivChatType.Notice
|
Type = XivChatType.Notice
|
||||||
});
|
});
|
||||||
|
|
||||||
this.dalamud.OpenChangelog();
|
this.dalamud.DalamudUi.OpenChangelog();
|
||||||
|
|
||||||
this.dalamud.Configuration.LastVersion = assemblyVersion;
|
this.dalamud.Configuration.LastVersion = assemblyVersion;
|
||||||
this.dalamud.Configuration.Save();
|
this.dalamud.Configuration.Save();
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ As this is a major patch and we have made several backend changes, please keep i
|
||||||
ImGui.PushFont(InterfaceManager.IconFont);
|
ImGui.PushFont(InterfaceManager.IconFont);
|
||||||
|
|
||||||
if (ImGui.Button(FontAwesomeIcon.Download.ToIconString()))
|
if (ImGui.Button(FontAwesomeIcon.Download.ToIconString()))
|
||||||
this.dalamud.OpenPluginInstaller();
|
this.dalamud.DalamudUi.OpenPluginInstaller();
|
||||||
|
|
||||||
if (ImGui.IsItemHovered()) {
|
if (ImGui.IsItemHovered()) {
|
||||||
ImGui.PopFont();
|
ImGui.PopFont();
|
||||||
|
|
|
||||||
342
Dalamud/Interface/DalamudInterface.cs
Normal file
342
Dalamud/Interface/DalamudInterface.cs
Normal file
|
|
@ -0,0 +1,342 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Numerics;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using CheapLoc;
|
||||||
|
using Dalamud.Game.ClientState;
|
||||||
|
using Dalamud.Game.Command;
|
||||||
|
using Dalamud.Game.Internal;
|
||||||
|
using Dalamud.Plugin;
|
||||||
|
using ImGuiNET;
|
||||||
|
using Serilog;
|
||||||
|
using Serilog.Events;
|
||||||
|
|
||||||
|
namespace Dalamud.Interface
|
||||||
|
{
|
||||||
|
internal class DalamudInterface
|
||||||
|
{
|
||||||
|
private readonly Dalamud dalamud;
|
||||||
|
|
||||||
|
public DalamudInterface(Dalamud dalamud) {
|
||||||
|
this.dalamud = dalamud;
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool isImguiDrawDemoWindow = false;
|
||||||
|
|
||||||
|
#if DEBUG
|
||||||
|
private bool isImguiDrawDevMenu = true;
|
||||||
|
#else
|
||||||
|
private bool isImguiDrawDevMenu = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
public bool IsDevMenu
|
||||||
|
{
|
||||||
|
get => this.isImguiDrawDevMenu;
|
||||||
|
set => this.isImguiDrawDevMenu = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool isImguiDrawLogWindow = false;
|
||||||
|
private bool isImguiDrawDataWindow = false;
|
||||||
|
private bool isImguiDrawPluginWindow = false;
|
||||||
|
private bool isImguiDrawCreditsWindow = false;
|
||||||
|
private bool isImguiDrawSettingsWindow = false;
|
||||||
|
private bool isImguiDrawPluginStatWindow = false;
|
||||||
|
private bool isImguiDrawChangelogWindow = false;
|
||||||
|
|
||||||
|
private DalamudLogWindow logWindow;
|
||||||
|
private DalamudDataWindow dataWindow;
|
||||||
|
private DalamudCreditsWindow creditsWindow;
|
||||||
|
private DalamudSettingsWindow settingsWindow;
|
||||||
|
private PluginInstallerWindow pluginWindow;
|
||||||
|
private DalamudPluginStatWindow pluginStatWindow;
|
||||||
|
private DalamudChangelogWindow changelogWindow;
|
||||||
|
|
||||||
|
public void Draw()
|
||||||
|
{
|
||||||
|
if (!this.IsDevMenu && !this.dalamud.ClientState.Condition.Any())
|
||||||
|
{
|
||||||
|
ImGui.PushStyleColor(ImGuiCol.Button, new Vector4(0, 0, 0, 0));
|
||||||
|
ImGui.PushStyleColor(ImGuiCol.ButtonActive, new Vector4(0, 0, 0, 0));
|
||||||
|
ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Vector4(0, 0, 0, 0));
|
||||||
|
ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(0, 0, 0, 1));
|
||||||
|
ImGui.PushStyleColor(ImGuiCol.TextSelectedBg, new Vector4(0, 0, 0, 1));
|
||||||
|
ImGui.PushStyleColor(ImGuiCol.Border, new Vector4(0, 0, 0, 1));
|
||||||
|
ImGui.PushStyleColor(ImGuiCol.BorderShadow, new Vector4(0, 0, 0, 1));
|
||||||
|
ImGui.PushStyleColor(ImGuiCol.WindowBg, new Vector4(0, 0, 0, 1));
|
||||||
|
|
||||||
|
ImGui.SetNextWindowPos(new Vector2(0, 0), ImGuiCond.Always);
|
||||||
|
ImGui.SetNextWindowBgAlpha(1);
|
||||||
|
|
||||||
|
if (ImGui.Begin("DevMenu Opener", ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoSavedSettings))
|
||||||
|
{
|
||||||
|
if (ImGui.Button("###devMenuOpener", new Vector2(40, 25)))
|
||||||
|
this.IsDevMenu = true;
|
||||||
|
|
||||||
|
ImGui.End();
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui.PopStyleColor(8);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.IsDevMenu)
|
||||||
|
{
|
||||||
|
if (ImGui.BeginMainMenuBar())
|
||||||
|
{
|
||||||
|
if (ImGui.BeginMenu("Dalamud"))
|
||||||
|
{
|
||||||
|
ImGui.MenuItem("Draw Dalamud dev menu", "", ref this.isImguiDrawDevMenu);
|
||||||
|
ImGui.Separator();
|
||||||
|
if (ImGui.MenuItem("Open Log window"))
|
||||||
|
{
|
||||||
|
this.logWindow = new DalamudLogWindow(this.dalamud.CommandManager);
|
||||||
|
this.isImguiDrawLogWindow = true;
|
||||||
|
}
|
||||||
|
if (ImGui.BeginMenu("Set log level..."))
|
||||||
|
{
|
||||||
|
foreach (var logLevel in Enum.GetValues(typeof(LogEventLevel)).Cast<LogEventLevel>())
|
||||||
|
{
|
||||||
|
if (ImGui.MenuItem(logLevel + "##logLevelSwitch", "", this.dalamud.LogLevelSwitch.MinimumLevel == logLevel))
|
||||||
|
{
|
||||||
|
this.dalamud.LogLevelSwitch.MinimumLevel = logLevel;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui.EndMenu();
|
||||||
|
}
|
||||||
|
if (this.dalamud.AntiDebug == null && ImGui.MenuItem("Enable AntiDebug"))
|
||||||
|
{
|
||||||
|
this.dalamud.AntiDebug = new AntiDebug(this.dalamud.SigScanner);
|
||||||
|
this.dalamud.AntiDebug.Enable();
|
||||||
|
}
|
||||||
|
ImGui.Separator();
|
||||||
|
if (ImGui.MenuItem("Open Data window"))
|
||||||
|
{
|
||||||
|
this.dataWindow = new DalamudDataWindow(this.dalamud);
|
||||||
|
this.isImguiDrawDataWindow = true;
|
||||||
|
}
|
||||||
|
if (ImGui.MenuItem("Open Credits window"))
|
||||||
|
{
|
||||||
|
OpenCredits();
|
||||||
|
}
|
||||||
|
if (ImGui.MenuItem("Open Settings window"))
|
||||||
|
{
|
||||||
|
OpenSettings();
|
||||||
|
}
|
||||||
|
if (ImGui.MenuItem("Open Changelog window"))
|
||||||
|
{
|
||||||
|
OpenChangelog();
|
||||||
|
}
|
||||||
|
ImGui.MenuItem("Draw ImGui demo", "", ref this.isImguiDrawDemoWindow);
|
||||||
|
ImGui.Separator();
|
||||||
|
if (ImGui.MenuItem("Unload Dalamud"))
|
||||||
|
{
|
||||||
|
this.dalamud.Unload();
|
||||||
|
}
|
||||||
|
if (ImGui.MenuItem("Kill game"))
|
||||||
|
{
|
||||||
|
Process.GetCurrentProcess().Kill();
|
||||||
|
}
|
||||||
|
if (ImGui.MenuItem("Cause AccessViolation"))
|
||||||
|
{
|
||||||
|
var a = Marshal.ReadByte(IntPtr.Zero);
|
||||||
|
}
|
||||||
|
ImGui.Separator();
|
||||||
|
ImGui.MenuItem(Util.AssemblyVersion, false);
|
||||||
|
ImGui.MenuItem(this.dalamud.StartInfo.GameVersion, false);
|
||||||
|
|
||||||
|
ImGui.EndMenu();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ImGui.BeginMenu("Game"))
|
||||||
|
{
|
||||||
|
if (ImGui.MenuItem("Replace ExceptionHandler"))
|
||||||
|
{
|
||||||
|
this.dalamud.ReplaceExceptionHandler();
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui.EndMenu();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ImGui.BeginMenu("Plugins"))
|
||||||
|
{
|
||||||
|
if (ImGui.MenuItem("Open Plugin installer"))
|
||||||
|
{
|
||||||
|
this.pluginWindow = new PluginInstallerWindow(this.dalamud, this.dalamud.StartInfo.GameVersion);
|
||||||
|
this.isImguiDrawPluginWindow = true;
|
||||||
|
}
|
||||||
|
ImGui.Separator();
|
||||||
|
if (ImGui.MenuItem("Open Plugin Stats"))
|
||||||
|
{
|
||||||
|
if (!this.isImguiDrawPluginStatWindow)
|
||||||
|
{
|
||||||
|
this.pluginStatWindow = new DalamudPluginStatWindow(this.dalamud.PluginManager);
|
||||||
|
this.isImguiDrawPluginStatWindow = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (ImGui.MenuItem("Print plugin info"))
|
||||||
|
{
|
||||||
|
foreach (var plugin in this.dalamud.PluginManager.Plugins)
|
||||||
|
{
|
||||||
|
// TODO: some more here, state maybe?
|
||||||
|
Log.Information($"{plugin.Plugin.Name}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (ImGui.MenuItem("Reload plugins"))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
this.dalamud.PluginManager.ReloadPlugins();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
this.dalamud.Framework.Gui.Chat.PrintError("Reload failed.");
|
||||||
|
Log.Error(ex, "Plugin reload failed.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui.Separator();
|
||||||
|
ImGui.MenuItem("API Level:" + PluginManager.DALAMUD_API_LEVEL, false);
|
||||||
|
ImGui.MenuItem("Loaded plugins:" + this.dalamud.PluginManager?.Plugins.Count, false);
|
||||||
|
ImGui.EndMenu();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ImGui.BeginMenu("Localization"))
|
||||||
|
{
|
||||||
|
if (ImGui.MenuItem("Export localizable"))
|
||||||
|
{
|
||||||
|
Loc.ExportLocalizable();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ImGui.BeginMenu("Load language..."))
|
||||||
|
{
|
||||||
|
if (ImGui.MenuItem("From Fallbacks"))
|
||||||
|
{
|
||||||
|
Loc.SetupWithFallbacks();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ImGui.MenuItem("From UICulture"))
|
||||||
|
{
|
||||||
|
this.dalamud.LocalizationManager.SetupWithUiCulture();
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var applicableLangCode in Localization.ApplicableLangCodes)
|
||||||
|
{
|
||||||
|
if (ImGui.MenuItem($"Applicable: {applicableLangCode}"))
|
||||||
|
{
|
||||||
|
this.dalamud.LocalizationManager.SetupWithLangCode(applicableLangCode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ImGui.EndMenu();
|
||||||
|
}
|
||||||
|
ImGui.EndMenu();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.dalamud.Framework.Gui.GameUiHidden)
|
||||||
|
ImGui.BeginMenu("UI is hidden...", false);
|
||||||
|
|
||||||
|
ImGui.EndMainMenuBar();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.dalamud.Framework.Gui.GameUiHidden)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (this.isImguiDrawLogWindow)
|
||||||
|
{
|
||||||
|
this.isImguiDrawLogWindow = this.logWindow != null && this.logWindow.Draw();
|
||||||
|
|
||||||
|
if (this.isImguiDrawLogWindow == false)
|
||||||
|
{
|
||||||
|
this.logWindow?.Dispose();
|
||||||
|
this.logWindow = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.isImguiDrawDataWindow)
|
||||||
|
{
|
||||||
|
this.isImguiDrawDataWindow = this.dataWindow != null && this.dataWindow.Draw();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.isImguiDrawPluginWindow)
|
||||||
|
{
|
||||||
|
this.isImguiDrawPluginWindow = this.pluginWindow != null && this.pluginWindow.Draw();
|
||||||
|
|
||||||
|
if (!this.isImguiDrawPluginWindow)
|
||||||
|
this.pluginWindow = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.isImguiDrawCreditsWindow)
|
||||||
|
{
|
||||||
|
this.isImguiDrawCreditsWindow = this.creditsWindow != null && this.creditsWindow.Draw();
|
||||||
|
|
||||||
|
if (this.isImguiDrawCreditsWindow == false)
|
||||||
|
{
|
||||||
|
this.creditsWindow?.Dispose();
|
||||||
|
this.creditsWindow = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.isImguiDrawSettingsWindow)
|
||||||
|
{
|
||||||
|
this.isImguiDrawSettingsWindow = this.settingsWindow != null && this.settingsWindow.Draw();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.isImguiDrawDemoWindow)
|
||||||
|
ImGui.ShowDemoWindow();
|
||||||
|
|
||||||
|
if (this.isImguiDrawPluginStatWindow)
|
||||||
|
{
|
||||||
|
this.isImguiDrawPluginStatWindow = this.pluginStatWindow != null && this.pluginStatWindow.Draw();
|
||||||
|
if (!this.isImguiDrawPluginStatWindow)
|
||||||
|
{
|
||||||
|
this.pluginStatWindow?.Dispose();
|
||||||
|
this.pluginStatWindow = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.isImguiDrawChangelogWindow)
|
||||||
|
{
|
||||||
|
this.isImguiDrawChangelogWindow = this.changelogWindow != null && this.changelogWindow.Draw();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
internal void OpenPluginInstaller()
|
||||||
|
{
|
||||||
|
if (this.pluginWindow == null)
|
||||||
|
{
|
||||||
|
this.pluginWindow = new PluginInstallerWindow(this.dalamud, this.dalamud.StartInfo.GameVersion);
|
||||||
|
}
|
||||||
|
this.isImguiDrawPluginWindow ^= true;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal void OpenChangelog()
|
||||||
|
{
|
||||||
|
this.changelogWindow = new DalamudChangelogWindow(this.dalamud);
|
||||||
|
this.isImguiDrawChangelogWindow = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal void OpenSettings()
|
||||||
|
{
|
||||||
|
this.settingsWindow = new DalamudSettingsWindow(this.dalamud);
|
||||||
|
this.isImguiDrawSettingsWindow ^= true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OpenLog() {
|
||||||
|
this.logWindow = new DalamudLogWindow(this.dalamud.CommandManager);
|
||||||
|
this.isImguiDrawLogWindow = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OpenCredits() {
|
||||||
|
var logoGraphic =
|
||||||
|
this.dalamud.InterfaceManager.LoadImage(
|
||||||
|
Path.Combine(this.dalamud.StartInfo.WorkingDirectory, "UIRes", "logo.png"));
|
||||||
|
this.creditsWindow = new DalamudCreditsWindow(this.dalamud, logoGraphic, this.dalamud.Framework);
|
||||||
|
this.isImguiDrawCreditsWindow = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -69,7 +69,7 @@ namespace Dalamud.Plugin
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
public bool IsDebugging => true;
|
public bool IsDebugging => true;
|
||||||
#else
|
#else
|
||||||
public bool IsDebugging => this.dalamud.IsDevMenu;
|
public bool IsDebugging => this.dalamud.DalamudUi.IsDevMenu;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
private readonly Dalamud dalamud;
|
private readonly Dalamud dalamud;
|
||||||
|
|
|
||||||
|
|
@ -213,7 +213,7 @@ namespace Dalamud.Plugin
|
||||||
ImGui.SameLine();
|
ImGui.SameLine();
|
||||||
|
|
||||||
if (ImGui.Button(Loc.Localize("SettingsInstaller", "Settings"))) {
|
if (ImGui.Button(Loc.Localize("SettingsInstaller", "Settings"))) {
|
||||||
this.dalamud.OpenSettings();
|
this.dalamud.DalamudUi.OpenSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
var closeText = Loc.Localize("Close", "Close");
|
var closeText = Loc.Localize("Close", "Close");
|
||||||
|
|
|
||||||
|
|
@ -251,5 +251,10 @@ namespace Dalamud.Plugin
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ReloadPlugins() {
|
||||||
|
UnloadPlugins();
|
||||||
|
LoadPlugins();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue