From 3402ad89a132fa5843de99ea02109a4df76d0cc1 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 29 Mar 2025 17:02:07 -0400 Subject: [PATCH] Update to Dalamud API 12 --- dalamud/Auracite/AdventurerPlateStep.cs | 23 +++++-------------- dalamud/Auracite/Auracite.csproj | 5 ++-- .../Auracite/Dalamud.Plugin.Bootstrap.targets | 12 ---------- dalamud/Auracite/packages.lock.json | 14 +++++++---- 4 files changed, 18 insertions(+), 36 deletions(-) delete mode 100644 dalamud/Auracite/Dalamud.Plugin.Bootstrap.targets diff --git a/dalamud/Auracite/AdventurerPlateStep.cs b/dalamud/Auracite/AdventurerPlateStep.cs index 897d5af..682b9a8 100644 --- a/dalamud/Auracite/AdventurerPlateStep.cs +++ b/dalamud/Auracite/AdventurerPlateStep.cs @@ -20,17 +20,6 @@ namespace Auracite; public class AdventurerPlateStep : IStep { - // Remove when https://github.com/aers/FFXIVClientStructs/pull/1319 is merged - enum DecorationType - { - Invalid = 0x0, - Backing = 0x1, - PatternOverlay = 0x2, - PortraitFrame = 0x3, - PlateFrame = 0x4, - Accent = 0x5, - } - public AdventurerPlateStep() { @@ -70,33 +59,33 @@ public class AdventurerPlateStep : IStep continue; } - switch ((DecorationType)decoration.Index) + switch (decoration.Type) { - case DecorationType.PatternOverlay: + case AgentCharaCard.DecorationType.PatternOverlay: { Plugin.package.pattern_overlay = GetImage(ResolveCardDecoration(rowIndex)) .ToBase64String(PngFormat.Instance); } break; - case DecorationType.Backing: + case AgentCharaCard.DecorationType.Backing: { Plugin.package.backing = GetImage(ResolveCardDecoration(rowIndex)) .ToBase64String(PngFormat.Instance); } break; - case DecorationType.PortraitFrame: + case AgentCharaCard.DecorationType.PortraitFrame: { Plugin.package.portrait_frame = GetImage(ResolveCardDecoration(rowIndex)) .ToBase64String(PngFormat.Instance); } break; - case DecorationType.PlateFrame: + case AgentCharaCard.DecorationType.PlateFrame: { Plugin.package.plate_frame = GetImage(ResolveCardDecoration(rowIndex)) .ToBase64String(PngFormat.Instance); } break; - case DecorationType.Accent: + case AgentCharaCard.DecorationType.Accent: { Plugin.package.accent = GetImage(ResolveCardDecoration(rowIndex)) .ToBase64String(PngFormat.Instance); diff --git a/dalamud/Auracite/Auracite.csproj b/dalamud/Auracite/Auracite.csproj index a69a125..3e6407a 100644 --- a/dalamud/Auracite/Auracite.csproj +++ b/dalamud/Auracite/Auracite.csproj @@ -1,9 +1,8 @@ - - + - 1.3.0.0 + 1.4.0.0 NeoVARC diff --git a/dalamud/Auracite/Dalamud.Plugin.Bootstrap.targets b/dalamud/Auracite/Dalamud.Plugin.Bootstrap.targets deleted file mode 100644 index 188269d..0000000 --- a/dalamud/Auracite/Dalamud.Plugin.Bootstrap.targets +++ /dev/null @@ -1,12 +0,0 @@ - - - - $(appdata)\XIVLauncher\addon\Hooks\dev\ - $(HOME)/.xlcore/dalamud/Hooks/dev/ - $(HOME)/.local/share/astra/dalamud/stable/ - $(HOME)/Library/Application Support/XIV on Mac/dalamud/Hooks/dev/ - $(DALAMUD_HOME)/ - - - - diff --git a/dalamud/Auracite/packages.lock.json b/dalamud/Auracite/packages.lock.json index c872bc3..9621ea8 100644 --- a/dalamud/Auracite/packages.lock.json +++ b/dalamud/Auracite/packages.lock.json @@ -1,12 +1,18 @@ { "version": 1, "dependencies": { - "net8.0-windows7.0": { + "net9.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[11.0.0, )", - "resolved": "11.0.0", - "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA==" + "requested": "[12.0.0, )", + "resolved": "12.0.0", + "contentHash": "J5TJLV3f16T/E2H2P17ClWjtfEBPpq3yxvqW46eN36JCm6wR+EaoaYkqG9Rm5sHqs3/nK/vKjWWyvEs/jhKoXw==" + }, + "DotNet.ReproducibleBuilds": { + "type": "Direct", + "requested": "[1.2.25, )", + "resolved": "1.2.25", + "contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg==" }, "EmbedIO": { "type": "Direct",