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

Merge remote-tracking branch 'origin/main' into ipc_new

Browse Source 
# Conflicts:
#	CustomizePlus/Core/ServiceManagerBuilder.cs
#	CustomizePlus/Game/Services/GameObjectService.cs
#	CustomizePlus/Profiles/ProfileManager.cs
This commit is contained in:
RisaDev
2024-03-21 23:18:58 +03:00
parent 589d1075b4 7195d5a0c5
commit 4c94667989
21 changed files with 69 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CustomizePlus/Core/ServiceManagerBuilder.cs
View File

@@ -33,6 +33,7 @@ using Penumbra.GameData.Actors;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
using OtterGui;
using OtterGui.Raii;
using CustomizePlus.Api;
namespace CustomizePlus.Core;
@@ -62,7 +63,7 @@ public static class ServiceManagerBuilder
services.AddIServices(typeof(EquipItem).Assembly);
services.AddIServices(typeof(Plugin).Assembly);
services.AddIServices(typeof(ObjectManager).Assembly);
services.AddIServices(typeof(ImGuiUtil).Assembly);
services.AddIServices(typeof(ImRaii).Assembly);
services.CreateProvider();
@@ -148,7 +149,7 @@ public static class ServiceManagerBuilder
{
services
.AddSingleton<PoseFileBoneLoader>()
.AddSingleton<CustomizePlusLegacyIpc>()
.AddSingleton<CustomizePlusLegacyIpc>()
.AddSingleton<CustomizePlusIpc>();
return services;

4
CustomizePlus/Core/Services/DalamudServices.cs
View File

@@ -25,6 +25,8 @@ public class DalamudServices
.AddDalamudService<IKeyState>(pi)
.AddDalamudService<IDataManager>(pi)
.AddDalamudService<IPluginLog>(pi)
.AddDalamudService<ITargetManager>(pi);
.AddDalamudService<ITargetManager>(pi)
.AddDalamudService<INotificationManager>(pi)
.AddDalamudService<IContextMenu>(pi);
}
}

1
CustomizePlus/Core/Services/HookingService.cs
View File

@@ -10,6 +10,7 @@ using CustomizePlus.Configuration.Data;
using CustomizePlus.Profiles;
using CustomizePlus.Armatures.Services;
using CustomizePlus.GameData.Data;
using Penumbra.GameData.Interop;
namespace CustomizePlus.Core.Services;