API13

VariableVixen · VariableVixen · commit c3272caf5b48 · 2025-08-10T15:38:29.000-04:00
diff --git a/TinyCmds/Chat/ChatUtil.cs b/TinyCmds/Chat/ChatUtil.cs
@@ -10,7 +10,7 @@ namespace VariableVixen.TinyCmds.Chat;
 public static class ChatUtil {
 
 	internal static List<Payload> GenerateMessagePayloads(params object[] payloads) {
-		return new List<Payload>(payloads
+		return payloads
 			.Where(e => e is not null)
 			.SelectMany(e => {
 				return e switch {
@@ -28,7 +28,7 @@ internal static List<Payload> GenerateMessagePayloads(params object[] payloads)
 					],
 				};
 			})
-		);
+			.ToList();
 	}
 
 	#region Chatlog functions
diff --git a/TinyCmds/Commands/ClearMapFlag.cs b/TinyCmds/Commands/ClearMapFlag.cs
@@ -15,6 +15,6 @@ public class ClearMapFlag: PluginCommand {
 	protected override unsafe void Execute(string? command, string rawArguments, FlagMap flags, bool verbose, bool dryRun, ref bool showHelp) {
 		AgentMap* map = AgentMap.Instance();
 		Assert(map is not null, "failed to load AgentMap");
-		map->IsFlagMarkerSet = false;
+		map->FlagMarkerCount = 0;
 	}
 }
