From a155a57f33a38b80dc86d00147ccf8fd24bc5f15 Mon Sep 17 00:00:00 2001
From: JonKazama-Hellion <f.wathling@gmail.com>
Date: Sat, 2 May 2026 23:33:15 +0200
Subject: [PATCH] fix(packaging): icon and image urls now reach the built
 manifest

Three packaging defects rolled into one fix:

- The custom DalamudPackager.targets override forced HandleImages and
  ImagesPath through the legacy code path. SDK 15 handles images by
  default and the override produced an output manifest with neither
  IconUrl nor ImageUrls populated. Removed.
- The csproj only included images/icon.png explicitly via
  <None Include>, so chatWindow.png and withSimpleTweaks.png never
  reached the build output and never made it into the release ZIP
  either. Switched to a glob include.
- HellionChat.yaml carried no icon_url / image_urls, so even after
  the SDK started writing the manifest correctly, both fields stayed
  unset. Added them pointing at the public raw.githubusercontent
  URLs that already work for the repo.json IconUrl.

Net effect on a fresh release: Dalamud picks up the icon next to the
DLL on dev installs, the plugin-installer card shows the proper
HellionChat logo for users coming through the custom repo, and the
two screenshot images are listed alongside the description so the
plugin installer carousel works the way other Dalamud plugins look.
---
 ChatTwo/ChatTwo.csproj          | 19 ++++-----
 ChatTwo/DalamudPackager.targets | 76 ---------------------------------
 ChatTwo/HellionChat.yaml        |  4 ++
 3 files changed, 13 insertions(+), 86 deletions(-)
 delete mode 100644 ChatTwo/DalamudPackager.targets

diff --git a/ChatTwo/ChatTwo.csproj b/ChatTwo/ChatTwo.csproj
index ee1d849..f915af4 100644
--- a/ChatTwo/ChatTwo.csproj
+++ b/ChatTwo/ChatTwo.csproj
@@ -57,17 +57,16 @@
     </ItemGroup>
 
 
+    <!-- Plugin icon. Copy images/* into the build output so Dalamud
+         finds the icon next to the DLL, and let the SDK default
+         DalamudPackager pipeline include the same path in the
+         release ZIP. Earlier we shipped a custom DalamudPackager
+         targets override that explicitly set HandleImages and
+         ImagesPath; that override conflicted with the SDK 15
+         default and the resulting manifest carried no IconUrl.
+         Removed in v0.5.2. -->
     <ItemGroup>
-      <Folder Include="images\" />
-    </ItemGroup>
-
-    <!-- Copy images/icon.png next to the built DLL so Dalamud's local
-         plugin loader finds it at <plugindir>/images/icon.png. The
-         DalamudPackager.targets file in this directory then includes
-         the same path inside the release ZIP — see that file for the
-         full packaging override. -->
-    <ItemGroup>
-        <None Include="images\icon.png">
+        <None Include="images\**">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>
diff --git a/ChatTwo/DalamudPackager.targets b/ChatTwo/DalamudPackager.targets
deleted file mode 100644
index 6d0d1ce..0000000
--- a/ChatTwo/DalamudPackager.targets
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  HellionChat — DalamudPackager override.
-
-  The default DalamudPackager.targets shipped by the SDK does not set
-  HandleImages / ImagesPath, so the images/ directory is silently
-  excluded from the release ZIP. The presence of this file at
-  $(ProjectDir)DalamudPackager.targets disables the SDK's default
-  target (it guards on `!Exists('$(PackagerTargetFile)')`) and lets
-  us call the packager task ourselves with the image fields wired in.
-
-  Apart from HandleImages + ImagesPath the property list mirrors the
-  SDK default verbatim so we don't lose any other manifest field as
-  the upstream SDK evolves.
--->
-<Project>
-    <Target Name="HellionDalamudPackagerDebug"
-            AfterTargets="Build"
-            Condition="'$(Configuration)' == 'Debug'">
-        <DalamudPackager ProjectDir="$(ProjectDir)"
-                         OutputPath="$(OutputPath)"
-                         AssemblyName="$(AssemblyName)"
-                         MakeZip="false"
-                         Author="$(Author)"
-                         Name="$(Name)"
-                         MinimumDalamudVersion="$(MinimumDalamudVersion)"
-                         Punchline="$(Punchline)"
-                         Description="$(Description)"
-                         ApplicableVersion="$(ApplicableVersion)"
-                         RepoUrl="$(RepoUrl)"
-                         Tags="$(Tags)"
-                         CategoryTags="$(CategoryTags)"
-                         DalamudApiLevel="$(DalamudApiLevel)"
-                         LoadRequiredState="$(LoadRequiredState)"
-                         LoadSync="$(LoadSync)"
-                         CanUnloadAsync="$(CanUnloadAsync)"
-                         LoadPriority="$(LoadPriority)"
-                         ImageUrls="$(ImageUrls)"
-                         IconUrl="$(IconUrl)"
-                         Changelog="$(Changelog)"
-                         AcceptsFeedback="$(AcceptsFeedback)"
-                         FeedbackMessage="$(FeedbackMessage)"
-                         HandleImages="true"
-                         ImagesPath="$(ProjectDir)images" />
-    </Target>
-
-    <Target Name="HellionDalamudPackagerRelease"
-            AfterTargets="Build"
-            Condition="'$(Configuration)' == 'Release'">
-        <DalamudPackager ProjectDir="$(ProjectDir)"
-                         OutputPath="$(OutputPath)"
-                         AssemblyName="$(AssemblyName)"
-                         MakeZip="true"
-                         Author="$(Author)"
-                         Name="$(Name)"
-                         MinimumDalamudVersion="$(MinimumDalamudVersion)"
-                         Punchline="$(Punchline)"
-                         Description="$(Description)"
-                         ApplicableVersion="$(ApplicableVersion)"
-                         RepoUrl="$(RepoUrl)"
-                         Tags="$(Tags)"
-                         CategoryTags="$(CategoryTags)"
-                         DalamudApiLevel="$(DalamudApiLevel)"
-                         LoadRequiredState="$(LoadRequiredState)"
-                         LoadSync="$(LoadSync)"
-                         CanUnloadAsync="$(CanUnloadAsync)"
-                         LoadPriority="$(LoadPriority)"
-                         ImageUrls="$(ImageUrls)"
-                         IconUrl="$(IconUrl)"
-                         Changelog="$(Changelog)"
-                         AcceptsFeedback="$(AcceptsFeedback)"
-                         FeedbackMessage="$(FeedbackMessage)"
-                         HandleImages="true"
-                         ImagesPath="$(ProjectDir)images" />
-    </Target>
-</Project>
diff --git a/ChatTwo/HellionChat.yaml b/ChatTwo/HellionChat.yaml
index 4ae1cc1..e267680 100755
--- a/ChatTwo/HellionChat.yaml
+++ b/ChatTwo/HellionChat.yaml
@@ -33,6 +33,10 @@ description: |-
   Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
 repo_url: https://github.com/JonKazama-Hellion/HellionChat
 accepts_feedback: true
+icon_url: https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/ChatTwo/images/icon.png
+image_urls:
+  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/ChatTwo/images/chatWindow.png
+  - https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/ChatTwo/images/withSimpleTweaks.png
 tags:
   - Social
   - UI