t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use PluginWatchService for Glamournumbra too

Browse Source
This commit is contained in:
Loporrit
2025-06-26 09:07:12 +00:00
parent 17b2998d80
commit 5fcedfa890
5 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronos/Services/Mediator/Messages.cs
View File

@@ -100,6 +100,6 @@ public record PairDataAnalyzedMessage(string UID) : KeyedMessage(UID);
public record GameObjectHandlerCreatedMessage(GameObjectHandler GameObjectHandler, bool OwnedObject) : MessageBase;
public record GameObjectHandlerDestroyedMessage(GameObjectHandler GameObjectHandler, bool OwnedObject) : MessageBase;
public record PluginChangeMessage(string InternalName, Version Version, bool IsLoaded) : MessageBase;
public record PluginChangeMessage(string InternalName, Version Version, bool IsLoaded) : KeyedMessage(InternalName);
#pragma warning restore S2094
#pragma warning restore MA0048 // File name must match type name

25
MareSynchronos/Services/PluginWatcherService.cs
View File

@@ -1,13 +1,13 @@
using Dalamud.Plugin;
using MareSynchronos.API.Data;
using MareSynchronos.API.Data.Comparer;
using MareSynchronos.MareConfiguration;
using MareSynchronos.PlayerData.Pairs;
using MareSynchronos.Services.Mediator;
using Microsoft.Extensions.Logging;
using System.Collections.Concurrent;
using CapturedPluginState = (string InternalName, System.Version Version, bool IsLoaded);
namespace MareSynchronos.PlayerData.Pairs;
namespace MareSynchronos.Services;
/* Parts of this code from ECommons DalamudReflector
@@ -42,22 +42,20 @@ public class PluginWatcherService : MediatorSubscriberBase
private CapturedPluginState[] _prevInstalledPluginState = [];
private readonly static System.Version VersionZero = new(0, 0, 0, 0);
private bool ExposedPluginsEqual(IEnumerable<IExposedPlugin> plugins, IEnumerable<CapturedPluginState> other)
private static bool ExposedPluginsEqual(IEnumerable<IExposedPlugin> plugins, IEnumerable<CapturedPluginState> other)
{
if(plugins.Count() != other.Count()) return false;
if (plugins.Count() != other.Count()) return false;
var enumeratorOriginal = plugins.GetEnumerator();
var enumeratorOther = other.GetEnumerator();
while(true)
while (true)
{
var move1 = enumeratorOriginal.MoveNext();
var move2 = enumeratorOther.MoveNext();
if(move1 != move2) return false;
if(move1 == false) return true;
if(enumeratorOriginal.Current.IsLoaded != enumeratorOther.Current.IsLoaded) return false;
if(enumeratorOriginal.Current.Version != enumeratorOther.Current.Version) return false;
if(enumeratorOriginal.Current.InternalName != enumeratorOther.Current.InternalName) return false;
if (move1 != move2) return false;
if (move1 == false) return true;
if (enumeratorOriginal.Current.IsLoaded != enumeratorOther.Current.IsLoaded) return false;
if (enumeratorOriginal.Current.Version != enumeratorOther.Current.Version) return false;
if (enumeratorOriginal.Current.InternalName != enumeratorOther.Current.InternalName) return false;
}
}
@@ -65,7 +63,8 @@ public class PluginWatcherService : MediatorSubscriberBase
{
_pluginInterface = pluginInterface;
Mediator.Subscribe<PriorityFrameworkUpdateMessage>(this, (_) => {
Mediator.Subscribe<PriorityFrameworkUpdateMessage>(this, (_) =>
{
try
{
Update();