Update CorePlugin

This commit is contained in:
Raymond 2021-08-26 09:43:52 -04:00
parent e21f71be44
commit a81681834c

View file

@ -1,11 +1,12 @@
using System; using System;
using System.IO;
using Dalamud.Configuration.Internal;
using Dalamud.Game.Command; using Dalamud.Game.Command;
using Dalamud.Game.Gui;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.IoC;
using Dalamud.Logging; using Dalamud.Logging;
using Dalamud.Plugin; using Dalamud.Plugin;
using Dalamud.Utility;
namespace Dalamud.CorePlugin namespace Dalamud.CorePlugin
{ {
@ -13,20 +14,27 @@ namespace Dalamud.CorePlugin
/// This class is a a plugin testbed for developing new Dalamud features with easy access to Dalamud itself. /// This class is a a plugin testbed for developing new Dalamud features with easy access to Dalamud itself.
/// Be careful to not commit anything extra. /// Be careful to not commit anything extra.
/// </summary> /// </summary>
/// <remarks>
/// ██████╗ ███████╗ █████╗ ██████╗ ████████╗██╗ ██╗██╗███████╗
/// ██╔══██╗██╔════╝██╔══██╗██╔══██╗ ╚══██╔══╝██║ ██║██║██╔════╝
/// ██████╔╝█████╗ ███████║██║ ██║ ██║ ███████║██║███████╗
/// ██╔══██╗██╔══╝ ██╔══██║██║ ██║ ██║ ██╔══██║██║╚════██║
/// ██║ ██║███████╗██║ ██║██████╔╝ ██║ ██║ ██║██║███████║
/// ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝╚═════╝ ╚═╝ ╚═╝ ╚═╝╚═╝╚══════╝
/// CorePlugin should not be used as a base for new plugins. Use this instead https://github.com/goatcorp/SamplePlugin.
/// While it may have similarities, it is compiled with access to Dalamud internals, which may cause confusion when
/// some things work and others don't in normal operations.
/// </remarks>
public sealed class PluginImpl : IDalamudPlugin public sealed class PluginImpl : IDalamudPlugin
{ {
private readonly WindowSystem windowSystem = new("Dalamud.CorePlugin"); private readonly WindowSystem windowSystem = new("Dalamud.CorePlugin");
private Localization localization;
// private Localization localizationManager;
[PluginService]
public static CommandManager CmdManager { get; private set; }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="PluginImpl"/> class. /// Initializes a new instance of the <see cref="PluginImpl"/> class.
/// </summary> /// </summary>
/// <param name="pluginInterface">Dalamud plugin interface.</param> /// <param name="pluginInterface">Dalamud plugin interface.</param>
public PluginImpl(DalamudPluginInterface pluginInterface, ChatGui chatGui) public PluginImpl(DalamudPluginInterface pluginInterface)
{ {
try try
{ {
@ -38,7 +46,7 @@ namespace Dalamud.CorePlugin
this.Interface.UiBuilder.Draw += this.OnDraw; this.Interface.UiBuilder.Draw += this.OnDraw;
this.Interface.UiBuilder.OpenConfigUi += this.OnOpenConfigUi; this.Interface.UiBuilder.OpenConfigUi += this.OnOpenConfigUi;
CmdManager.AddHandler("/coreplug", new(this.OnCommand) { HelpMessage = $"Access the {this.Name} plugin." }); Service<CommandManager>.Get().AddHandler("/coreplug", new(this.OnCommand) { HelpMessage = $"Access the {this.Name} plugin." });
PluginLog.Information("CorePlugin ctor!"); PluginLog.Information("CorePlugin ctor!");
} }
@ -59,7 +67,7 @@ namespace Dalamud.CorePlugin
/// <inheritdoc/> /// <inheritdoc/>
public void Dispose() public void Dispose()
{ {
CmdManager.RemoveHandler("/coreplug"); Service<CommandManager>.Get().RemoveHandler("/coreplug");
this.Interface.UiBuilder.Draw -= this.OnDraw; this.Interface.UiBuilder.Draw -= this.OnDraw;
@ -68,19 +76,24 @@ namespace Dalamud.CorePlugin
this.Interface.Dispose(); this.Interface.Dispose();
} }
// private void InitLoc() /// <summary>
// { /// CheapLoc needs to be reinitialized here because it tracks the setup by assembly name. New assembly, new setup.
// // CheapLoc needs to be reinitialized here because it tracks the setup by assembly name. New assembly, new setup. /// </summary>
// this.localizationManager = new Localization(Path.Combine(Dalamud.Instance.AssetDirectory.FullName, "UIRes", "loc", "dalamud"), "dalamud_"); public void InitLoc()
// if (!string.IsNullOrEmpty(Dalamud.Instance.Configuration.LanguageOverride)) {
// { var dalamud = Service<Dalamud>.Get();
// this.localizationManager.SetupWithLangCode(Dalamud.Instance.Configuration.LanguageOverride); var dalamudConfig = Service<DalamudConfiguration>.Get();
// }
// else this.localization = new Localization(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "loc", "dalamud"), "dalamud_");
// { if (!dalamudConfig.LanguageOverride.IsNullOrEmpty())
// this.localizationManager.SetupWithUiCulture(); {
// } this.localization.SetupWithLangCode(dalamudConfig.LanguageOverride);
// } }
else
{
this.localization.SetupWithUiCulture();
}
}
/// <summary> /// <summary>
/// Draw the window system. /// Draw the window system.
@ -100,6 +113,7 @@ namespace Dalamud.CorePlugin
private void OnCommand(string command, string args) private void OnCommand(string command, string args)
{ {
PluginLog.Information("Command called!"); PluginLog.Information("Command called!");
// this.window.IsOpen = true; // this.window.IsOpen = true;
} }