From 3138d6fc5f907a233d19d18f1d1f914dfe292f0a Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Wed, 1 Nov 2023 10:25:08 +0100
Subject: [PATCH] Use AutoRetainerAPI as submodule

---
 .gitmodules                  |  6 ++++++
 ARControl.sln                | 12 ++++++++++++
 ARControl/ARControl.csproj   | 10 ++--------
 ARControl/packages.lock.json |  9 +++++++++
 AutoRetainerAPI              |  1 +
 ECommons                     |  1 +
 6 files changed, 31 insertions(+), 8 deletions(-)
 create mode 160000 AutoRetainerAPI
 create mode 160000 ECommons

diff --git a/.gitmodules b/.gitmodules
index 4ac68e0..c62c119 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "LLib"]
 	path = LLib
 	url = https://git.carvel.li/liza/LLib.git
+[submodule "AutoRetainerAPI"]
+	path = AutoRetainerAPI
+	url = https://github.com/PunishXIV/AutoRetainerAPI.git
+[submodule "ECommons"]
+	path = ECommons
+	url = https://github.com/NightmareXIV/ECommons.git
diff --git a/ARControl.sln b/ARControl.sln
index ea815c0..49e6a13 100644
--- a/ARControl.sln
+++ b/ARControl.sln
@@ -4,6 +4,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ARControl", "ARControl\ARCo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "LLib\LLib.csproj", "{C00249D7-E550-4A3F-937B-D938D1D46B8A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRetainerAPI", "AutoRetainerAPI\AutoRetainerAPI\AutoRetainerAPI.csproj", "{325D077C-A47F-41D7-AA63-0FD3B4037C0B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ECommons", "ECommons\ECommons\ECommons.csproj", "{A3EDB8A3-1BB0-4E1A-A957-6F60D4C85290}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -18,5 +22,13 @@ Global
 		{C00249D7-E550-4A3F-937B-D938D1D46B8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C00249D7-E550-4A3F-937B-D938D1D46B8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C00249D7-E550-4A3F-937B-D938D1D46B8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{325D077C-A47F-41D7-AA63-0FD3B4037C0B}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{325D077C-A47F-41D7-AA63-0FD3B4037C0B}.Debug|Any CPU.Build.0 = Debug|x64
+		{325D077C-A47F-41D7-AA63-0FD3B4037C0B}.Release|Any CPU.ActiveCfg = Release|x64
+		{325D077C-A47F-41D7-AA63-0FD3B4037C0B}.Release|Any CPU.Build.0 = Release|x64
+		{A3EDB8A3-1BB0-4E1A-A957-6F60D4C85290}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{A3EDB8A3-1BB0-4E1A-A957-6F60D4C85290}.Debug|Any CPU.Build.0 = Debug|x64
+		{A3EDB8A3-1BB0-4E1A-A957-6F60D4C85290}.Release|Any CPU.ActiveCfg = Release|x64
+		{A3EDB8A3-1BB0-4E1A-A957-6F60D4C85290}.Release|Any CPU.Build.0 = Release|x64
 	EndGlobalSection
 EndGlobal
diff --git a/ARControl/ARControl.csproj b/ARControl/ARControl.csproj
index 55d53c1..1de0034 100644
--- a/ARControl/ARControl.csproj
+++ b/ARControl/ARControl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net7.0-windows</TargetFramework>
-        <Version>2.5</Version>
+        <Version>2.6</Version>
         <LangVersion>11.0</LangVersion>
         <Nullable>enable</Nullable>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -16,7 +16,6 @@
 
     <PropertyGroup>
         <DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
-        <AutoRetainerLibPath>$(appdata)\XIVLauncher\installedPlugins\AutoRetainer\4.2.1.2\</AutoRetainerLibPath>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
@@ -24,6 +23,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\AutoRetainerAPI\AutoRetainerAPI\AutoRetainerAPI.csproj" />
         <ProjectReference Include="..\LLib\LLib.csproj"/>
     </ItemGroup>
 
@@ -56,12 +56,6 @@
             <HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
             <Private>false</Private>
         </Reference>
-        <Reference Include="AutoRetainerAPI">
-            <HintPath>$(AutoRetainerLibPath)AutoRetainerAPI.dll</HintPath>
-        </Reference>
-        <Reference Include="ECommons">
-            <HintPath>$(AutoRetainerLibPath)ECommons.dll</HintPath>
-        </Reference>
     </ItemGroup>
 
 
diff --git a/ARControl/packages.lock.json b/ARControl/packages.lock.json
index 784f99f..19646a7 100644
--- a/ARControl/packages.lock.json
+++ b/ARControl/packages.lock.json
@@ -8,6 +8,15 @@
         "resolved": "2.1.12",
         "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
       },
+      "autoretainerapi": {
+        "type": "Project",
+        "dependencies": {
+          "ECommons": "[2.1.0.1, )"
+        }
+      },
+      "ecommons": {
+        "type": "Project"
+      },
       "llib": {
         "type": "Project"
       }
diff --git a/AutoRetainerAPI b/AutoRetainerAPI
new file mode 160000
index 0000000..7cb5477
--- /dev/null
+++ b/AutoRetainerAPI
@@ -0,0 +1 @@
+Subproject commit 7cb54772e3a4a60ad02520e898d1ed0e82b2a751
diff --git a/ECommons b/ECommons
new file mode 160000
index 0000000..f1c688a
--- /dev/null
+++ b/ECommons
@@ -0,0 +1 @@
+Subproject commit f1c688a0599b41d70230021328a575da7351cf91