lozy360/CustomizeTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Switch to ECommonsLite

Browse Source
This commit is contained in:
RisaDev
2024-11-16 03:12:46 +03:00
parent 4112fece6d
commit 3bd80f3c33
14 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitmodules vendored
View File

@@ -14,7 +14,7 @@
path = submodules/Penumbra.String path = submodules/Penumbra.String
url = https://github.com/Ottermandias/Penumbra.String.git url = https://github.com/Ottermandias/Penumbra.String.git
branch = main branch = main
[submodule "submodules/ECommons"] [submodule "submodules/ECommonsLite"]
path = submodules/ECommons path = submodules/ECommonsLite
url = https://github.com/NightmareXIV/ECommons.git url = https://github.com/Aether-Tools/ECommonsLite.git
branch = master branch = main

20
CustomizePlus.sln
View File

@@ -22,7 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Penumbra.Api", "submodules\
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Penumbra.String", "submodules\Penumbra.String\Penumbra.String.csproj", "{CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Penumbra.String", "submodules\Penumbra.String\Penumbra.String.csproj", "{CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ECommons", "submodules\ECommons\ECommons\ECommons.csproj", "{0234819A-193E-4B75-A528-23E71C9FB1C8}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ECommonsLite", "submodules\ECommonsLite\ECommonsLite\ECommonsLite.csproj", "{41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -80,14 +80,14 @@ Global
{CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}.Release|Any CPU.Build.0 = Release|Any CPU {CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}.Release|Any CPU.Build.0 = Release|Any CPU
{CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}.Release|x64.ActiveCfg = Release|Any CPU {CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}.Release|x64.ActiveCfg = Release|Any CPU
{CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}.Release|x64.Build.0 = Release|Any CPU {CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}.Release|x64.Build.0 = Release|Any CPU
{0234819A-193E-4B75-A528-23E71C9FB1C8}.Debug|Any CPU.ActiveCfg = Debug|x64 {41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Debug|Any CPU.ActiveCfg = Debug|x64
{0234819A-193E-4B75-A528-23E71C9FB1C8}.Debug|Any CPU.Build.0 = Debug|x64 {41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Debug|Any CPU.Build.0 = Debug|x64
{0234819A-193E-4B75-A528-23E71C9FB1C8}.Debug|x64.ActiveCfg = Debug|x64 {41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Debug|x64.ActiveCfg = Debug|x64
{0234819A-193E-4B75-A528-23E71C9FB1C8}.Debug|x64.Build.0 = Debug|x64 {41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Debug|x64.Build.0 = Debug|x64
{0234819A-193E-4B75-A528-23E71C9FB1C8}.Release|Any CPU.ActiveCfg = Release|x64 {41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Release|Any CPU.ActiveCfg = Release|x64
{0234819A-193E-4B75-A528-23E71C9FB1C8}.Release|Any CPU.Build.0 = Release|x64 {41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Release|Any CPU.Build.0 = Release|x64
{0234819A-193E-4B75-A528-23E71C9FB1C8}.Release|x64.ActiveCfg = Release|x64 {41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Release|x64.ActiveCfg = Release|x64
{0234819A-193E-4B75-A528-23E71C9FB1C8}.Release|x64.Build.0 = Release|x64 {41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@@ -97,7 +97,7 @@ Global
{D79C8833-D241-4867-BF6F-8097E0ED8067} = {121C2200-A844-44FD-85C4-22D6C7E35553} {D79C8833-D241-4867-BF6F-8097E0ED8067} = {121C2200-A844-44FD-85C4-22D6C7E35553}
{CC460943-1E07-4FA0-8B8C-67F0EF385290} = {121C2200-A844-44FD-85C4-22D6C7E35553} {CC460943-1E07-4FA0-8B8C-67F0EF385290} = {121C2200-A844-44FD-85C4-22D6C7E35553}
{CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823} = {121C2200-A844-44FD-85C4-22D6C7E35553} {CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823} = {121C2200-A844-44FD-85C4-22D6C7E35553}
{0234819A-193E-4B75-A528-23E71C9FB1C8} = {121C2200-A844-44FD-85C4-22D6C7E35553} {41F4BB08-FCFD-420F-AD18-ED9D7FB3251C} = {121C2200-A844-44FD-85C4-22D6C7E35553}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B17E85B1-5F60-4440-9F9A-3DDE877E8CDF} SolutionGuid = {B17E85B1-5F60-4440-9F9A-3DDE877E8CDF}

2
CustomizePlus/Api/CustomizePlusIpc.GameState.cs
View File

@@ -1,5 +1,5 @@
using CustomizePlus.Api.Enums; using CustomizePlus.Api.Enums;
using ECommons.EzIpcManager; using ECommonsLite.EzIpcManager;
namespace CustomizePlus.Api; namespace CustomizePlus.Api;

2
CustomizePlus/Api/CustomizePlusIpc.General.cs
View File

@@ -1,4 +1,4 @@
using ECommons.EzIpcManager; using ECommonsLite.EzIpcManager;
namespace CustomizePlus.Api; namespace CustomizePlus.Api;

2
CustomizePlus/Api/CustomizePlusIpc.Profile.cs
View File

@@ -2,7 +2,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using ECommons.EzIpcManager; using ECommonsLite.EzIpcManager;
using Newtonsoft.Json; using Newtonsoft.Json;
using CustomizePlus.Api.Data; using CustomizePlus.Api.Data;
using CustomizePlus.Api.Enums; using CustomizePlus.Api.Enums;

2
CustomizePlus/Api/CustomizePlusIpc.cs
View File

@@ -5,7 +5,7 @@ using CustomizePlus.GameData.Services;
using CustomizePlus.Profiles; using CustomizePlus.Profiles;
using CustomizePlus.Profiles.Events; using CustomizePlus.Profiles.Events;
using Dalamud.Plugin; using Dalamud.Plugin;
using ECommons.EzIpcManager; using ECommonsLite.EzIpcManager;
using OtterGui.Log; using OtterGui.Log;
using System; using System;

2
CustomizePlus/Core/Services/CommandService.cs
View File

@@ -15,7 +15,7 @@ using CustomizePlus.Configuration.Data;
using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification;
using CustomizePlus.GameData.Extensions; using CustomizePlus.GameData.Extensions;
using System.Collections.Generic; using System.Collections.Generic;
using ECommons; using ECommonsLite;
using CustomizePlus.Core.Helpers; using CustomizePlus.Core.Helpers;
namespace CustomizePlus.Core.Services; namespace CustomizePlus.Core.Services;

2
CustomizePlus/CustomizePlus.csproj
View File

@@ -48,7 +48,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<ProjectReference Include="..\CustomizePlus.GameData\CustomizePlus.GameData.csproj" /> <ProjectReference Include="..\CustomizePlus.GameData\CustomizePlus.GameData.csproj" />
<ProjectReference Include="..\submodules\ECommons\ECommons\ECommons.csproj" /> <ProjectReference Include="..\submodules\ECommonsLite\ECommonsLite\ECommonsLite.csproj" />
<ProjectReference Include="..\submodules\OtterGui\OtterGui.csproj" /> <ProjectReference Include="..\submodules\OtterGui\OtterGui.csproj" />
<Reference Include="Newtonsoft.Json"> <Reference Include="Newtonsoft.Json">
<HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath> <HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>

6
CustomizePlus/Plugin.cs
View File

@@ -5,7 +5,7 @@ using CustomizePlus.Core.Helpers;
using CustomizePlus.Core.Services; using CustomizePlus.Core.Services;
using CustomizePlus.UI; using CustomizePlus.UI;
using Dalamud.Plugin; using Dalamud.Plugin;
using ECommons; using ECommonsLite;
using OtterGui.Log; using OtterGui.Log;
using OtterGui.Services; using OtterGui.Services;
using Penumbra.GameData.Actors; using Penumbra.GameData.Actors;
@@ -22,7 +22,7 @@ public sealed class Plugin : IDalamudPlugin
{ {
try try
{ {
ECommonsMain.Init(pluginInterface, this); ECommonsLiteMain.Init(pluginInterface, this);
_services = ServiceManagerBuilder.CreateProvider(pluginInterface, Logger); _services = ServiceManagerBuilder.CreateProvider(pluginInterface, Logger);
@@ -48,6 +48,6 @@ public sealed class Plugin : IDalamudPlugin
{ {
_services?.Dispose(); _services?.Dispose();
ECommonsMain.Dispose(); ECommonsLiteMain.Dispose();
} }
} }

4
CustomizePlus/UI/Windows/MainWindow/MainWindow.cs
View File

@@ -13,12 +13,12 @@ using CustomizePlus.UI.Windows.Controls;
using CustomizePlus.UI.Windows.MainWindow.Tabs.Profiles; using CustomizePlus.UI.Windows.MainWindow.Tabs.Profiles;
using CustomizePlus.UI.Windows.MainWindow.Tabs; using CustomizePlus.UI.Windows.MainWindow.Tabs;
using CustomizePlus.Templates; using CustomizePlus.Templates;
using ECommons.ImGuiMethods; using ECommonsLite.ImGuiMethods;
using static System.Windows.Forms.AxHost; using static System.Windows.Forms.AxHost;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using CustomizePlus.Templates.Events; using CustomizePlus.Templates.Events;
using CustomizePlus.Templates.Data; using CustomizePlus.Templates.Data;
using ECommons.Schedulers; using ECommonsLite.Schedulers;
using CustomizePlus.Core.Helpers; using CustomizePlus.Core.Helpers;
namespace CustomizePlus.UI.Windows.MainWindow; namespace CustomizePlus.UI.Windows.MainWindow;

2
CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/IPCTestTab.cs
View File

@@ -11,7 +11,7 @@ using CustomizePlus.Configuration.Helpers;
using CustomizePlus.Game.Services; using CustomizePlus.Game.Services;
using CustomizePlus.GameData.Services; using CustomizePlus.GameData.Services;
using Penumbra.GameData.Actors; using Penumbra.GameData.Actors;
using ECommons.EzIpcManager; using ECommonsLite.EzIpcManager;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;

2
CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatePanel.cs
View File

@@ -8,14 +8,12 @@ using System.Linq;
using System.Numerics; using System.Numerics;
using System.Windows.Forms; using System.Windows.Forms;
using CustomizePlus.Core.Data; using CustomizePlus.Core.Data;
using CustomizePlus.Game.Services;
using CustomizePlus.Templates; using CustomizePlus.Templates;
using CustomizePlus.Configuration.Data; using CustomizePlus.Configuration.Data;
using CustomizePlus.Core.Helpers; using CustomizePlus.Core.Helpers;
using CustomizePlus.Templates.Data; using CustomizePlus.Templates.Data;
using OtterGui.Log; using OtterGui.Log;
using CustomizePlus.Templates.Events; using CustomizePlus.Templates.Events;
using ECommons.Schedulers;
namespace CustomizePlus.UI.Windows.MainWindow.Tabs.Templates; namespace CustomizePlus.UI.Windows.MainWindow.Tabs.Templates;

1
submodules/ECommons

Submodule submodules/ECommons deleted from b7282bc11c

1
submodules/ECommonsLite Submodule

Submodule submodules/ECommonsLite added at b6f1f3d60a