BurntToast/BurntToast.cs

@@ -1,23 +1,25 @@
-using Dalamud.IoC;
+using Dalamud.Game.Command;
+using Dalamud.Game.Gui;
+using Dalamud.Game.Gui.Toast;
+using Dalamud.IoC;
 using Dalamud.Plugin;
-using Dalamud.Plugin.Services;
 using XivCommon;
 
 namespace BurntToast {
     public class BurntToast : IDalamudPlugin {
-        internal static string Name => "Burnt Toast";
+        public string Name => "Burnt Toast";
 
         [PluginService]
         internal DalamudPluginInterface Interface { get; private init; } = null!;
 
         [PluginService]
-        internal IChatGui ChatGui { get; private init; } = null!;
+        internal ChatGui ChatGui { get; private init; } = null!;
 
         [PluginService]
-        internal ICommandManager CommandManager { get; private init; } = null!;
+        internal CommandManager CommandManager { get; private init; } = null!;
 
         [PluginService]
-        internal IToastGui ToastGui { get; private init; } = null!;
+        internal ToastGui ToastGui { get; private init; } = null!;
 
         internal Configuration Config { get; }
         internal PluginUi Ui { get; }
@@ -31,7 +33,7 @@ namespace BurntToast {
 
             this.Ui = new PluginUi(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);
         }
 

BurntToast/BurntToast.csproj

@@ -1,43 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7-windows</TargetFramework>
+        <TargetFramework>net5-windows</TargetFramework>
         <RootNamespace>BurntToast</RootNamespace>
         <AssemblyName>BurntToast</AssemblyName>
         <Nullable>enable</Nullable>
-        <Version>1.2.8</Version>
+        <Version>1.2.2</Version>
         <LangVersion>latest</LangVersion>
         <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <DalamudLibPath>$(AppData)\XIVLauncher\addon\Hooks\dev</DalamudLibPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
-        <DalamudLibPath>$(DALAMUD_HOME)</DalamudLibPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(IsCI)' == 'true'">
-        <DalamudLibPath>$(HOME)/dalamud</DalamudLibPath>
+        <Dalamud>$(AppData)\XIVLauncher\addon\Hooks\dev</Dalamud>
     </PropertyGroup>
 
     <ItemGroup>
         <Reference Include="Dalamud">
-            <HintPath>$(DalamudLibPath)\Dalamud.dll</HintPath>
+            <HintPath>$(Dalamud)\Dalamud.dll</HintPath>
             <Private>False</Private>
         </Reference>
         <Reference Include="ImGui.NET">
-            <HintPath>$(DalamudLibPath)\ImGui.NET.dll</HintPath>
+            <HintPath>$(Dalamud)\ImGui.NET.dll</HintPath>
             <Private>False</Private>
         </Reference>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="DalamudPackager" Version="2.1.12"/>
-        <PackageReference Include="XivCommon" Version="9.0.0"/>
+        <PackageReference Include="DalamudLinter" Version="1.0.3"/>
+        <PackageReference Include="DalamudPackager" Version="2.1.2"/>
+        <PackageReference Include="XivCommon" Version="3.0.2"/>
     </ItemGroup>
 
 </Project>

BurntToast/BurntToast.yaml

@@ -1,5 +1,4 @@
 name: Burnt Toast
-author: Anna
-punchline: Hides toast notifications you don't want to see.
+author: ascclemens
 description: Hides toast notifications you don't want to see.
-repo_url: https://git.anna.lgbt/anna/BurntToast
+repo_url: https://git.sr.ht/~jkcclemens/BurntToast

BurntToast/Filter.cs

@@ -65,7 +65,7 @@ namespace BurntToast {
             isHandled = true;
 
             if (pattern.ShowMessage) {
-                this.Plugin.ChatGui.Print(new XivChatEntry {
+                this.Plugin.ChatGui.PrintChat(new XivChatEntry {
                     Type = (XivChatType) 68,
                     Name = sender.TextValue,
                     Message = message,

BurntToast/PluginUi.cs

@@ -41,7 +41,7 @@ namespace BurntToast {
 
             ImGui.SetNextWindowSize(new Vector2(450, 200), ImGuiCond.FirstUseEver);
 
-            if (!ImGui.Begin($"{BurntToast.Name} settings", ref this._showSettings)) {
+            if (!ImGui.Begin($"{this.Plugin.Name} settings", ref this._showSettings)) {
                 ImGui.End();
                 return;
             }

BurntToast/packages.lock.json

@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "dependencies": {
-    "net7.0-windows7.0": {
-      "DalamudPackager": {
-        "type": "Direct",
-        "requested": "[2.1.12, )",
-        "resolved": "2.1.12",
-        "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
-      },
-      "XivCommon": {
-        "type": "Direct",
-        "requested": "[9.0.0, )",
-        "resolved": "9.0.0",
-        "contentHash": "avaBp3FmSCi/PiQhntCeBDYOHejdyTWmFtz4pRBVQQ8vHkmRx+YTk1la9dkYBMlXxRXKckEdH1iI1Fu61JlE7w=="
-      }
-    }
-  }
-}