From 6d7038fe1b3328e95da0c2b3eb4acbebcce21342 Mon Sep 17 00:00:00 2001 From: Kurochi51 Date: Mon, 6 May 2024 02:09:47 +0300 Subject: [PATCH] 1.4.3.0 --- TickTracker/IPC/PenumbraIpc.cs | 10 +++++----- TickTracker/TickTracker.csproj | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TickTracker/IPC/PenumbraIpc.cs b/TickTracker/IPC/PenumbraIpc.cs index 3bd4355..cf0184d 100644 --- a/TickTracker/IPC/PenumbraIpc.cs +++ b/TickTracker/IPC/PenumbraIpc.cs @@ -22,7 +22,7 @@ public sealed class PenumbraIpc : IDisposable /// Key is directory name, Value is mod name. /// private readonly ICallGateSubscriber> modList; - private readonly ICallGateSubscriber> optionDetails, bool ignoreInheritance)? settings)> modSettings; private readonly ICallGateSubscriber modSettingsChanged; private readonly (Guid Id, string Name) interfaceCollection; @@ -124,7 +124,7 @@ public PenumbraIpc(DalamudPluginInterface _pluginInterface, IPluginLog _pluginLo private void CheckState(bool penumbraEnabled) { - NativeUiBanned = penumbraEnabled + NativeUiBanned = penumbraEnabled && penumbraApiVersion.Breaking == 4 ? OldCheckMUIPresence(oldModList.InvokeFunc(), oldInterfaceCollection.InvokeFunc()) : CheckMUIPresence(modList.InvokeFunc(), interfaceCollection.Id); } @@ -147,7 +147,7 @@ private bool CheckMUIPresence(Dictionary modList, Guid collectio } foreach (var mod in modList) { - if (!mod.Value.Contains("Material UI", StringComparison.OrdinalIgnoreCase) + if (!mod.Value.Contains("Material UI", StringComparison.OrdinalIgnoreCase) && !mod.Key.Contains("Material UI", StringComparison.OrdinalIgnoreCase)) { continue; @@ -163,7 +163,7 @@ private bool CheckMUIPresence(Dictionary modList, Guid collectio return false; } - + private void OldCheckModChanges(ModSettingChange type, string collectionName, string modDirectory, bool inherited) { if ((type is not ModSettingChange.EnableState && type is not ModSettingChange.Inheritance) || !oldInterfaceCollection.InvokeFunc().Equals(collectionName, StringComparison.Ordinal)) @@ -196,7 +196,7 @@ private bool OldCheckMUIPresence(IEnumerable<(string modDirectory, string modNam } return false; } - + private void PenumbraInit() { diff --git a/TickTracker/TickTracker.csproj b/TickTracker/TickTracker.csproj index 86d666a..93029fd 100644 --- a/TickTracker/TickTracker.csproj +++ b/TickTracker/TickTracker.csproj @@ -3,7 +3,7 @@ - 1.4.2.0 + 1.4.3.0 A plugin that keeps track of HP/MP/GP ticks. https://github.com/Kurochi51/TickTracker