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

Merge pull request #509 from daemitus/misc

Browse source 
Small misc stuff + client structs bump
This commit is contained in:
goaaats 2021-08-27 23:20:56 +02:00 • committed by GitHub
commit 873d0c6305
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 44 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Dalamud.CorePlugin/PluginImpl.cs
View file

@ -1,11 +1,12 @@
using System;
using System.IO;
using Dalamud.Configuration.Internal;
using Dalamud.Game.Command;
using Dalamud.Game.Gui;
using Dalamud.Interface.Windowing;
using Dalamud.IoC;
using Dalamud.Logging;
using Dalamud.Plugin;
using Dalamud.Utility;
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.
/// Be careful to not commit anything extra.
/// </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
{
private readonly WindowSystem windowSystem = new("Dalamud.CorePlugin");
// private Localization localizationManager;
[PluginService]
public static CommandManager CmdManager { get; private set; }
private Localization localization;
/// <summary>
/// Initializes a new instance of the <see cref="PluginImpl"/> class.
/// </summary>
/// <param name="pluginInterface">Dalamud plugin interface.</param>
public PluginImpl(DalamudPluginInterface pluginInterface, ChatGui chatGui)
public PluginImpl(DalamudPluginInterface pluginInterface)
{
try
{
@ -38,7 +46,7 @@ namespace Dalamud.CorePlugin
this.Interface.UiBuilder.Draw += this.OnDraw;
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!");
}
@ -59,7 +67,7 @@ namespace Dalamud.CorePlugin
/// <inheritdoc/>
public void Dispose()
{
CmdManager.RemoveHandler("/coreplug");
Service<CommandManager>.Get().RemoveHandler("/coreplug");
this.Interface.UiBuilder.Draw -= this.OnDraw;
@ -68,19 +76,24 @@ namespace Dalamud.CorePlugin
this.Interface.Dispose();
}
// private void InitLoc()
// {
// // CheapLoc needs to be reinitialized here because it tracks the setup by assembly name. New assembly, new setup.
// this.localizationManager = new Localization(Path.Combine(Dalamud.Instance.AssetDirectory.FullName, "UIRes", "loc", "dalamud"), "dalamud_");
// if (!string.IsNullOrEmpty(Dalamud.Instance.Configuration.LanguageOverride))
// {
// this.localizationManager.SetupWithLangCode(Dalamud.Instance.Configuration.LanguageOverride);
// }
// else
// {
// this.localizationManager.SetupWithUiCulture();
// }
// }
/// <summary>
/// CheapLoc needs to be reinitialized here because it tracks the setup by assembly name. New assembly, new setup.
/// </summary>
public void InitLoc()
{
var dalamud = Service<Dalamud>.Get();
var dalamudConfig = Service<DalamudConfiguration>.Get();
this.localization = new Localization(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "loc", "dalamud"), "dalamud_");
if (!dalamudConfig.LanguageOverride.IsNullOrEmpty())
{
this.localization.SetupWithLangCode(dalamudConfig.LanguageOverride);
}
else
{
this.localization.SetupWithUiCulture();
}
}
/// <summary>
/// Draw the window system.
@ -100,6 +113,7 @@ namespace Dalamud.CorePlugin
private void OnCommand(string command, string args)
{
PluginLog.Information("Command called!");
// this.window.IsOpen = true;
}

3
Dalamud/EntryPoint.cs
View file

@ -198,8 +198,7 @@ namespace Dalamud
var info = "Further information could not be obtained";
if (ex.TargetSite != null && ex.TargetSite.DeclaringType != null)
{
info =
$"{ex.TargetSite.DeclaringType.Assembly.GetName().Name}, {ex.TargetSite.DeclaringType.FullName}::{ex.TargetSite.Name}";
info = $"{ex.TargetSite.DeclaringType.Assembly.GetName().Name}, {ex.TargetSite.DeclaringType.FullName}::{ex.TargetSite.Name}";
}
const MessageBoxType flags = NativeFunctions.MessageBoxType.YesNo | NativeFunctions.MessageBoxType.IconError | NativeFunctions.MessageBoxType.SystemModal;

2
Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
View file

@ -25,6 +25,6 @@ namespace Dalamud.Game.ClientState.Objects.Types
public BattleNpcSubKind BattleNpcKind => (BattleNpcSubKind)this.Struct->Character.GameObject.SubKind;
/// <inheritdoc/>
public override uint TargetObjectId => this.Struct->BattleNpcTargetObjectId;
public override uint TargetObjectId => this.Struct->Character.TargetObjectID;
}
}

2
Dalamud/Game/ClientState/Objects/Types/GameObject.cs
View file

@ -170,6 +170,6 @@ namespace Dalamud.Game.ClientState.Objects.Types
private protected FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)this.Address;
/// <inheritdoc/>
public override string ToString() => $"{this.ObjectId:X}({this.Name.TextValue} - {this.ObjectKind.ToString()}) at {this.Address:X}";
public override string ToString() => $"{this.ObjectId:X}({this.Name.TextValue} - {this.ObjectKind}) at {this.Address:X}";
}
}

3
Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
View file

@ -41,8 +41,7 @@ namespace Dalamud.Interface.Internal.Windows
private const int PluginIconHeight = 512;
// TODO: Change back to master after release
private const string MainRepoImageUrl =
"https://raw.githubusercontent.com/goatcorp/DalamudPlugins/api4/{0}/{1}/images/{2}";
private const string MainRepoImageUrl = "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/api4/{0}/{1}/images/{2}";
private static readonly ModuleLog Log = new("PLUGINW");

4
Dalamud/Plugin/Internal/PluginManager.cs
View file

@ -958,7 +958,7 @@ namespace Dalamud.Plugin.Internal
{
this.AvailablePlugins = ImmutableList.CreateRange(this.availablePlugins);
this.UpdatablePlugins = ImmutableList.CreateRange(this.updatablePlugins);
this.OnAvailablePluginsChanged.Invoke();
this.OnAvailablePluginsChanged?.Invoke();
}
catch (Exception ex)
{
@ -974,7 +974,7 @@ namespace Dalamud.Plugin.Internal
{
this.InstalledPlugins = ImmutableList.CreateRange(this.installedPlugins);
this.UpdatablePlugins = ImmutableList.CreateRange(this.updatablePlugins);
this.OnInstalledPluginsChanged.Invoke();
this.OnInstalledPluginsChanged?.Invoke();
}
catch (Exception ex)
{

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit 47802afd09afe2cf3bd4c92bedc433c8a5bb9ab3
Subproject commit dbc0bcfb01e32a1b53986ecf9e56f594731b1ea5