fix: add ECommons real!

ArchiDog1998 · May 17, 2023 · 3ead70c · 3ead70c
1 parent ab6739f
commit 3ead70c
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "ECommons"]
 	path = ECommons
-	url = https://github.com/NightmareXIV/ECommons.git
+	url = https://github.com/NightmareXIV/ECommons.git
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -40,18 +40,9 @@
 		</Reference>
 
 		<Using Include="Dalamud.Game.ClientState.JobGauge.Enums" />
-		<Using Include="Dalamud.Game.ClientState.Objects.Types" />
 		<Using Include="Dalamud.Interface" />
 		<Using Include="ImGuiNET" />
 		<Using Include="Newtonsoft.Json" />
-		<Using Include="RotationSolver.Basic" />
-		<Using Include="RotationSolver.Basic.Actions" />
-		<Using Include="RotationSolver.Basic.Attributes" />
-		<Using Include="RotationSolver.Basic.Configuration.RotationConfig" />
-		<Using Include="RotationSolver.Basic.Data" />
-		<Using Include="RotationSolver.Basic.Helpers" />
-		<Using Include="RotationSolver.Basic.Rotations" />
-		<Using Include="RotationSolver.Basic.Rotations.Basic" />
 		<Using Include="System.Numerics" />
 		<Using Include="System.Reflection" />
     </ItemGroup>

diff --git a/ECommons b/ECommons
diff --git a/RotationSolver.Basic/RotationSolver.Basic.csproj b/RotationSolver.Basic/RotationSolver.Basic.csproj
@@ -24,6 +24,16 @@
 	  <Using Include="System.ComponentModel" />
 	  <Using Include="Dalamud.Game.ClientState.JobGauge.Types" />
 
+	  <Using Include="Dalamud.Game.ClientState.Objects.Types" />
+
+	  <Using Include="RotationSolver.Basic" />
+	  <Using Include="RotationSolver.Basic.Actions" />
+	  <Using Include="RotationSolver.Basic.Attributes" />
+	  <Using Include="RotationSolver.Basic.Configuration.RotationConfig" />
+	  <Using Include="RotationSolver.Basic.Data" />
+	  <Using Include="RotationSolver.Basic.Helpers" />
+	  <Using Include="RotationSolver.Basic.Rotations" />
+	  <Using Include="RotationSolver.Basic.Rotations.Basic" />
 
 	  <None Include="..\COPYING.LESSER">
 		<Pack>True</Pack>
@@ -37,5 +47,6 @@
 		<Pack>True</Pack>
 		<PackagePath>\</PackagePath>
 	  </None>
+
   </ItemGroup>
 </Project>
diff --git a/RotationSolver.sln b/RotationSolver.sln
@@ -17,20 +17,40 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RotationSolver.Basic", "Rot
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RotationSolver", "RotationSolver\RotationSolver.csproj", "{99EA3D95-33DC-424F-A9E6-FE6064F11592}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ECommons", "ECommons\ECommons\ECommons.csproj", "{8EEA92E7-5D31-47AE-868A-0DCB96BAD31B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{140CC27C-0923-4183-9C30-26A7BDEBE606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{140CC27C-0923-4183-9C30-26A7BDEBE606}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{140CC27C-0923-4183-9C30-26A7BDEBE606}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{140CC27C-0923-4183-9C30-26A7BDEBE606}.Debug|x64.Build.0 = Debug|Any CPU
 		{140CC27C-0923-4183-9C30-26A7BDEBE606}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{140CC27C-0923-4183-9C30-26A7BDEBE606}.Release|Any CPU.Build.0 = Release|Any CPU
+		{140CC27C-0923-4183-9C30-26A7BDEBE606}.Release|x64.ActiveCfg = Release|Any CPU
+		{140CC27C-0923-4183-9C30-26A7BDEBE606}.Release|x64.Build.0 = Release|Any CPU
 		{99EA3D95-33DC-424F-A9E6-FE6064F11592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{99EA3D95-33DC-424F-A9E6-FE6064F11592}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99EA3D95-33DC-424F-A9E6-FE6064F11592}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{99EA3D95-33DC-424F-A9E6-FE6064F11592}.Debug|x64.Build.0 = Debug|Any CPU
 		{99EA3D95-33DC-424F-A9E6-FE6064F11592}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99EA3D95-33DC-424F-A9E6-FE6064F11592}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99EA3D95-33DC-424F-A9E6-FE6064F11592}.Release|x64.ActiveCfg = Release|Any CPU
+		{99EA3D95-33DC-424F-A9E6-FE6064F11592}.Release|x64.Build.0 = Release|Any CPU
+		{8EEA92E7-5D31-47AE-868A-0DCB96BAD31B}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{8EEA92E7-5D31-47AE-868A-0DCB96BAD31B}.Debug|Any CPU.Build.0 = Debug|x64
+		{8EEA92E7-5D31-47AE-868A-0DCB96BAD31B}.Debug|x64.ActiveCfg = Debug|x64
+		{8EEA92E7-5D31-47AE-868A-0DCB96BAD31B}.Debug|x64.Build.0 = Debug|x64
+		{8EEA92E7-5D31-47AE-868A-0DCB96BAD31B}.Release|Any CPU.ActiveCfg = Release|x64
+		{8EEA92E7-5D31-47AE-868A-0DCB96BAD31B}.Release|Any CPU.Build.0 = Release|x64
+		{8EEA92E7-5D31-47AE-868A-0DCB96BAD31B}.Release|x64.ActiveCfg = Release|x64
+		{8EEA92E7-5D31-47AE-868A-0DCB96BAD31B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/RotationSolver/RotationSolver.csproj b/RotationSolver/RotationSolver.csproj
@@ -12,5 +12,16 @@
 		<ProjectReference Include="..\RotationSolver.Basic\RotationSolver.Basic.csproj" />
 		<ProjectReference Include="..\ECommons\ECommons\ECommons.csproj" />
 		<EmbeddedResource Include="Localization\*.json" Exclude="Localization\Localization.json" />
+
+		<Using Include="Dalamud.Game.ClientState.Objects.Types" />
+
+		<Using Include="RotationSolver.Basic" />
+		<Using Include="RotationSolver.Basic.Actions" />
+		<Using Include="RotationSolver.Basic.Attributes" />
+		<Using Include="RotationSolver.Basic.Configuration.RotationConfig" />
+		<Using Include="RotationSolver.Basic.Data" />
+		<Using Include="RotationSolver.Basic.Helpers" />
+		<Using Include="RotationSolver.Basic.Rotations" />
+		<Using Include="RotationSolver.Basic.Rotations.Basic" />
 	</ItemGroup>
 </Project>
diff --git a/RotationSolver/RotationSolverPlugin.cs b/RotationSolver/RotationSolverPlugin.cs
@@ -1,7 +1,9 @@
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Interface.Windowing;
+using Dalamud.Logging;
 using Dalamud.Plugin;
+using ECommons;
 using RotationSolver.Basic.Configuration;
 using RotationSolver.Commands;
 using RotationSolver.Localization;
@@ -27,6 +29,8 @@ public unsafe RotationSolverPlugin(DalamudPluginInterface pluginInterface)
     {
         pluginInterface.Create<Service>();
 
+        ECommonsMain.Init(pluginInterface, this, ECommons.Module.SplatoonAPI);
+
         try
         {
             Service.Config = JsonConvert.DeserializeObject<PluginConfiguration>(