diff --git a/.gitmodules b/.gitmodules index 8f68facc7..e8e1845c8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ECommons"] path = ECommons - url = https://github.com/NightmareXIV/ECommons.git \ No newline at end of file + url = https://github.com/NightmareXIV/ECommons.git diff --git a/Directory.Build.props b/Directory.Build.props index 958c6294a..4d99d8d92 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -40,18 +40,9 @@ - - - - - - - - - diff --git a/ECommons b/ECommons new file mode 160000 index 000000000..ce974d0f1 --- /dev/null +++ b/ECommons @@ -0,0 +1 @@ +Subproject commit ce974d0f1c80b27895e8ec986f02cc30634801df diff --git a/RotationSolver.Basic/RotationSolver.Basic.csproj b/RotationSolver.Basic/RotationSolver.Basic.csproj index 68cca7efa..57010e059 100644 --- a/RotationSolver.Basic/RotationSolver.Basic.csproj +++ b/RotationSolver.Basic/RotationSolver.Basic.csproj @@ -24,6 +24,16 @@ + + + + + + + + + + True @@ -37,5 +47,6 @@ True \ + diff --git a/RotationSolver.sln b/RotationSolver.sln index 430d1dd9b..5d1f1b240 100644 --- 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 index 4ad6ceea9..e3d6d503c 100644 --- a/RotationSolver/RotationSolver.csproj +++ b/RotationSolver/RotationSolver.csproj @@ -12,5 +12,16 @@ + + + + + + + + + + + diff --git a/RotationSolver/RotationSolverPlugin.cs b/RotationSolver/RotationSolverPlugin.cs index 9751096ae..d08b3a963 100644 --- 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(); + ECommonsMain.Init(pluginInterface, this, ECommons.Module.SplatoonAPI); + try { Service.Config = JsonConvert.DeserializeObject(