API13

Author: VariableVixen

XIVComboVX/ChatUtil.cs

@@ -26,8 +26,8 @@ internal const ushort
 		ColourGlowOpenConfig = 37;
 
 	internal ChatUtil() {
-		this.openConfig = Service.Interface.AddChatLinkHandler(OpenConfigId, this.onClickChatLink);
-		this.openIssueTracker = Service.Interface.AddChatLinkHandler(OpenIssueTrackerId, this.onClickChatLink);
+		this.openConfig = Service.ChatGui.AddChatLinkHandler(OpenConfigId, this.onClickChatLink);
+		this.openIssueTracker = Service.ChatGui.AddChatLinkHandler(OpenIssueTrackerId, this.onClickChatLink);
 	}
 
 	internal void AddOpenConfigLink(SeStringBuilder sb, string label) {
@@ -85,7 +85,7 @@ public void Dispose() {
 			return;
 		this.disposed = true;
 
-		Service.Interface.RemoveChatLinkHandler();
+		Service.ChatGui.RemoveChatLinkHandler();
 	}
 
 	#endregion

XIVComboVX/Config/ComboDetailSetting.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Reflection;
 
-using ImGuiNET;
+using Dalamud.Bindings.ImGui;
 
 using VariableVixen.XIVComboVX.Attributes;
 

XIVComboVX/Config/ConfigWindow.cs

@@ -7,13 +7,12 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
+using Dalamud.Bindings.ImGui;
 using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Interface;
 using Dalamud.Interface.Windowing;
 using Dalamud.Utility;
 
-using ImGuiNET;
-
 using VariableVixen.XIVComboVX.Attributes;
 
 namespace VariableVixen.XIVComboVX.Config;
@@ -515,7 +514,7 @@ private void drawPreset(CustomComboPreset preset, CustomComboInfoAttribute info)
 						? ImGui.SliderScalar(
 							detail.Label + $"##{detail.Combo}",
 							detail.ImGuiType,
-							ptrVal,
+							ref ptrVal,
 							ptrMin,
 							ptrMax,
 							fmt,
@@ -524,7 +523,7 @@ private void drawPreset(CustomComboPreset preset, CustomComboInfoAttribute info)
 						: ImGui.InputScalar(
 							detail.Label + $"##{detail.Combo}",
 							detail.ImGuiType,
-							ptrVal,
+							ref ptrVal,
 							ptrStep,
 							ptrStep,
 							fmt,

XIVComboVX/GameData/GameState.cs

@@ -1,30 +1,27 @@
 using System;
 
+using Dalamud.Game.NativeWrapper;
+
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
 namespace VariableVixen.XIVComboVX.GameData;
 
 internal unsafe class GameState: IDisposable {
 	private bool disposed;
 
-	private AtkUnitBase* chatLogPointer;
+	private AtkUnitBasePtr chatLogPointer;
 
-	internal AtkUnitBase* ChatLog {
+	internal AtkUnitBasePtr ChatLog {
 		get {
 			if (Service.Client.LocalPlayer is null)
 				return null;
-			if (this.chatLogPointer is null)
-				this.chatLogPointer = (AtkUnitBase*)Service.GameGui.GetAddonByName("ChatLog", 1);
+			if (this.chatLogPointer.IsNull)
+				this.chatLogPointer = Service.GameGui.GetAddonByName("ChatLog", 1);
 			return this.chatLogPointer;
 		}
 	}
 
-	internal bool IsChatVisible {
-		get {
-			AtkUnitBase* cl = this.ChatLog;
-			return cl is not null && cl->IsVisible;
-		}
-	}
+	internal bool IsChatVisible => this.ChatLog.IsVisible;
 
 	#region Registration and cleanup
 

XIVComboVX/Plugin.cs

@@ -185,7 +185,7 @@ private void deferredInit() {
 		Service.Interface.ActivePluginsChanged += this.onActivePluginsChanged;
 	}
 
-	private void onActivePluginsChanged(PluginListInvalidationKind kind, bool affectedThisPlugin) => CheckForOtherComboPlugins();
+	private void onActivePluginsChanged(IActivePluginsChangedEventArgs e) => CheckForOtherComboPlugins();
 
 	public static int CheckForOtherComboPlugins() {
 		IExposedPlugin[] others = Service.Interface.InstalledPlugins

XIVComboVX/XIVComboVX.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>XIVComboVX</Product>
 		<Authors>VariableVixen, FrigidWalrus, attick, daemitus</Authors>

XIVComboVX/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" />

XIVComboVX/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",