ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 12:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Some more reworking.

Browse source
This commit is contained in:
Ottermandias 2023-04-22 13:30:14 +02:00
parent e66d666d4d
commit a94c5ae7af
12 changed files with 245 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

128
Penumbra/Api/PenumbraApi.cs
View file

@ -23,6 +23,8 @@ using Penumbra.String;
using Penumbra.String.Classes;
using Penumbra.Services;
using Penumbra.Collections.Manager;
using Penumbra.Interop.Services;
using Penumbra.UI;
namespace Penumbra.Api;
@ -31,20 +33,29 @@ public class PenumbraApi : IDisposable, IPenumbraApi
public (int, int) ApiVersion
=> (4, 19);
public event Action<string>? PreSettingsPanelDraw;
public event Action<string>? PostSettingsPanelDraw;
public event Action<string>? PreSettingsPanelDraw
{
add => _communicator.PreSettingsPanelDraw.Subscribe(value!);
remove => _communicator.PreSettingsPanelDraw.Unsubscribe(value!);
}
public event Action<string>? PostSettingsPanelDraw
{
add => _communicator.PostSettingsPanelDraw.Subscribe(value!);
remove => _communicator.PostSettingsPanelDraw.Unsubscribe(value!);
}
public event GameObjectRedrawnDelegate? GameObjectRedrawn
{
add
{
CheckInitialized();
_penumbra!.RedrawService.GameObjectRedrawn += value;
_redrawService.GameObjectRedrawn += value;
}
remove
{
CheckInitialized();
_penumbra!.RedrawService.GameObjectRedrawn -= value;
_redrawService.GameObjectRedrawn -= value;
}
}
@ -91,10 +102,9 @@ public class PenumbraApi : IDisposable, IPenumbraApi
}
public bool Valid
=> _penumbra != null;
=> _lumina != null;
private CommunicatorService _communicator;
private Penumbra _penumbra;
private Lumina.GameData? _lumina;
private ModManager _modManager;
@ -109,32 +119,39 @@ public class PenumbraApi : IDisposable, IPenumbraApi
private CutsceneService _cutsceneService;
private ModImportManager _modImportManager;
private CollectionEditor _collectionEditor;
private RedrawService _redrawService;
private ModFileSystem _modFileSystem;
private ConfigWindow _configWindow;
public unsafe PenumbraApi(CommunicatorService communicator, Penumbra penumbra, ModManager modManager, ResourceLoader resourceLoader,
public unsafe PenumbraApi(CommunicatorService communicator, ModManager modManager, ResourceLoader resourceLoader,
Configuration config, CollectionManager collectionManager, DalamudServices dalamud, TempCollectionManager tempCollections,
TempModManager tempMods, ActorService actors, CollectionResolver collectionResolver, CutsceneService cutsceneService, ModImportManager modImportManager, CollectionEditor collectionEditor)
TempModManager tempMods, ActorService actors, CollectionResolver collectionResolver, CutsceneService cutsceneService,
ModImportManager modImportManager, CollectionEditor collectionEditor, RedrawService redrawService, ModFileSystem modFileSystem,
ConfigWindow configWindow)
{
_communicator = communicator;
_penumbra = penumbra;
_modManager = modManager;
_resourceLoader = resourceLoader;
_config = config;
_collectionManager = collectionManager;
_dalamud = dalamud;
_tempCollections = tempCollections;
_tempMods = tempMods;
_actors = actors;
_collectionResolver = collectionResolver;
_cutsceneService = cutsceneService;
_modImportManager = modImportManager;
_collectionEditor = collectionEditor;
_communicator = communicator;
_modManager = modManager;
_resourceLoader = resourceLoader;
_config = config;
_collectionManager = collectionManager;
_dalamud = dalamud;
_tempCollections = tempCollections;
_tempMods = tempMods;
_actors = actors;
_collectionResolver = collectionResolver;
_cutsceneService = cutsceneService;
_modImportManager = modImportManager;
_collectionEditor = collectionEditor;
_redrawService = redrawService;
_modFileSystem = modFileSystem;
_configWindow = configWindow;
_lumina = (Lumina.GameData?)_dalamud.GameData.GetType()
.GetField("gameData", BindingFlags.Instance | BindingFlags.NonPublic)
?.GetValue(_dalamud.GameData);
_resourceLoader.ResourceLoaded += OnResourceLoaded;
_communicator.ModPathChanged.Subscribe(ModPathChangeSubscriber);
_communicator.ModPathChanged.Subscribe(ModPathChangeSubscriber);
_communicator.ModSettingChanged.Subscribe(OnModSettingChange, -1000);
}
@ -144,11 +161,10 @@ public class PenumbraApi : IDisposable, IPenumbraApi
return;
_resourceLoader.ResourceLoaded -= OnResourceLoaded;
_communicator.ModPathChanged.Unsubscribe(ModPathChangeSubscriber);
_communicator.ModPathChanged.Unsubscribe(ModPathChangeSubscriber);
_communicator.ModSettingChanged.Unsubscribe(OnModSettingChange);
_lumina = null;
_communicator = null!;
_penumbra = null!;
_modManager = null!;
_resourceLoader = null!;
_config = null!;
@ -161,9 +177,16 @@ public class PenumbraApi : IDisposable, IPenumbraApi
_cutsceneService = null!;
_modImportManager = null!;
_collectionEditor = null!;
_redrawService = null!;
_modFileSystem = null!;
_configWindow = null!;
}
public event ChangedItemClick? ChangedItemClicked;
public event ChangedItemClick? ChangedItemClicked
{
add => _communicator.ChangedItemClick.Subscribe(new Action<MouseButton, object?>(value!));
remove => _communicator.ChangedItemClick.Unsubscribe(new Action<MouseButton, object?>(value!));
}
public string GetModDirectory()
{
@ -201,12 +224,12 @@ public class PenumbraApi : IDisposable, IPenumbraApi
add
{
CheckInitialized();
_penumbra!.EnabledChange += value;
_communicator.EnabledChanged.Subscribe(value!, int.MinValue);
}
remove
{
CheckInitialized();
_penumbra!.EnabledChange -= value;
_communicator.EnabledChanged.Unsubscribe(value!);
}
}
@ -216,27 +239,32 @@ public class PenumbraApi : IDisposable, IPenumbraApi
return JsonConvert.SerializeObject(_config, Formatting.Indented);
}
public event ChangedItemHover? ChangedItemTooltip;
public event ChangedItemHover? ChangedItemTooltip
{
add => _communicator.ChangedItemHover.Subscribe(new Action<object?>(value!));
remove => _communicator.ChangedItemHover.Unsubscribe(new Action<object?>(value!));
}
public event GameObjectResourceResolvedDelegate? GameObjectResourceResolved;
public PenumbraApiEc OpenMainWindow(TabType tab, string modDirectory, string modName)
{
CheckInitialized();
if (_penumbra!.ConfigWindow == null)
if (_configWindow == null)
return PenumbraApiEc.SystemDisposed;
_penumbra!.ConfigWindow.IsOpen = true;
_configWindow.IsOpen = true;
if (!Enum.IsDefined(tab))
return PenumbraApiEc.InvalidArgument;
if (tab != TabType.None)
_penumbra!.ConfigWindow.SelectTab(tab);
_configWindow.SelectTab(tab);
if (tab == TabType.Mods && (modDirectory.Length > 0 || modName.Length > 0))
{
if (_modManager.TryGetMod(modDirectory, modName, out var mod))
_penumbra!.ConfigWindow.SelectMod(mod);
_configWindow.SelectMod(mod);
else
return PenumbraApiEc.ModMissing;
}
@ -247,34 +275,34 @@ public class PenumbraApi : IDisposable, IPenumbraApi
public void CloseMainWindow()
{
CheckInitialized();
if (_penumbra!.ConfigWindow == null)
if (_configWindow == null)
return;
_penumbra!.ConfigWindow.IsOpen = false;
_configWindow.IsOpen = false;
}
public void RedrawObject(int tableIndex, RedrawType setting)
{
CheckInitialized();
_penumbra!.RedrawService.RedrawObject(tableIndex, setting);
_redrawService.RedrawObject(tableIndex, setting);
}
public void RedrawObject(string name, RedrawType setting)
{
CheckInitialized();
_penumbra!.RedrawService.RedrawObject(name, setting);
_redrawService.RedrawObject(name, setting);
}
public void RedrawObject(GameObject? gameObject, RedrawType setting)
{
CheckInitialized();
_penumbra!.RedrawService.RedrawObject(gameObject, setting);
_redrawService.RedrawObject(gameObject, setting);
}
public void RedrawAll(RedrawType setting)
{
CheckInitialized();
_penumbra!.RedrawService.RedrawAll(setting);
_redrawService.RedrawAll(setting);
}
public string ResolveDefaultPath(string path)
@ -657,7 +685,7 @@ public class PenumbraApi : IDisposable, IPenumbraApi
{
CheckInitialized();
if (!_modManager.TryGetMod(modDirectory, modName, out var mod)
|| !_penumbra!.ModFileSystem.FindLeaf(mod, out var leaf))
|| !_modFileSystem.FindLeaf(mod, out var leaf))
return (PenumbraApiEc.ModMissing, string.Empty, false);
var fullPath = leaf.FullName();
@ -672,12 +700,12 @@ public class PenumbraApi : IDisposable, IPenumbraApi
return PenumbraApiEc.InvalidArgument;
if (!_modManager.TryGetMod(modDirectory, modName, out var mod)
|| !_penumbra!.ModFileSystem.FindLeaf(mod, out var leaf))
|| !_modFileSystem.FindLeaf(mod, out var leaf))
return PenumbraApiEc.ModMissing;
try
{
_penumbra.ModFileSystem.RenameAndMove(leaf, newPath);
_modFileSystem.RenameAndMove(leaf, newPath);
return PenumbraApiEc.Success;
}
catch
@ -986,16 +1014,6 @@ public class PenumbraApi : IDisposable, IPenumbraApi
return Functions.ToCompressedBase64(set, MetaManipulation.CurrentVersion);
}
internal bool HasTooltip
=> ChangedItemTooltip != null;
internal void InvokeTooltip(object? it)
=> ChangedItemTooltip?.Invoke(it);
internal void InvokeClick(MouseButton button, object? it)
=> ChangedItemClicked?.Invoke(button, it);
[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
private void CheckInitialized()
{
@ -1117,12 +1135,6 @@ public class PenumbraApi : IDisposable, IPenumbraApi
return true;
}
public void InvokePreSettingsPanel(string modDirectory)
=> PreSettingsPanelDraw?.Invoke(modDirectory);
public void InvokePostSettingsPanel(string modDirectory)
=> PostSettingsPanelDraw?.Invoke(modDirectory);
// TODO: replace all usages with ActorIdentifier stuff when incrementing API
private ActorIdentifier NameToIdentifier(string name, ushort worldId)
{

49
Penumbra/Penumbra.cs
View file

@ -1,4 +1,3 @@
using System;
using System.IO;
using System.Linq;
using System.Text;
@ -11,7 +10,6 @@ using OtterGui;
using OtterGui.Log;
using Penumbra.Api;
using Penumbra.Api.Enums;
using Penumbra.UI;
using Penumbra.Util;
using Penumbra.Collections;
using Penumbra.Collections.Cache;
@ -21,7 +19,7 @@ using Penumbra.Services;
using Penumbra.Interop.Services;
using Penumbra.Mods.Manager;
using Penumbra.Collections.Manager;
using Penumbra.Mods;
using Penumbra.UI.Tabs;
namespace Penumbra;
@ -30,13 +28,8 @@ public class Penumbra : IDalamudPlugin
public string Name
=> "Penumbra";
public static Logger Log { get; private set; } = null!;
public static ChatService ChatService { get; private set; } = null!;
public readonly RedrawService RedrawService;
public readonly ModFileSystem ModFileSystem;
public HttpApi HttpApi = null!;
internal ConfigWindow? ConfigWindow { get; private set; }
public static readonly Logger Log = new();
public static ChatService ChatService { get; private set; } = null!;
private readonly ValidityChecker _validityChecker;
private readonly ResidentResourceManager _residentResources;
@ -46,30 +39,31 @@ public class Penumbra : IDalamudPlugin
private readonly CollectionManager _collectionManager;
private readonly Configuration _config;
private readonly CharacterUtility _characterUtility;
private readonly RedrawService _redrawService;
private readonly CommunicatorService _communicatorService;
private PenumbraWindowSystem? _windowSystem;
private bool _disposed;
private readonly PenumbraNew _tmp;
private readonly ServiceManager _tmp;
public Penumbra(DalamudPluginInterface pluginInterface)
{
Log = PenumbraNew.Log;
try
{
_tmp = new PenumbraNew(this, pluginInterface);
_tmp = new ServiceManager(this, pluginInterface, Log);
ChatService = _tmp.Services.GetRequiredService<ChatService>();
_validityChecker = _tmp.Services.GetRequiredService<ValidityChecker>();
_tmp.Services.GetRequiredService<BackupService>();
_tmp.Services.GetRequiredService<BackupService>(); // Initialize because not required anywhere else.
_config = _tmp.Services.GetRequiredService<Configuration>();
_characterUtility = _tmp.Services.GetRequiredService<CharacterUtility>();
_tempMods = _tmp.Services.GetRequiredService<TempModManager>();
_residentResources = _tmp.Services.GetRequiredService<ResidentResourceManager>();
_tmp.Services.GetRequiredService<ResourceManagerService>();
_modManager = _tmp.Services.GetRequiredService<ModManager>();
_collectionManager = _tmp.Services.GetRequiredService<CollectionManager>();
_tempCollections = _tmp.Services.GetRequiredService<TempCollectionManager>();
ModFileSystem = _tmp.Services.GetRequiredService<ModFileSystem>();
RedrawService = _tmp.Services.GetRequiredService<RedrawService>();
_tmp.Services.GetRequiredService<ResourceManagerService>(); // Initialize because not required anywhere else.
_modManager = _tmp.Services.GetRequiredService<ModManager>();
_collectionManager = _tmp.Services.GetRequiredService<CollectionManager>();
_tempCollections = _tmp.Services.GetRequiredService<TempCollectionManager>();
_redrawService = _tmp.Services.GetRequiredService<RedrawService>();
_communicatorService = _tmp.Services.GetRequiredService<CommunicatorService>();
_tmp.Services.GetRequiredService<ResourceService>(); // Initialize because not required anywhere else.
_tmp.Services.GetRequiredService<ModCacheManager>(); // Initialize because not required anywhere else.
using (var t = _tmp.Services.GetRequiredService<StartTracker>().Measure(StartTimeType.PathResolver))
@ -100,7 +94,6 @@ public class Penumbra : IDalamudPlugin
{
using var timer = _tmp.Services.GetRequiredService<StartTracker>().Measure(StartTimeType.Api);
var api = _tmp.Services.GetRequiredService<IPenumbraApi>();
HttpApi = _tmp.Services.GetRequiredService<HttpApi>();
_tmp.Services.GetRequiredService<PenumbraIpcProviders>();
api.ChangedItemTooltip += it =>
{
@ -120,22 +113,16 @@ public class Penumbra : IDalamudPlugin
{
using var tInterface = _tmp.Services.GetRequiredService<StartTracker>().Measure(StartTimeType.Interface);
var system = _tmp.Services.GetRequiredService<PenumbraWindowSystem>();
system.Window.Setup(this, _tmp.Services.GetRequiredService<ConfigTabBar>());
_tmp.Services.GetRequiredService<CommandHandler>();
if (!_disposed)
{
_windowSystem = system;
ConfigWindow = system.Window;
}
else
{
system.Dispose();
}
}
);
}
public event Action<bool>? EnabledChange;
public bool SetEnabled(bool enabled)
{
if (enabled == _config.EnableMods)
@ -148,7 +135,7 @@ public class Penumbra : IDalamudPlugin
{
_collectionManager.Active.Default.SetFiles(_characterUtility);
_residentResources.Reload();
RedrawService.RedrawAll(RedrawType.Redraw);
_redrawService.RedrawAll(RedrawType.Redraw);
}
}
else
@ -157,12 +144,12 @@ public class Penumbra : IDalamudPlugin
{
_characterUtility.ResetAll();
_residentResources.Reload();
RedrawService.RedrawAll(RedrawType.Redraw);
_redrawService.RedrawAll(RedrawType.Redraw);
}
}
_config.Save();
EnabledChange?.Invoke(enabled);
_communicatorService.EnabledChanged.Invoke(enabled);
return true;
}

14
Penumbra/PenumbraNew.cs → Penumbra/ServiceManager.cs
View file

@ -1,10 +1,8 @@
using System;
using Dalamud.Plugin;
using Microsoft.Extensions.DependencyInjection;
using OtterGui.Classes;
using OtterGui.Log;
using Penumbra.Api;
using Penumbra.Collections;
using Penumbra.Collections.Manager;
using Penumbra.GameData;
using Penumbra.GameData.Data;
@ -27,22 +25,18 @@ using Penumbra.Meta;
namespace Penumbra;
public class PenumbraNew
public class ServiceManager
{
public string Name
=> "Penumbra";
public readonly ServiceProvider Services;
public static readonly Logger Log = new();
public readonly ServiceProvider Services;
public PenumbraNew(Penumbra penumbra, DalamudPluginInterface pi)
public ServiceManager(Penumbra penumbra, DalamudPluginInterface pi, Logger log)
{
var startTimer = new StartTracker();
using var time = startTimer.Measure(StartTimeType.Total);
var services = new ServiceCollection();
// Add meta services.
services.AddSingleton(Log)
services.AddSingleton(log)
.AddSingleton(startTimer)
.AddSingleton<ValidityChecker>()
.AddSingleton<PerformanceTracker>()

105
Penumbra/Services/CommunicatorService.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Penumbra.Api.Enums;
using Penumbra.Collections;
@ -211,6 +210,90 @@ public sealed class CollectionInheritanceChanged : EventWrapper<Action<ModCollec
=> Invoke(this, collection, inherited);
}
/// <summary>
/// Triggered when the general Enabled state of Penumbra is changed.
/// <list type="number">
/// <item>Parameter is whether Penumbra is now Enabled (true) or Disabled (false). </item>
/// </list>
/// </summary>
public sealed class EnabledChanged : EventWrapper<Action<bool>>
{
public EnabledChanged()
: base(nameof(EnabledChanged))
{ }
public void Invoke(bool enabled)
=> Invoke(this, enabled);
}
/// <summary>
/// Triggered before the settings panel is drawn.
/// <list type="number">
/// <item>Parameter is the identifier (directory name) of the currently selected mod. </item>
/// </list>
/// </summary>
public sealed class PreSettingsPanelDraw : EventWrapper<Action<string>>
{
public PreSettingsPanelDraw()
: base(nameof(PreSettingsPanelDraw))
{ }
public void Invoke(string modDirectory)
=> Invoke(this, modDirectory);
}
/// <summary>
/// Triggered after the settings panel is drawn.
/// <list type="number">
/// <item>Parameter is the identifier (directory name) of the currently selected mod. </item>
/// </list>
/// </summary>
public sealed class PostSettingsPanelDraw : EventWrapper<Action<string>>
{
public PostSettingsPanelDraw()
: base(nameof(PostSettingsPanelDraw))
{ }
public void Invoke(string modDirectory)
=> Invoke(this, modDirectory);
}
/// <summary>
/// Triggered when a Changed Item in Penumbra is hovered.
/// <list type="number">
/// <item>Parameter is the hovered object data if any. </item>
/// </list>
/// </summary>
public sealed class ChangedItemHover : EventWrapper<Action<object?>>
{
public ChangedItemHover()
: base(nameof(ChangedItemHover))
{ }
public void Invoke(object? data)
=> Invoke(this, data);
public bool HasTooltip
=> HasSubscribers;
}
/// <summary>
/// Triggered when a Changed Item in Penumbra is clicked.
/// <list type="number">
/// <item>Parameter is the clicked mouse button. </item>
/// <item>Parameter is the clicked object data if any.. </item>
/// </list>
/// </summary>
public sealed class ChangedItemClick : EventWrapper<Action<MouseButton, object?>>
{
public ChangedItemClick()
: base(nameof(ChangedItemClick))
{ }
public void Invoke(MouseButton button, object? data)
=> Invoke(this, button, data);
}
public class CommunicatorService : IDisposable
{
/// <inheritdoc cref="Services.CollectionChange"/>
@ -249,6 +332,21 @@ public class CommunicatorService : IDisposable
/// <inheritdoc cref="Services.CollectionInheritanceChanged"/>
public readonly CollectionInheritanceChanged CollectionInheritanceChanged = new();
/// <inheritdoc cref="Services.EnabledChanged"/>
public readonly EnabledChanged EnabledChanged = new();
/// <inheritdoc cref="Services.PreSettingsPanelDraw"/>
public readonly PreSettingsPanelDraw PreSettingsPanelDraw = new();
/// <inheritdoc cref="Services.PostSettingsPanelDraw"/>
public readonly PostSettingsPanelDraw PostSettingsPanelDraw = new();
/// <inheritdoc cref="Services.ChangedItemHover"/>
public readonly ChangedItemHover ChangedItemHover = new();
/// <inheritdoc cref="Services.ChangedItemClick"/>
public readonly ChangedItemClick ChangedItemClick = new();
public void Dispose()
{
CollectionChange.Dispose();
@ -263,5 +361,10 @@ public class CommunicatorService : IDisposable
ModPathChanged.Dispose();
ModSettingChanged.Dispose();
CollectionInheritanceChanged.Dispose();
EnabledChanged.Dispose();
PreSettingsPanelDraw.Dispose();
PostSettingsPanelDraw.Dispose();
ChangedItemHover.Dispose();
ChangedItemClick.Dispose();
}
}

25
Penumbra/UI/ConfigWindow.cs
View file

@ -9,7 +9,8 @@ using Penumbra.Api.Enums;
using Penumbra.Mods;
using Penumbra.UI.Classes;
using Penumbra.UI.Tabs;
using Penumbra.Util;
using Penumbra.Util;
namespace Penumbra.UI;
public sealed class ConfigWindow : Window
@ -18,8 +19,8 @@ public sealed class ConfigWindow : Window
private readonly Configuration _config;
private readonly PerformanceTracker _tracker;
private readonly ValidityChecker _validityChecker;
private readonly Penumbra _penumbra;
private readonly ConfigTabBar _configTabs;
private Penumbra? _penumbra;
private ConfigTabBar _configTabs = null!;
private string? _lastException;
public void SelectTab(TabType tab)
@ -31,15 +32,13 @@ public sealed class ConfigWindow : Window
public ConfigWindow(PerformanceTracker tracker, DalamudPluginInterface pi, Configuration config, ValidityChecker checker,
TutorialService tutorial, Penumbra penumbra, ConfigTabBar configTabs)
TutorialService tutorial)
: base(GetLabel(checker))
{
_pluginInterface = pi;
_config = config;
_tracker = tracker;
_validityChecker = checker;
_penumbra = penumbra;
_configTabs = configTabs;
RespectCloseHotkey = true;
SizeConstraints = new WindowSizeConstraints()
@ -51,6 +50,15 @@ public sealed class ConfigWindow : Window
IsOpen = _config.DebugMode;
}
public void Setup(Penumbra penumbra, ConfigTabBar configTabs)
{
_penumbra = penumbra;
_configTabs = configTabs;
}
public override bool DrawConditions()
=> _penumbra != null;
public override void PreDraw()
{
if (_config.FixMainWindow)
@ -61,7 +69,7 @@ public sealed class ConfigWindow : Window
public override void Draw()
{
using var timer = _tracker.Measure(PerformanceType.UiMainWindow);
using var timer = _tracker.Measure(PerformanceType.UiMainWindow);
UiHelpers.SetupCommonSizes();
try
{
@ -111,6 +119,7 @@ public sealed class ConfigWindow : Window
var text = e.ToString();
if (text == _lastException)
return;
_lastException = text;
}
else
@ -139,7 +148,7 @@ public sealed class ConfigWindow : Window
ImGui.NewLine();
UiHelpers.DrawDiscordButton(0);
ImGui.SameLine();
UiHelpers.DrawSupportButton(_penumbra);
UiHelpers.DrawSupportButton(_penumbra!);
ImGui.NewLine();
ImGui.NewLine();
}

12
Penumbra/UI/ModsTab/ModPanelChangedItemsTab.cs
View file

@ -7,22 +7,22 @@ using OtterGui.Classes;
using OtterGui.Raii;
using OtterGui.Widgets;
using Penumbra.Api;
using Penumbra.Mods.Manager;
using Penumbra.Services;
namespace Penumbra.UI.ModsTab;
public class ModPanelChangedItemsTab : ITab
{
private readonly ModFileSystemSelector _selector;
private readonly PenumbraApi _api;
private readonly CommunicatorService _communicator;
public ReadOnlySpan<byte> Label
=> "Changed Items"u8;
public ModPanelChangedItemsTab(PenumbraApi api, ModFileSystemSelector selector)
public ModPanelChangedItemsTab(ModFileSystemSelector selector, CommunicatorService communicator)
{
_api = api;
_selector = selector;
_selector = selector;
_communicator = communicator;
}
public bool IsVisible
@ -36,6 +36,6 @@ public class ModPanelChangedItemsTab : ITab
var zipList = ZipList.FromSortedList((SortedList<string, object?>)_selector.Selected!.ChangedItems);
var height = ImGui.GetTextLineHeight();
ImGuiClip.ClippedDraw(zipList, kvp => UiHelpers.DrawChangedItem(_api, kvp.Item1, kvp.Item2, true), height);
ImGuiClip.ClippedDraw(zipList, kvp => UiHelpers.DrawChangedItem(_communicator, kvp.Item1, kvp.Item2, true), height);
}
}

12
Penumbra/UI/ModsTab/ModPanelSettingsTab.cs
View file

@ -5,7 +5,6 @@ using ImGuiNET;
using OtterGui.Raii;
using OtterGui;
using OtterGui.Widgets;
using Penumbra.Api;
using Penumbra.Api.Enums;
using Penumbra.Collections;
using Penumbra.Mods;
@ -14,16 +13,17 @@ using Dalamud.Interface.Components;
using Dalamud.Interface;
using Penumbra.Collections.Manager;
using Penumbra.Mods.Manager;
using Penumbra.Services;
namespace Penumbra.UI.ModsTab;
public class ModPanelSettingsTab : ITab
{
private readonly Configuration _config;
private readonly CommunicatorService _communicator;
private readonly CollectionManager _collectionManager;
private readonly ModFileSystemSelector _selector;
private readonly TutorialService _tutorial;
private readonly PenumbraApi _api;
private readonly ModManager _modManager;
private bool _inherited;
@ -33,13 +33,13 @@ public class ModPanelSettingsTab : ITab
private int? _currentPriority = null;
public ModPanelSettingsTab(CollectionManager collectionManager, ModManager modManager, ModFileSystemSelector selector,
TutorialService tutorial, PenumbraApi api, Configuration config)
TutorialService tutorial, CommunicatorService communicator, Configuration config)
{
_collectionManager = collectionManager;
_communicator = communicator;
_modManager = modManager;
_selector = selector;
_tutorial = tutorial;
_api = api;
_config = config;
}
@ -65,7 +65,7 @@ public class ModPanelSettingsTab : ITab
DrawInheritedWarning();
UiHelpers.DefaultLineSpace();
_api.InvokePreSettingsPanel(_selector.Selected!.ModPath.Name);
_communicator.PreSettingsPanelDraw.Invoke(_selector.Selected!.ModPath.Name);
DrawEnabledInput();
_tutorial.OpenTutorial(BasicTutorialSteps.EnablingMods);
ImGui.SameLine();
@ -102,7 +102,7 @@ public class ModPanelSettingsTab : ITab
}
UiHelpers.DefaultLineSpace();
_api.InvokePostSettingsPanel(_selector.Selected!.ModPath.Name);
_communicator.PostSettingsPanelDraw.Invoke(_selector.Selected!.ModPath.Name);
}
/// <summary> Draw a big red bar if the current setting is inherited. </summary>

