revert 6101686a33

revert Add PenumbraAPI & GlamourerAPI + Update API & Connector

MareSynchronos/PlayerData/Factories/PairHandlerFactory.cs

@@ -27,13 +27,14 @@ public class PairHandlerFactory
     private readonly PluginWarningNotificationService _pluginWarningNotificationManager;
     private readonly PairAnalyzerFactory _pairAnalyzerFactory;
     private readonly VisibilityService _visibilityService;
+    private readonly NoSnapService _noSnapService;
 
     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)
+        MareConfigService configService, VisibilityService visibilityService, NoSnapService noSnapService)
     {
         _loggerFactory = loggerFactory;
         _gameObjectHandlerFactory = gameObjectHandlerFactory;
@@ -49,12 +50,13 @@ public class PairHandlerFactory
         _pairAnalyzerFactory = pairAnalyzerFactory;
         _configService = configService;
         _visibilityService = visibilityService;
+        _noSnapService = noSnapService;
     }
 
     public PairHandler Create(Pair pair)
     {
         return new PairHandler(_loggerFactory.CreateLogger<PairHandler>(), pair, _pairAnalyzerFactory.Create(pair), _gameObjectHandlerFactory,
             _ipcManager, _fileDownloadManagerFactory.Create(), _pluginWarningNotificationManager, _dalamudUtilService, _hostApplicationLifetime,
-            _fileCacheManager, _mareMediator, _playerPerformanceService, _serverConfigManager, _configService, _visibilityService);
+            _fileCacheManager, _mareMediator, _playerPerformanceService, _serverConfigManager, _configService, _visibilityService, _noSnapService);
     }
 }

MareSynchronos/PlayerData/Handlers/PairHandler.cs

@@ -32,6 +32,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
     private readonly ServerConfigurationManager _serverConfigManager;
     private readonly PluginWarningNotificationService _pluginWarningNotificationManager;
     private readonly VisibilityService _visibilityService;
+    private readonly NoSnapService _noSnapService;
     private CancellationTokenSource? _applicationCancellationTokenSource = new();
     private Guid _applicationId;
     private Task? _applicationTask;
@@ -54,7 +55,8 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
         FileCacheManager fileDbManager, MareMediator mediator,
         PlayerPerformanceService playerPerformanceService,
         ServerConfigurationManager serverConfigManager,
-        MareConfigService configService, VisibilityService visibilityService) : base(logger, mediator)
+        MareConfigService configService, VisibilityService visibilityService,
+        NoSnapService noSnapService) : base(logger, mediator)
     {
         Pair = pair;
         PairAnalyzer = pairAnalyzer;
@@ -68,6 +70,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
         _serverConfigManager = serverConfigManager;
         _configService = configService;
         _visibilityService = visibilityService;
+        _noSnapService = noSnapService;
 
         _visibilityService.StartTracking(Pair.Ident);
 
@@ -316,6 +319,24 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
         });
     }
 
+    private void RegisterGposeClones()
+    {
+        var name = PlayerName;
+        if (name == null)
+            return;
+        _ = _dalamudUtil.RunOnFrameworkThread(() =>
+        {
+            foreach (var actor in _dalamudUtil.GetGposeCharactersFromObjectTable())
+            {
+                if (actor == null) continue;
+                var gposeName = actor.Name.TextValue;
+                if (!name.Equals(gposeName, StringComparison.Ordinal))
+                    continue;
+                _noSnapService.AddGposer(actor.ObjectIndex);
+            }
+        });
+    }
+
     private async Task UndoApplicationAsync(Guid applicationId = default)
     {
         Logger.LogDebug($"Undoing application of {Pair.UserPair}");
@@ -332,6 +353,7 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
             {
                 await _ipcManager.Penumbra.RemoveTemporaryCollectionAsync(Logger, applicationId, _penumbraCollection).ConfigureAwait(false);
                 _penumbraCollection = Guid.Empty;
+                RegisterGposeClones();
             }
 
             if (_dalamudUtil is { IsZoning: false, IsInCutscene: false } && !string.IsNullOrEmpty(name))
@@ -363,6 +385,10 @@ public sealed class PairHandler : DisposableMediatorSubscriberBase
                     }
                 }
             }
+            else if (_dalamudUtil.IsInCutscene && !string.IsNullOrEmpty(name))
+            {
+                _noSnapService.AddGposerNamed(name);
+            }
         }
         catch (Exception ex)
         {

MareSynchronos/PlayerData/Pairs/Pair.cs

@@ -86,8 +86,8 @@ public class Pair : DisposableMediatorSubscriberBase
             {
                 Name = name,
                 OnClicked = action,
-                PrefixColor = 526,
-                PrefixChar = 'S'
+                PrefixColor = 559,
+                PrefixChar = 'L'
             });
         }
 
@@ -171,6 +171,11 @@ public class Pair : DisposableMediatorSubscriberBase
         if (_serverConfigurationManager.IsUidBlacklisted(UserData.UID))
             HoldApplication("Blacklist", maxValue: 1);
 
+        if (NoSnapService.AnyLoaded)
+            HoldApplication("NoSnap", maxValue: 1);
+        else
+            UnholdApplication("NoSnap", skipApplication: true);
+
         CachedPlayer.ApplyCharacterData(Guid.NewGuid(), RemoveNotSyncedFiles(LastReceivedCharacterData.DeepClone())!, forced);
     }