anna
/
BurntToast
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: update to api4

This commit is contained in:
Anna 2021-09-20 14:26:42 -04:00
parent ca42df5117
commit 9fd271f7ca
6 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
BurntToast/BurntToast.cs
View File

@ -1,26 +1,39 @@
using Dalamud.Plugin; using Dalamud.Game.Command;
using Dalamud.Game.Gui;
using Dalamud.Game.Gui.Toast;
using Dalamud.IoC;
using Dalamud.Plugin;
using XivCommon; using XivCommon;
namespace BurntToast { namespace BurntToast {
public class BurntToast : IDalamudPlugin { public class BurntToast : IDalamudPlugin {
public string Name => "Burnt Toast"; public string Name => "Burnt Toast";
internal DalamudPluginInterface Interface { get; private set; } = null!; [PluginService]
internal Configuration Config { get; private set; } = null!; internal DalamudPluginInterface Interface { get; private init; } = null!;
internal PluginUi Ui { get; private set; } = null!;
internal XivCommonBase Common { get; private set; } = null!;
private Commands Commands { get; set; } = null!;
private Filter Filter { get; set; } = null!;
public void Initialize(DalamudPluginInterface pluginInterface) { [PluginService]
this.Interface = pluginInterface; internal ChatGui ChatGui { get; private init; } = null!;
[PluginService]
internal CommandManager CommandManager { get; private init; } = null!;
[PluginService]
internal ToastGui ToastGui { get; private init; } = null!;
internal Configuration Config { get; }
internal PluginUi Ui { get; }
internal XivCommonBase Common { get; }
private Commands Commands { get; }
private Filter Filter { get; }
public BurntToast() {
this.Config = this.Interface.GetPluginConfig() as Configuration ?? new Configuration(); this.Config = this.Interface.GetPluginConfig() as Configuration ?? new Configuration();
this.Config.Initialise(this); this.Config.Initialise(this);
this.Ui = new PluginUi(this); this.Ui = new PluginUi(this);
this.Commands = new Commands(this); this.Commands = new Commands(this);
this.Common = new XivCommonBase(this.Interface, Hooks.BattleTalk); this.Common = new XivCommonBase(Hooks.BattleTalk);
this.Filter = new Filter(this); this.Filter = new Filter(this);
} }

20
BurntToast/BurntToast.csproj
View File

@ -1,34 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net48</TargetFramework> <TargetFramework>net5-windows</TargetFramework>
<RootNamespace>BurntToast</RootNamespace> <RootNamespace>BurntToast</RootNamespace>
<AssemblyName>BurntToast</AssemblyName> <AssemblyName>BurntToast</AssemblyName>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>1.2.1</Version> <Version>1.2.1</Version>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<Dalamud>$(AppData)\XIVLauncher\addon\Hooks\dev</Dalamud>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Dalamud"> <Reference Include="Dalamud">
<HintPath>D:\code\Dalamud\bin\Dalamud.dll</HintPath> <HintPath>$(Dalamud)\Dalamud.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="ImGui.NET"> <Reference Include="ImGui.NET">
<HintPath>D:\code\Dalamud\bin\ImGui.NET.dll</HintPath> <HintPath>$(Dalamud)\ImGui.NET.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ImGuiScene">
<HintPath>D:\code\Dalamud\bin\ImGuiScene.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DalamudPackager" Version="1.2.1"/> <PackageReference Include="DalamudLinter" Version="1.0.3"/>
<PackageReference Include="Fody" Version="6.5.1" PrivateAssets="all"/> <PackageReference Include="DalamudPackager" Version="2.1.2"/>
<PackageReference Include="ILMerge.Fody" Version="1.16.0" PrivateAssets="all"/> <PackageReference Include="XivCommon" Version="3.0.2"/>
<PackageReference Include="XivCommon" Version="1.2.0"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

8
BurntToast/Commands.cs
View File

@ -14,16 +14,16 @@ namespace BurntToast {
internal Commands(BurntToast plugin) { internal Commands(BurntToast plugin) {
this.Plugin = plugin; this.Plugin = plugin;
foreach (var entry in CommandList) { foreach (var (name, desc) in CommandList) {
this.Plugin.Interface.CommandManager.AddHandler(entry.Key, new CommandInfo(this.OnCommand) { this.Plugin.CommandManager.AddHandler(name, new CommandInfo(this.OnCommand) {
HelpMessage = entry.Value, HelpMessage = desc,
}); });
} }
} }
public void Dispose() { public void Dispose() {
foreach (var name in CommandList.Keys) { foreach (var name in CommandList.Keys) {
this.Plugin.Interface.CommandManager.RemoveHandler(name); this.Plugin.CommandManager.RemoveHandler(name);
} }
} }

18
BurntToast/Filter.cs
View File

@ -1,6 +1,6 @@
using System; using System;
using System.Linq; using System.Linq;
using Dalamud.Game.Internal.Gui.Toast; using Dalamud.Game.Gui.Toast;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using XivCommon.Functions; using XivCommon.Functions;
@ -12,17 +12,17 @@ namespace BurntToast {
internal Filter(BurntToast plugin) { internal Filter(BurntToast plugin) {
this.Plugin = plugin; this.Plugin = plugin;
this.Plugin.Interface.Framework.Gui.Toast.OnToast += this.OnToast; this.Plugin.ToastGui.Toast += this.OnToast;
this.Plugin.Interface.Framework.Gui.Toast.OnQuestToast += this.OnQuestToast; this.Plugin.ToastGui.QuestToast += this.OnQuestToast;
this.Plugin.Interface.Framework.Gui.Toast.OnErrorToast += this.OnErrorToast; this.Plugin.ToastGui.ErrorToast += this.OnErrorToast;
this.Plugin.Common.Functions.BattleTalk.OnBattleTalk += this.OnBattleTalk; this.Plugin.Common.Functions.BattleTalk.OnBattleTalk += this.OnBattleTalk;
} }
public void Dispose() { public void Dispose() {
this.Plugin.Common.Functions.BattleTalk.OnBattleTalk -= this.OnBattleTalk; this.Plugin.Common.Functions.BattleTalk.OnBattleTalk -= this.OnBattleTalk;
this.Plugin.Interface.Framework.Gui.Toast.OnErrorToast -= this.OnErrorToast; this.Plugin.ToastGui.ErrorToast -= this.OnErrorToast;
this.Plugin.Interface.Framework.Gui.Toast.OnQuestToast -= this.OnQuestToast; this.Plugin.ToastGui.QuestToast -= this.OnQuestToast;
this.Plugin.Interface.Framework.Gui.Toast.OnToast -= this.OnToast; this.Plugin.ToastGui.Toast -= this.OnToast;
} }
private bool AnyMatches(string text) { private bool AnyMatches(string text) {
@ -65,10 +65,10 @@ namespace BurntToast {
isHandled = true; isHandled = true;
if (pattern.ShowMessage) { if (pattern.ShowMessage) {
this.Plugin.Interface.Framework.Gui.Chat.PrintChat(new XivChatEntry { this.Plugin.ChatGui.PrintChat(new XivChatEntry {
Type = (XivChatType) 68, Type = (XivChatType) 68,
Name = sender.TextValue, Name = sender.TextValue,
MessageBytes = message.Encode(), Message = message,
}); });
} }
} }

3
BurntToast/FodyWeavers.xml
View File

@ -1,3 +0,0 @@
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<ILMerge/>
</Weavers>

10
BurntToast/PluginUi.cs
View File

@ -17,20 +17,20 @@ namespace BurntToast {
public PluginUi(BurntToast plugin) { public PluginUi(BurntToast plugin) {
this.Plugin = plugin; this.Plugin = plugin;
this.Plugin.Interface.UiBuilder.OnBuildUi += this.Draw; this.Plugin.Interface.UiBuilder.Draw += this.Draw;
this.Plugin.Interface.UiBuilder.OnOpenConfigUi += this.OnOpenConfig; this.Plugin.Interface.UiBuilder.OpenConfigUi += this.OnOpenConfig;
} }
public void Dispose() { public void Dispose() {
this.Plugin.Interface.UiBuilder.OnOpenConfigUi -= this.OnOpenConfig; this.Plugin.Interface.UiBuilder.OpenConfigUi -= this.OnOpenConfig;
this.Plugin.Interface.UiBuilder.OnBuildUi -= this.Draw; this.Plugin.Interface.UiBuilder.Draw -= this.Draw;
} }
internal void ToggleConfig() { internal void ToggleConfig() {
this.ShowSettings = !this.ShowSettings; this.ShowSettings = !this.ShowSettings;
} }
private void OnOpenConfig(object? sender, EventArgs e) { private void OnOpenConfig() {
this.ShowSettings = true; this.ShowSettings = true;
} }