From 16d60bafbc41b8fad59a5f838ddcc6df13b6ca2c Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 17 Nov 2024 15:04:15 -0500 Subject: [PATCH] Update plugin to API level 11 --- dalamud/Auracite/AdventurerPlateStep.cs | 14 +++++++------- dalamud/Auracite/Dalamud.Plugin.Bootstrap.targets | 2 +- dalamud/Auracite/packages.lock.json | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dalamud/Auracite/AdventurerPlateStep.cs b/dalamud/Auracite/AdventurerPlateStep.cs index a62ed49..37f4222 100644 --- a/dalamud/Auracite/AdventurerPlateStep.cs +++ b/dalamud/Auracite/AdventurerPlateStep.cs @@ -7,7 +7,7 @@ using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Misc; using Lumina.Data.Files; -using Lumina.Excel.GeneratedSheets; +using Lumina.Excel.Sheets; using SharpDX; using SharpDX.Direct3D11; using SharpDX.DXGI; @@ -135,9 +135,9 @@ public class AdventurerPlateStep : IStep .ToBase64String(PngFormat.Instance); } - Plugin.package.plate_title = Title?.Feminine; // TODO: Support mascs + Plugin.package.plate_title = Title?.Feminine.ToString(); // TODO: Support mascs Plugin.package.plate_title_is_prefix = Title?.IsPrefix; - Plugin.package.plate_class_job = ClassJob?.Name; + Plugin.package.plate_class_job = ClassJob?.Name.ToString(); Plugin.package.plate_class_job_level = AgentCharaCard.Instance()->Data->Level; Plugin.package.search_comment = AgentCharaCard.Instance()->Data->SearchComment.ToString(); Completed?.Invoke(); @@ -223,24 +223,24 @@ public class AdventurerPlateStep : IStep public string ResolveCardBase(uint rowIndex) { var row = Plugin.DataManager.GetExcelSheet()?.GetRow(rowIndex); - return $"ui/icon/{row.Image.ToString().Substring(0, 3)}000/{row.Image}_hr1.tex"; + return $"ui/icon/{row?.Image.ToString().Substring(0, 3)}000/{row?.Image}_hr1.tex"; } public string? ResolveCardDecoration(uint rowIndex) { var row = Plugin.DataManager.GetExcelSheet()?.GetRow(rowIndex); - return $"ui/icon/{row.Image.ToString().Substring(0, 3)}000/{row.Image}_hr1.tex"; + return $"ui/icon/{row?.Image.ToString().Substring(0, 3)}000/{row?.Image}_hr1.tex"; } public string? ResolveCardHeaderTop(uint rowIndex) { var row = Plugin.DataManager.GetExcelSheet()?.GetRow(rowIndex); - return $"ui/icon/{row.TopImage.ToString().Substring(0, 3)}000/{row.TopImage}_hr1.tex"; + return $"ui/icon/{row?.TopImage.ToString().Substring(0, 3)}000/{row?.TopImage}_hr1.tex"; } public string? ResolveCardHeaderBottom(uint rowIndex) { var row = Plugin.DataManager.GetExcelSheet()?.GetRow(rowIndex); - return $"ui/icon/{row.BottomImage.ToString().Substring(0, 3)}000/{row.BottomImage}_hr1.tex"; + return $"ui/icon/{row?.BottomImage.ToString().Substring(0, 3)}000/{row?.BottomImage}_hr1.tex"; } } \ No newline at end of file diff --git a/dalamud/Auracite/Dalamud.Plugin.Bootstrap.targets b/dalamud/Auracite/Dalamud.Plugin.Bootstrap.targets index d9fe281..76f6b9d 100644 --- a/dalamud/Auracite/Dalamud.Plugin.Bootstrap.targets +++ b/dalamud/Auracite/Dalamud.Plugin.Bootstrap.targets @@ -3,7 +3,7 @@ $(appdata)\XIVLauncher\addon\Hooks\dev\ $(HOME)/.xlcore/dalamud/Hooks/dev/ - $(HOME)/.local/share/astra/dalamud/local/ + $(HOME)/.local/share/astra/dalamud/staging/ $(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 3d1d1bb..c872bc3 100644 --- a/dalamud/Auracite/packages.lock.json +++ b/dalamud/Auracite/packages.lock.json @@ -4,9 +4,9 @@ "net8.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[2.1.13, )", - "resolved": "2.1.13", - "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ==" + "requested": "[11.0.0, )", + "resolved": "11.0.0", + "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA==" }, "EmbedIO": { "type": "Direct",