diff --git a/TinyCmds/Commands/Conditional/ConditionalMount.cs b/TinyCmds/Commands/Conditional/ConditionalMount.cs
@@ -32,7 +32,7 @@ protected override unsafe bool TryExecute(string? command, string rawArguments,
 		string arg = rawArguments ?? string.Empty;
 		PC* player = (PC*)Plugin.Client.LocalPlayer!.Address; // LocalPlayer is guaranteed to be non-null by BaseConditionalCommand
 		Assert(player is not null, "failed to acquire CS LocalPlayer");
-		MountContainer? mount = Plugin.Conditions[ConditionFlag.Mounted] || Plugin.Conditions[ConditionFlag.Mounted2] ? player->Mount : null;
+		MountContainer? mount = Plugin.Conditions[ConditionFlag.Mounted] || Plugin.Conditions[ConditionFlag.RidingPillion] ? player->Mount : null;
 		ushort mountId = mount?.MountId ?? 0;
 
 		if (flags['g']) {
diff --git a/TinyCmds/Commands/EvaluatePlaceholders.cs b/TinyCmds/Commands/EvaluatePlaceholders.cs
@@ -56,7 +56,7 @@ private static unsafe string readObjName(GameObject* obj)
 	private static unsafe string replace(string p) {
 		string[] parts = p.ToLower().Split('.', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 		string flag = parts[0];
-		HashSet<string> mods = new(parts.Skip(1));
+		HashSet<string> mods = parts.Skip(1).ToHashSet();
 		string value = flag.Trim().ToLower() switch {
 			// Custom placeholders - time
 			"year"
diff --git a/TinyCmds/Commands/LocateBestFATECommand.cs b/TinyCmds/Commands/LocateBestFATECommand.cs
@@ -9,7 +9,6 @@
 
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 
-using Lumina.Excel;
 using Lumina.Excel.Sheets;
 
 using VariableVixen.TinyCmds.Attributes;
@@ -46,7 +45,7 @@ public class LocateBestFATECommand: PluginCommand {
 	internal static DalamudLinkPayload findFateByNamePayload = null!;
 	protected override void Initialise() {
 		base.Initialise();
-		findFateByNamePayload ??= Plugin.PluginInterface.AddChatLinkHandler(Plugin.FindFateByNamePayloadId, this.findFateByName);
+		findFateByNamePayload ??= Plugin.Chat.AddChatLinkHandler(Plugin.FindFateByNamePayloadId, this.findFateByName);
 	}
 	private unsafe void findFateByName(uint linkId, SeString linkText) {
 		if (linkId is not Plugin.FindFateByNamePayloadId) { // ...how?
@@ -123,13 +122,13 @@ protected override unsafe void Execute(string? command, string rawArguments, Fla
 			? fates.OrderByDescending(f => f.Level).First().Level
 			: fates.OrderBy(f => f.Level).First().Level;
 		Fate[] filtered = fates.Where(f => f.Level == fateLevel).ToArray();
-		IEnumerable<Fate> found = filtered.Where(f => f.State is FateState.Preparation || f.TimeRemaining >= minTime && f.Progress <= maxProgress);
+		IEnumerable<Fate> found = filtered.Where(f => f.State is FateState.Preparation || (f.TimeRemaining >= minTime && f.Progress <= maxProgress));
 		bool adjusted = false;
 		while (!found.Any()) { // nothing was found that matches, so we need to gradually relax the limits until SOMETHING comes up
 			adjusted = true;
 			minTime = minTime >= 30 ? minTime - 30 : 0;
 			maxProgress = (byte)Math.Min(maxProgress + 5, 100);
-			found = filtered.Where(f => f.State is FateState.Preparation || f.TimeRemaining >= minTime && f.Progress <= maxProgress);
+			found = filtered.Where(f => f.State is FateState.Preparation || (f.TimeRemaining >= minTime && f.Progress <= maxProgress));
 			if (minTime == 0 && maxProgress == 100) // just in case, to avoid infinite thrash loops
 				break;
 		}
diff --git a/TinyCmds/TinyCmds.csproj b/TinyCmds/TinyCmds.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Dalamud.NET.Sdk/12.0.2">
+<Project Sdk="Dalamud.NET.Sdk/13.0.0">
 	<PropertyGroup>
 		<Product>TinyCmds</Product>
 		<Version>8.9.3</Version>
diff --git a/TinyCmds/Ui/BaseWindow.cs b/TinyCmds/Ui/BaseWindow.cs
@@ -1,10 +1,9 @@
 using System.Diagnostics;
 
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Windowing;
 
-using ImGuiNET;
-
 namespace VariableVixen.TinyCmds.Ui;
 
 internal abstract class BaseWindow: Window {
diff --git a/TinyCmds/Ui/CommandListWindow.cs b/TinyCmds/Ui/CommandListWindow.cs
@@ -1,10 +1,7 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.Windowing;
 
-using ImGuiNET;
-
-using VariableVixen.TinyCmds;
-
 namespace VariableVixen.TinyCmds.Ui;
 
 internal class CommandListWindow: HelpWindow {
diff --git a/TinyCmds/Ui/HelpWindow.cs b/TinyCmds/Ui/HelpWindow.cs
@@ -1,10 +1,4 @@
-using System;
-
-using Dalamud.Interface.Windowing;
-
-using ImGuiNET;
-
-using VariableVixen.TinyCmds;
+using Dalamud.Bindings.ImGui;
 
 namespace VariableVixen.TinyCmds.Ui;
 
diff --git a/TinyCmds/dalamud.props b/TinyCmds/dalamud.props
@@ -9,45 +9,20 @@
 		<Deterministic>false</Deterministic>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-		<DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
 	</PropertyGroup>
 
 	<Import Project="framework.props" />
 
-	<ItemGroup>
-		<Reference Include="Newtonsoft.Json">
-			<HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
-		<Reference Include="Dalamud">
-			<HintPath>$(DalamudLibPath)Dalamud.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
-		<Reference Include="ImGui.NET">
-			<HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
+	<!--ItemGroup>
 		<Reference Include="ImGuiScene">
 			<HintPath>$(DalamudLibPath)ImGuiScene.dll</HintPath>
 			<Private>False</Private>
 		</Reference>
-		<Reference Include="Lumina">
-			<HintPath>$(DalamudLibPath)Lumina.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
-		<Reference Include="Lumina.Excel">
-			<HintPath>$(DalamudLibPath)Lumina.Excel.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
-		<Reference Include="FFXIVClientStructs">
-			<HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
-			<Private>False</Private>
-		</Reference>
 		<Reference Include="InteropGenerator.Runtime">
 			<HintPath>$(DalamudLibPath)InteropGenerator.Runtime.dll</HintPath>
 			<Private>False</Private>
 		</Reference>
-	</ItemGroup>
+	</ItemGroup-->
 
 	<ItemGroup>
 		<None Remove="dalamud.props" />
diff --git a/TinyCmds/packages.lock.json b/TinyCmds/packages.lock.json
@@ -4,9 +4,9 @@
     "net9.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[12.0.0, )",
-        "resolved": "12.0.0",
-        "contentHash": "J5TJLV3f16T/E2H2P17ClWjtfEBPpq3yxvqW46eN36JCm6wR+EaoaYkqG9Rm5sHqs3/nK/vKjWWyvEs/jhKoXw=="
+        "requested": "[13.0.0, )",
+        "resolved": "13.0.0",
+        "contentHash": "Mb3cUDSK/vDPQ8gQIeuCw03EMYrej1B4J44a1AvIJ9C759p9XeqdU9Hg4WgOmlnlPe0G7ILTD32PKSUpkQNa8w=="
       },
       "DotNet.ReproducibleBuilds": {
         "type": "Direct",
@@ -16,9 +16,9 @@
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
-        "requested": "[9.0.2, )",
-        "resolved": "9.0.2",
-        "contentHash": "+KFnCLVPicEq99ko0tq+ycTvNLXHw0tImmTZjPloB/DOFLPT56KLfk5aS7wbgXRPzYhXTTBYLGaABea5mke77w=="
+        "requested": "[9.0.7, )",
+        "resolved": "9.0.7",
+        "contentHash": "SZ1brSGoLnhLbE8QUZrtN6YwzN2gDT1wbx9qDBEfFFJcstiDTjJ6ygNuTPBV/K7SjGfx2YNbcJi5+ygbPOZpDg=="
       },
       "XivCommon": {
         "type": "Direct",

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ public class ClearMapFlag: PluginCommand {`
`15`	`15`	`protected override unsafe void Execute(string? command, string rawArguments, FlagMap flags, bool verbose, bool dryRun, ref bool showHelp) {`
`16`	`16`	`AgentMap* map = AgentMap.Instance();`
`17`	`17`	`Assert(map is not null, "failed to load AgentMap");`
`18`		`- map->IsFlagMarkerSet = false;`
	`18`	`+ map->FlagMarkerCount = 0;`
`19`	`19`	`}`
`20`	`20`	`}`