DI: Update namespaces
parent
8d17c02186
commit
26b3a54ebd
|
@ -16,6 +16,7 @@ using Pal.Client.Configuration;
|
||||||
using Pal.Client.Configuration.Legacy;
|
using Pal.Client.Configuration.Legacy;
|
||||||
using Pal.Client.Database;
|
using Pal.Client.Database;
|
||||||
using Pal.Client.DependencyInjection;
|
using Pal.Client.DependencyInjection;
|
||||||
|
using Pal.Client.Floors;
|
||||||
using Pal.Client.Windows;
|
using Pal.Client.Windows;
|
||||||
|
|
||||||
namespace Pal.Client
|
namespace Pal.Client
|
||||||
|
@ -61,7 +62,7 @@ namespace Pal.Client
|
||||||
_serviceProvider.GetRequiredService<AgreementWindow>();
|
_serviceProvider.GetRequiredService<AgreementWindow>();
|
||||||
|
|
||||||
// initialize components that are mostly self-contained/self-registered
|
// initialize components that are mostly self-contained/self-registered
|
||||||
_serviceProvider.GetRequiredService<Hooks>();
|
_serviceProvider.GetRequiredService<GameHooks>();
|
||||||
_serviceProvider.GetRequiredService<FrameworkService>();
|
_serviceProvider.GetRequiredService<FrameworkService>();
|
||||||
_serviceProvider.GetRequiredService<ChatService>();
|
_serviceProvider.GetRequiredService<ChatService>();
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@ using Dalamud.Game.Text;
|
||||||
using Dalamud.Game.Text.SeStringHandling;
|
using Dalamud.Game.Text.SeStringHandling;
|
||||||
using Lumina.Excel.GeneratedSheets;
|
using Lumina.Excel.GeneratedSheets;
|
||||||
using Pal.Client.Configuration;
|
using Pal.Client.Configuration;
|
||||||
|
using Pal.Client.Floors;
|
||||||
|
|
||||||
namespace Pal.Client.DependencyInjection
|
namespace Pal.Client.DependencyInjection
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
using Dalamud.Game.ClientState.Objects.Types;
|
using System;
|
||||||
|
using System.Text;
|
||||||
|
using Dalamud.Game.ClientState.Objects;
|
||||||
|
using Dalamud.Game.ClientState.Objects.Types;
|
||||||
using Dalamud.Hooking;
|
using Dalamud.Hooking;
|
||||||
using Dalamud.Memory;
|
using Dalamud.Memory;
|
||||||
using Dalamud.Utility.Signatures;
|
using Dalamud.Utility.Signatures;
|
||||||
using System;
|
|
||||||
using System.Text;
|
|
||||||
using Dalamud.Game.ClientState.Objects;
|
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Pal.Client.DependencyInjection;
|
using Pal.Client.Floors;
|
||||||
|
|
||||||
namespace Pal.Client
|
namespace Pal.Client.DependencyInjection
|
||||||
{
|
{
|
||||||
internal sealed unsafe class Hooks : IDisposable
|
internal sealed unsafe class GameHooks : IDisposable
|
||||||
{
|
{
|
||||||
private readonly ILogger<Hooks> _logger;
|
private readonly ILogger<GameHooks> _logger;
|
||||||
private readonly ObjectTable _objectTable;
|
private readonly ObjectTable _objectTable;
|
||||||
private readonly TerritoryState _territoryState;
|
private readonly TerritoryState _territoryState;
|
||||||
private readonly FrameworkService _frameworkService;
|
private readonly FrameworkService _frameworkService;
|
||||||
|
@ -24,7 +24,7 @@ namespace Pal.Client
|
||||||
private Hook<ActorVfxCreateDelegate> ActorVfxCreateHook { get; init; } = null!;
|
private Hook<ActorVfxCreateDelegate> ActorVfxCreateHook { get; init; } = null!;
|
||||||
#pragma warning restore CS0649
|
#pragma warning restore CS0649
|
||||||
|
|
||||||
public Hooks(ILogger<Hooks> logger, ObjectTable objectTable, TerritoryState territoryState, FrameworkService frameworkService)
|
public GameHooks(ILogger<GameHooks> logger, ObjectTable objectTable, TerritoryState territoryState, FrameworkService frameworkService)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_objectTable = objectTable;
|
_objectTable = objectTable;
|
|
@ -105,7 +105,7 @@ namespace Pal.Client
|
||||||
// plugin-specific
|
// plugin-specific
|
||||||
_serviceCollection.AddScoped<DependencyContextInitializer>();
|
_serviceCollection.AddScoped<DependencyContextInitializer>();
|
||||||
_serviceCollection.AddScoped<DebugState>();
|
_serviceCollection.AddScoped<DebugState>();
|
||||||
_serviceCollection.AddScoped<Hooks>();
|
_serviceCollection.AddScoped<GameHooks>();
|
||||||
_serviceCollection.AddScoped<RemoteApi>();
|
_serviceCollection.AddScoped<RemoteApi>();
|
||||||
_serviceCollection.AddScoped<ConfigurationManager>();
|
_serviceCollection.AddScoped<ConfigurationManager>();
|
||||||
_serviceCollection.AddScoped<IPalacePalConfiguration>(sp =>
|
_serviceCollection.AddScoped<IPalacePalConfiguration>(sp =>
|
||||||
|
|
|
@ -2,27 +2,23 @@
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Numerics;
|
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Dalamud.Game;
|
using Dalamud.Game;
|
||||||
using Dalamud.Game.ClientState;
|
using Dalamud.Game.ClientState;
|
||||||
using Dalamud.Game.ClientState.Objects;
|
using Dalamud.Game.ClientState.Objects;
|
||||||
using Dalamud.Game.ClientState.Objects.Types;
|
using Dalamud.Game.ClientState.Objects.Types;
|
||||||
using Dalamud.Logging;
|
|
||||||
using ImGuiNET;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Pal.Client.Configuration;
|
using Pal.Client.Configuration;
|
||||||
using Pal.Client.Database;
|
using Pal.Client.Database;
|
||||||
using Pal.Client.Extensions;
|
using Pal.Client.DependencyInjection;
|
||||||
using Pal.Client.Floors;
|
|
||||||
using Pal.Client.Net;
|
using Pal.Client.Net;
|
||||||
using Pal.Client.Rendering;
|
using Pal.Client.Rendering;
|
||||||
using Pal.Client.Scheduled;
|
using Pal.Client.Scheduled;
|
||||||
using Pal.Common;
|
using Pal.Common;
|
||||||
|
|
||||||
namespace Pal.Client.DependencyInjection
|
namespace Pal.Client.Floors
|
||||||
{
|
{
|
||||||
internal sealed class FrameworkService : IDisposable
|
internal sealed class FrameworkService : IDisposable
|
||||||
{
|
{
|
|
@ -1,9 +1,8 @@
|
||||||
using Dalamud.Game.ClientState;
|
using Dalamud.Game.ClientState;
|
||||||
using Dalamud.Game.ClientState.Conditions;
|
using Dalamud.Game.ClientState.Conditions;
|
||||||
using Pal.Client.Scheduled;
|
|
||||||
using Pal.Common;
|
using Pal.Common;
|
||||||
|
|
||||||
namespace Pal.Client.DependencyInjection
|
namespace Pal.Client.Floors
|
||||||
{
|
{
|
||||||
public sealed class TerritoryState
|
public sealed class TerritoryState
|
||||||
{
|
{
|
Loading…
Reference in New Issue