From 17962a37b39345f4f1fae79f870880030898af17 Mon Sep 17 00:00:00 2001 From: SirConstance Date: Thu, 4 Sep 2025 22:54:55 +0200 Subject: [PATCH] Uodate 0.0.6 - Change reference and clean --- MareSynchronos/FileCache/FileCacheManager.cs | 5 +- MareSynchronos/Interop/Ipc/IpcCallerBrio.cs | 2 - .../Factories/PairHandlerFactory.cs | 53 ++++++++++++++----- MareSynchronos/Plugin.cs | 4 +- MareSynchronos/Services/ChatService.cs | 2 +- 5 files changed, 43 insertions(+), 23 deletions(-) diff --git a/MareSynchronos/FileCache/FileCacheManager.cs b/MareSynchronos/FileCache/FileCacheManager.cs index 0c3b1ab..a5a595c 100644 --- a/MareSynchronos/FileCache/FileCacheManager.cs +++ b/MareSynchronos/FileCache/FileCacheManager.cs @@ -236,7 +236,6 @@ public sealed class FileCacheManager : IHostedService foreach (var entry in cleanedPaths) { - //_logger.LogDebug("Checking {path}", entry.Value); if (dict.TryGetValue(entry.Value, out var entity)) { @@ -366,8 +365,7 @@ public sealed class FileCacheManager : IHostedService if (!entries.Exists(u => string.Equals(u.PrefixedFilePath, fileCache.PrefixedFilePath, StringComparison.OrdinalIgnoreCase))) { - //_logger.LogTrace("Adding to DB: {hash} => {path}", fileCache.Hash, fileCache.PrefixedFilePath); - entries.Add(fileCache); + entries.Add(fileCache); } } @@ -389,7 +387,6 @@ public sealed class FileCacheManager : IHostedService private FileCacheEntity? GetValidatedFileCache(FileCacheEntity fileCache) { var resultingFileCache = ReplacePathPrefixes(fileCache); - //_logger.LogTrace("Validating {path}", fileCache.PrefixedFilePath); resultingFileCache = Validate(resultingFileCache); return resultingFileCache; } diff --git a/MareSynchronos/Interop/Ipc/IpcCallerBrio.cs b/MareSynchronos/Interop/Ipc/IpcCallerBrio.cs index b8a9c58..635787c 100644 --- a/MareSynchronos/Interop/Ipc/IpcCallerBrio.cs +++ b/MareSynchronos/Interop/Ipc/IpcCallerBrio.cs @@ -95,8 +95,6 @@ public sealed class IpcCallerBrio : IIpcCaller if (gameObject == null) return default; var data = await _dalamudUtilService.RunOnFrameworkThread(() => _brioGetModelTransform.InvokeFunc(gameObject)).ConfigureAwait(false); if (data.Item1 == null || data.Item2 == null || data.Item3 == null) return default; - //_logger.LogDebug("Getting Transform from Actor {actor}", gameObject.Name.TextValue); - return new WorldData() { PositionX = data.Item1.Value.X, diff --git a/MareSynchronos/PlayerData/Factories/PairHandlerFactory.cs b/MareSynchronos/PlayerData/Factories/PairHandlerFactory.cs index ad56370..0fadae8 100644 --- a/MareSynchronos/PlayerData/Factories/PairHandlerFactory.cs +++ b/MareSynchronos/PlayerData/Factories/PairHandlerFactory.cs @@ -1,33 +1,60 @@ -using MareSynchronos.API.Data; -using MareSynchronos.API.Dto.Group; +using MareSynchronos.FileCache; +using MareSynchronos.Interop.Ipc; using MareSynchronos.MareConfiguration; +using MareSynchronos.PlayerData.Handlers; using MareSynchronos.PlayerData.Pairs; +using MareSynchronos.Services; using MareSynchronos.Services.Mediator; using MareSynchronos.Services.ServerConfiguration; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; namespace MareSynchronos.PlayerData.Factories; -public class PairFactory +public class PairHandlerFactory { - private readonly PairHandlerFactory _cachedPlayerFactory; + private readonly MareConfigService _configService; + private readonly DalamudUtilService _dalamudUtilService; + private readonly FileCacheManager _fileCacheManager; + private readonly FileDownloadManagerFactory _fileDownloadManagerFactory; + private readonly GameObjectHandlerFactory _gameObjectHandlerFactory; + private readonly IHostApplicationLifetime _hostApplicationLifetime; + private readonly IpcManager _ipcManager; private readonly ILoggerFactory _loggerFactory; private readonly MareMediator _mareMediator; - private readonly MareConfigService _mareConfig; - private readonly ServerConfigurationManager _serverConfigurationManager; + private readonly PlayerPerformanceService _playerPerformanceService; + private readonly ServerConfigurationManager _serverConfigManager; + private readonly PluginWarningNotificationService _pluginWarningNotificationManager; + private readonly PairAnalyzerFactory _pairAnalyzerFactory; + private readonly VisibilityService _visibilityService; - public PairFactory(ILoggerFactory loggerFactory, PairHandlerFactory cachedPlayerFactory, - MareMediator mareMediator, MareConfigService mareConfig, ServerConfigurationManager serverConfigurationManager) + public PairHandlerFactory(ILoggerFactory loggerFactory, GameObjectHandlerFactory gameObjectHandlerFactory, IpcManager ipcManager, + FileDownloadManagerFactory fileDownloadManagerFactory, DalamudUtilService dalamudUtilService, + PluginWarningNotificationService pluginWarningNotificationManager, IHostApplicationLifetime hostApplicationLifetime, + FileCacheManager fileCacheManager, MareMediator mareMediator, PlayerPerformanceService playerPerformanceService, + ServerConfigurationManager serverConfigManager, PairAnalyzerFactory pairAnalyzerFactory, + MareConfigService configService, VisibilityService visibilityService) { _loggerFactory = loggerFactory; - _cachedPlayerFactory = cachedPlayerFactory; + _gameObjectHandlerFactory = gameObjectHandlerFactory; + _ipcManager = ipcManager; + _fileDownloadManagerFactory = fileDownloadManagerFactory; + _dalamudUtilService = dalamudUtilService; + _pluginWarningNotificationManager = pluginWarningNotificationManager; + _hostApplicationLifetime = hostApplicationLifetime; + _fileCacheManager = fileCacheManager; _mareMediator = mareMediator; - _mareConfig = mareConfig; - _serverConfigurationManager = serverConfigurationManager; + _playerPerformanceService = playerPerformanceService; + _serverConfigManager = serverConfigManager; + _pairAnalyzerFactory = pairAnalyzerFactory; + _configService = configService; + _visibilityService = visibilityService; } - public Pair Create(UserData userData) + public PairHandler Create(Pair pair) { - return new Pair(_loggerFactory.CreateLogger(), userData, _cachedPlayerFactory, _mareMediator, _mareConfig, _serverConfigurationManager); + return new PairHandler(_loggerFactory.CreateLogger(), pair, _pairAnalyzerFactory.Create(pair), _gameObjectHandlerFactory, + _ipcManager, _fileDownloadManagerFactory.Create(), _pluginWarningNotificationManager, _dalamudUtilService, _hostApplicationLifetime, + _fileCacheManager, _mareMediator, _playerPerformanceService, _serverConfigManager, _configService, _visibilityService); } } \ No newline at end of file diff --git a/MareSynchronos/Plugin.cs b/MareSynchronos/Plugin.cs index a2486a1..799c9fd 100644 --- a/MareSynchronos/Plugin.cs +++ b/MareSynchronos/Plugin.cs @@ -29,7 +29,7 @@ using MareSynchronos.Services.CharaData; using MareSynchronos; -namespace Snowcloak; +namespace Umbra; public sealed class Plugin : IDalamudPlugin { @@ -39,8 +39,6 @@ public sealed class Plugin : IDalamudPlugin public static Plugin Self; #pragma warning restore CA2211, CS8618, MA0069, S1104, S2223 public Action? RealOnFrameworkUpdate { get; set; } - - // Proxy function in the SnowcloakSync namespace to avoid confusion in /xlstats public void OnFrameworkUpdate(IFramework framework) { RealOnFrameworkUpdate?.Invoke(framework); diff --git a/MareSynchronos/Services/ChatService.cs b/MareSynchronos/Services/ChatService.cs index d6330ec..1cf25f1 100644 --- a/MareSynchronos/Services/ChatService.cs +++ b/MareSynchronos/Services/ChatService.cs @@ -72,7 +72,7 @@ public class ChatService : DisposableMediatorSubscriberBase { var chatMsg = message.ChatMsg; var prefix = new SeStringBuilder(); - prefix.AddText("[SnowChat] "); + prefix.AddText("[UmbraChat] "); _chatGui.Print(new XivChatEntry{ MessageBytes = [..prefix.Build().Encode(), ..message.ChatMsg.PayloadContent], Name = chatMsg.SenderName,