12
Penumbra/UI/Tabs/ChangedItemsTab.cs
View file

@ -7,22 +7,22 @@ using OtterGui;
using OtterGui.Classes;
using OtterGui.Raii;
using OtterGui.Widgets;
using Penumbra.Api;
using Penumbra.Collections.Manager;
using Penumbra.Mods;
using Penumbra.Services;
using Penumbra.UI.Classes;
namespace Penumbra.UI.Tabs;
public class ChangedItemsTab : ITab
{
private readonly CollectionManager _collectionManager;
private readonly PenumbraApi _api;
private readonly CollectionManager _collectionManager;
private readonly CommunicatorService _communicator;
public ChangedItemsTab(CollectionManager collectionManager, PenumbraApi api)
public ChangedItemsTab(CollectionManager collectionManager, CommunicatorService communicator)
{
_collectionManager = collectionManager;
_api = api;
_communicator = communicator;
}
public ReadOnlySpan<byte> Label
@ -81,7 +81,7 @@ public class ChangedItemsTab : ITab
private void DrawChangedItemColumn(KeyValuePair<string, (SingleArray<IMod>, object?)> item)
{
ImGui.TableNextColumn();
UiHelpers.DrawChangedItem(_api, item.Key, item.Value.Item2, false);
UiHelpers.DrawChangedItem(_communicator, item.Key, item.Value.Item2, false);
ImGui.TableNextColumn();
if (item.Value.Item1.Count > 0)
{

10
Penumbra/UI/Tabs/SettingsTab.cs
View file

@ -9,6 +9,7 @@ using ImGuiNET;
using OtterGui;
using OtterGui.Raii;
using OtterGui.Widgets;
using Penumbra.Api;
using Penumbra.Interop.Services;
using Penumbra.Mods.Manager;
using Penumbra.Services;
@ -35,10 +36,11 @@ public class SettingsTab : ITab
private readonly CharacterUtility _characterUtility;
private readonly ResidentResourceManager _residentResources;
private readonly DalamudServices _dalamud;
private readonly HttpApi _httpApi;
public SettingsTab(Configuration config, FontReloader fontReloader, TutorialService tutorial, Penumbra penumbra,
FileDialogService fileDialog, ModManager modManager, ModFileSystemSelector selector, CharacterUtility characterUtility,
ResidentResourceManager residentResources, DalamudServices dalamud, ModExportManager modExportManager)
ResidentResourceManager residentResources, DalamudServices dalamud, ModExportManager modExportManager, HttpApi httpApi)
{
_config = config;
_fontReloader = fontReloader;
@ -51,6 +53,7 @@ public class SettingsTab : ITab
_residentResources = residentResources;
_dalamud = dalamud;
_modExportManager = modExportManager;
_httpApi = httpApi;
}
public void DrawHeader()
@ -630,7 +633,6 @@ public class SettingsTab : ITab
private void DrawAdvancedSettings()
{
var header = ImGui.CollapsingHeader("Advanced");
_tutorial.OpenTutorial(BasicTutorialSteps.Deprecated1);
if (!header)
return;
@ -657,9 +659,9 @@ public class SettingsTab : ITab
if (ImGui.Checkbox("##http", ref http))
{
if (http)
_penumbra.HttpApi.CreateWebServer();
_httpApi.CreateWebServer();
else
_penumbra.HttpApi.ShutdownWebServer();
_httpApi.ShutdownWebServer();
_config.EnableHttpApi = http;
_config.Save();

3
Penumbra/UI/TutorialService.cs
View file

@ -47,10 +47,7 @@ public class TutorialService
public const string SelectedCollection = "Selected Collection";
public const string DefaultCollection = "Base Collection";
public const string InterfaceCollection = "Interface Collection";
public const string ActiveCollections = "Active Collections";
public const string AssignedCollections = "Assigned Collections";
public const string GroupAssignment = "Group Assignment";
public const string IndividualAssignments = "Individual Assignments";
public const string SupportedRedrawModifiers = " - nothing, to redraw all characters\n"
+ " - 'self' or '<me>': your own character\n"

9
Penumbra/UI/UiHelpers.cs
View file

@ -13,6 +13,7 @@ using Penumbra.Api;
using Penumbra.Api.Enums;
using Penumbra.GameData.Enums;
using Penumbra.Interop.Structs;
using Penumbra.Services;
using Penumbra.String;
using Penumbra.UI.Classes;
@ -60,7 +61,7 @@ public static class UiHelpers
/// Draw a changed item, invoking the Api-Events for clicks and tooltips.
/// Also draw the item Id in grey if requested.
/// </summary>
public static void DrawChangedItem(PenumbraApi api, string name, object? data, bool drawId)
public static void DrawChangedItem(CommunicatorService communicator, string name, object? data, bool drawId)
{
name = ChangedItemName(name, data);
var ret = ImGui.Selectable(name) ? MouseButton.Left : MouseButton.None;
@ -68,15 +69,15 @@ public static class UiHelpers
ret = ImGui.IsItemClicked(ImGuiMouseButton.Middle) ? MouseButton.Middle : ret;
if (ret != MouseButton.None)
api.InvokeClick(ret, data);
communicator.ChangedItemClick.Invoke(ret, data);
if (api.HasTooltip && ImGui.IsItemHovered())
if (communicator.ChangedItemHover.HasTooltip && ImGui.IsItemHovered())
{
// We can not be sure that any subscriber actually prints something in any case.
// Circumvent ugly blank tooltip with less-ugly useless tooltip.
using var tt = ImRaii.Tooltip();
using var group = ImRaii.Group();
api.InvokeTooltip(data);
communicator.ChangedItemHover.Invoke(data);
group.Dispose();
if (ImGui.GetItemRectSize() == Vector2.Zero)
ImGui.TextUnformatted("No actions available.");

3
Penumbra/Util/EventWrapper.cs
View file

@ -9,6 +9,9 @@ public abstract class EventWrapper<T> : IDisposable where T : Delegate
private readonly string _name;
private readonly List<(object Subscriber, int Priority)> _event = new();
public bool HasSubscribers
=> _event.Count > 0;
protected EventWrapper(string name)
=> _name = name;