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

1
CustomizePlus/Api/Compatibility/CustomizePlusLegacyIpc.cs
View File

@@ -21,6 +21,7 @@ using CustomizePlus.Core.Extensions;
using CustomizePlus.Armatures.Events;
using CustomizePlus.Armatures.Data;
using CustomizePlus.GameData.Extensions;
using Penumbra.GameData.Interop;
namespace CustomizePlus.Api.Compatibility;

27
CustomizePlus/Armatures/Services/ArmatureManager.cs
View File

@@ -1,26 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Dalamud.Plugin.Services;
using OtterGui.Log;
using OtterGui.Classes;
using Penumbra.GameData.Actors;
using System.Numerics;
using CustomizePlus.Core.Data;
using CustomizePlus.Armatures.Events;
using CustomizePlus.Armatures.Data;
using CustomizePlus.Armatures.Events;
using CustomizePlus.Core.Data;
using CustomizePlus.Core.Extensions;
using CustomizePlus.Game.Services;
using CustomizePlus.GameData.Extensions;
using CustomizePlus.GameData.Services;
using CustomizePlus.Profiles;
using CustomizePlus.Profiles.Data;
using CustomizePlus.Game.Services;
using CustomizePlus.Templates.Events;
using CustomizePlus.Profiles.Events;
using CustomizePlus.Core.Extensions;
using CustomizePlus.GameData.Data;
using CustomizePlus.GameData.Services;
using CustomizePlus.GameData.Extensions;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using System.Drawing;
using CustomizePlus.Templates.Events;
using Dalamud.Plugin.Services;
using OtterGui.Classes;
using OtterGui.Log;
using Penumbra.GameData.Actors;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Interop;
using ObjectManager = CustomizePlus.GameData.Services.ObjectManager;
namespace CustomizePlus.Armatures.Services;

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;

10
CustomizePlus/CustomizePlus.csproj
View File

@@ -13,7 +13,7 @@
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<Platforms>x64</Platforms>
<Nullable>enable</Nullable>
<LangVersion>preview</LangVersion>
@@ -24,12 +24,6 @@
<OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Util\**" />
<EmbeddedResource Remove="Util\**" />
<None Remove="Util\**" />
</ItemGroup>
<ItemGroup>
<Content Include="..\Data\icon.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -44,7 +38,7 @@
<ItemGroup>
<!--<PackageReference Include="DalamudPackager" Version="2.1.12" />-->
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

10
CustomizePlus/Game/Services/GameObjectService.cs
View File

@@ -1,11 +1,11 @@
using Dalamud.Plugin.Services;
using Penumbra.GameData.Actors;
using System.Collections.Generic;
using System.Collections.Generic;
using CustomizePlus.Core.Data;
using CustomizePlus.GameData.Data;
using CustomizePlus.GameData.Services;
using CustomizePlus.GameData.Extensions;
using Dalamud.Plugin.Services;
using Penumbra.GameData.Actors;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Interop;
using ObjectManager = CustomizePlus.GameData.Services.ObjectManager;
using DalamudGameObject = Dalamud.Game.ClientState.Objects.Types.GameObject;
namespace CustomizePlus.Game.Services;

6
CustomizePlus/Profiles/ProfileManager.cs
View File

@@ -22,8 +22,9 @@ using CustomizePlus.GameData.Data;
using CustomizePlus.GameData.Services;
using CustomizePlus.GameData.Extensions;
using CustomizePlus.Profiles.Enums;
using Penumbra.GameData.Enums;
using CustomizePlus.Profiles.Exceptions;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Interop;
namespace CustomizePlus.Profiles;
@@ -292,7 +293,7 @@ public class ProfileManager : IDisposable
_event.Invoke(ProfileChanged.Type.Toggled, profile, value);
}
}
public void SetEnabled(Guid guid, bool value)
{
var profile = Profiles.FirstOrDefault(x => x.UniqueId == guid && x.ProfileType == ProfileType.Normal);
@@ -303,7 +304,6 @@ public class ProfileManager : IDisposable
else
throw new ProfileNotFoundException();
}
public void SetLimitLookupToOwned(Profile profile, bool value)
{
if (profile.LimitLookupToOwnedObjects != value)

2
CustomizePlus/UI/Windows/Controls/TemplateCombo.cs
View File

@@ -30,7 +30,7 @@ public abstract class TemplateComboBase : FilterComboCache<Tuple<Template, strin
TemplateChanged templateChanged,
//TabSelected tabSelected,
PluginConfiguration configuration)
: base(generator, logger)
: base(generator, MouseWheelType.Control, logger)
{
_templateChanged = templateChanged;
//TabSelected = tabSelected;