diff --git a/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs b/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
index e92c80846..e3cf78296 100644
--- a/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
@@ -1,4 +1,3 @@
-using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -230,7 +229,7 @@ internal class TitleScreenMenuWindow : Window, IDisposable
}
private bool DrawEntry(
- TitleScreenMenu.TitleScreenMenuEntry entry, bool inhibitFadeout, bool showText, bool isFirst, bool overrideAlpha, bool interactable)
+ TitleScreenMenuEntry entry, bool inhibitFadeout, bool showText, bool isFirst, bool overrideAlpha, bool interactable)
{
InterfaceManager.SpecialGlyphRequest fontHandle;
if (this.specialGlyphRequests.TryGetValue(entry.Name, out fontHandle) && fontHandle.Size != TargetFontSizePx)
diff --git a/Dalamud/Interface/TitleScreenMenu.cs b/Dalamud/Interface/TitleScreenMenu/TitleScreenMenu.cs
similarity index 50%
rename from Dalamud/Interface/TitleScreenMenu.cs
rename to Dalamud/Interface/TitleScreenMenu/TitleScreenMenu.cs
index c9e1458d6..3123ffbb8 100644
--- a/Dalamud/Interface/TitleScreenMenu.cs
+++ b/Dalamud/Interface/TitleScreenMenu/TitleScreenMenu.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Dalamud.IoC;
using Dalamud.IoC.Internal;
+using Dalamud.Plugin.Services;
using ImGuiScene;
namespace Dalamud.Interface;
@@ -12,10 +12,9 @@ namespace Dalamud.Interface;
///
/// Class responsible for managing elements in the title screen menu.
///
-[PluginInterface]
[InterfaceVersion("1.0")]
[ServiceManager.BlockingEarlyLoadedService]
-public class TitleScreenMenu : IServiceType
+internal class TitleScreenMenu : IServiceType, ITitleScreenMenu
{
///
/// Gets the texture size needed for title screen menu logos.
@@ -29,19 +28,10 @@ public class TitleScreenMenu : IServiceType
{
}
- ///
- /// Gets the list of entries in the title screen menu.
- ///
+ ///
public IReadOnlyList Entries => this.entries;
- ///
- /// Adds a new entry to the title screen menu.
- ///
- /// The text to show.
- /// The texture to show.
- /// The action to execute when the option is selected.
- /// A object that can be used to manage the entry.
- /// Thrown when the texture provided does not match the required resolution(64x64).
+ ///
public TitleScreenMenuEntry AddEntry(string text, TextureWrap texture, Action onTriggered)
{
if (texture.Height != TextureSize || texture.Width != TextureSize)
@@ -64,15 +54,7 @@ public class TitleScreenMenu : IServiceType
}
}
- ///
- /// Adds a new entry to the title screen menu.
- ///
- /// Priority of the entry.
- /// The text to show.
- /// The texture to show.
- /// The action to execute when the option is selected.
- /// A object that can be used to manage the entry.
- /// Thrown when the texture provided does not match the required resolution(64x64).
+ ///
public TitleScreenMenuEntry AddEntry(ulong priority, string text, TextureWrap texture, Action onTriggered)
{
if (texture.Height != TextureSize || texture.Width != TextureSize)
@@ -91,10 +73,7 @@ public class TitleScreenMenu : IServiceType
}
}
- ///
- /// Remove an entry from the title screen menu.
- ///
- /// The entry to remove.
+ ///
public void RemoveEntry(TitleScreenMenuEntry entry)
{
lock (this.entries)
@@ -159,93 +138,58 @@ public class TitleScreenMenu : IServiceType
return entry;
}
}
+}
- ///
- /// Class representing an entry in the title screen menu.
- ///
- public class TitleScreenMenuEntry : IComparable
+///
+/// Plugin-scoped version of a TitleScreenMenu service.
+///
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.ScopedService]
+#pragma warning disable SA1015
+[ResolveVia]
+#pragma warning restore SA1015
+internal class TitleScreenMenuPluginScoped : IDisposable, IServiceType, ITitleScreenMenu
+{
+ [ServiceManager.ServiceDependency]
+ private readonly TitleScreenMenu titleScreenMenuService = Service.Get();
+
+ private readonly List pluginEntries = new();
+
+ ///
+ public IReadOnlyList? Entries => this.titleScreenMenuService.Entries;
+
+ ///
+ public void Dispose()
{
- private readonly Action onTriggered;
-
- ///
- /// Initializes a new instance of the class.
- ///
- /// The calling assembly.
- /// The priority of this entry.
- /// The text to show.
- /// The texture to show.
- /// The action to execute when the option is selected.
- internal TitleScreenMenuEntry(Assembly? callingAssembly, ulong priority, string text, TextureWrap texture, Action onTriggered)
+ foreach (var entry in this.pluginEntries)
{
- this.CallingAssembly = callingAssembly;
- this.Priority = priority;
- this.Name = text;
- this.Texture = texture;
- this.onTriggered = onTriggered;
- }
-
- ///
- /// Gets the priority of this entry.
- ///
- public ulong Priority { get; init; }
-
- ///
- /// Gets or sets the name of this entry.
- ///
- public string Name { get; set; }
-
- ///
- /// Gets or sets the texture of this entry.
- ///
- public TextureWrap Texture { get; set; }
-
- ///
- /// Gets or sets a value indicating whether or not this entry is internal.
- ///
- internal bool IsInternal { get; set; }
-
- ///
- /// Gets the calling assembly of this entry.
- ///
- internal Assembly? CallingAssembly { get; init; }
-
- ///
- /// Gets the internal ID of this entry.
- ///
- internal Guid Id { get; init; } = Guid.NewGuid();
-
- ///
- public int CompareTo(TitleScreenMenuEntry? other)
- {
- if (other == null)
- return 1;
- if (this.CallingAssembly != other.CallingAssembly)
- {
- if (this.CallingAssembly == null && other.CallingAssembly == null)
- return 0;
- if (this.CallingAssembly == null && other.CallingAssembly != null)
- return -1;
- if (this.CallingAssembly != null && other.CallingAssembly == null)
- return 1;
- return string.Compare(
- this.CallingAssembly!.FullName!,
- other.CallingAssembly!.FullName!,
- StringComparison.CurrentCultureIgnoreCase);
- }
-
- if (this.Priority != other.Priority)
- return this.Priority.CompareTo(other.Priority);
- if (this.Name != other.Name)
- return string.Compare(this.Name, other.Name, StringComparison.InvariantCultureIgnoreCase);
- return string.Compare(this.Name, other.Name, StringComparison.InvariantCulture);
- }
-
- ///
- /// Trigger the action associated with this entry.
- ///
- internal void Trigger()
- {
- this.onTriggered();
+ this.titleScreenMenuService.RemoveEntry(entry);
}
}
+
+ ///
+ public TitleScreenMenuEntry AddEntry(string text, TextureWrap texture, Action onTriggered)
+ {
+ var entry = this.titleScreenMenuService.AddEntry(text, texture, onTriggered);
+ this.pluginEntries.Add(entry);
+
+ return entry;
+ }
+
+ ///
+ public TitleScreenMenuEntry AddEntry(ulong priority, string text, TextureWrap texture, Action onTriggered)
+ {
+ var entry = this.titleScreenMenuService.AddEntry(priority, text, texture, onTriggered);
+ this.pluginEntries.Add(entry);
+
+ return entry;
+ }
+
+ ///
+ public void RemoveEntry(TitleScreenMenuEntry entry)
+ {
+ this.pluginEntries.Remove(entry);
+ this.titleScreenMenuService.RemoveEntry(entry);
+ }
}
diff --git a/Dalamud/Interface/TitleScreenMenu/TitleScreenMenuEntry.cs b/Dalamud/Interface/TitleScreenMenu/TitleScreenMenuEntry.cs
new file mode 100644
index 000000000..18acc4f47
--- /dev/null
+++ b/Dalamud/Interface/TitleScreenMenu/TitleScreenMenuEntry.cs
@@ -0,0 +1,94 @@
+using System.Reflection;
+
+using ImGuiScene;
+
+namespace Dalamud.Interface;
+
+///
+/// Class representing an entry in the title screen menu.
+///
+public class TitleScreenMenuEntry : IComparable
+{
+ private readonly Action onTriggered;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The calling assembly.
+ /// The priority of this entry.
+ /// The text to show.
+ /// The texture to show.
+ /// The action to execute when the option is selected.
+ internal TitleScreenMenuEntry(Assembly? callingAssembly, ulong priority, string text, TextureWrap texture, Action onTriggered)
+ {
+ this.CallingAssembly = callingAssembly;
+ this.Priority = priority;
+ this.Name = text;
+ this.Texture = texture;
+ this.onTriggered = onTriggered;
+ }
+
+ ///
+ /// Gets the priority of this entry.
+ ///
+ public ulong Priority { get; init; }
+
+ ///
+ /// Gets or sets the name of this entry.
+ ///
+ public string Name { get; set; }
+
+ ///
+ /// Gets or sets the texture of this entry.
+ ///
+ public TextureWrap Texture { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether or not this entry is internal.
+ ///
+ internal bool IsInternal { get; set; }
+
+ ///
+ /// Gets the calling assembly of this entry.
+ ///
+ internal Assembly? CallingAssembly { get; init; }
+
+ ///
+ /// Gets the internal ID of this entry.
+ ///
+ internal Guid Id { get; init; } = Guid.NewGuid();
+
+ ///
+ public int CompareTo(TitleScreenMenuEntry? other)
+ {
+ if (other == null)
+ return 1;
+ if (this.CallingAssembly != other.CallingAssembly)
+ {
+ if (this.CallingAssembly == null && other.CallingAssembly == null)
+ return 0;
+ if (this.CallingAssembly == null && other.CallingAssembly != null)
+ return -1;
+ if (this.CallingAssembly != null && other.CallingAssembly == null)
+ return 1;
+ return string.Compare(
+ this.CallingAssembly!.FullName!,
+ other.CallingAssembly!.FullName!,
+ StringComparison.CurrentCultureIgnoreCase);
+ }
+
+ if (this.Priority != other.Priority)
+ return this.Priority.CompareTo(other.Priority);
+ if (this.Name != other.Name)
+ return string.Compare(this.Name, other.Name, StringComparison.InvariantCultureIgnoreCase);
+ return 0;
+ }
+
+ ///
+ /// Trigger the action associated with this entry.
+ ///
+ internal void Trigger()
+ {
+ this.onTriggered();
+ }
+}
diff --git a/Dalamud/Plugin/Services/ITitleScreenMenu.cs b/Dalamud/Plugin/Services/ITitleScreenMenu.cs
new file mode 100644
index 000000000..2094dc435
--- /dev/null
+++ b/Dalamud/Plugin/Services/ITitleScreenMenu.cs
@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+
+using Dalamud.Interface;
+using ImGuiScene;
+
+namespace Dalamud.Plugin.Services;
+
+///
+/// Interface for class responsible for managing elements in the title screen menu.
+///
+public interface ITitleScreenMenu
+{
+ ///
+ /// Gets the list of entries in the title screen menu.
+ ///
+ public IReadOnlyList Entries { get; }
+
+ ///
+ /// Adds a new entry to the title screen menu.
+ ///
+ /// The text to show.
+ /// The texture to show.
+ /// The action to execute when the option is selected.
+ /// A object that can be used to manage the entry.
+ /// Thrown when the texture provided does not match the required resolution(64x64).
+ public TitleScreenMenuEntry AddEntry(string text, TextureWrap texture, Action onTriggered);
+
+ ///
+ /// Adds a new entry to the title screen menu.
+ ///
+ /// Priority of the entry.
+ /// The text to show.
+ /// The texture to show.
+ /// The action to execute when the option is selected.
+ /// A object that can be used to manage the entry.
+ /// Thrown when the texture provided does not match the required resolution(64x64).
+ public TitleScreenMenuEntry AddEntry(ulong priority, string text, TextureWrap texture, Action onTriggered);
+
+ ///
+ /// Remove an entry from the title screen menu.
+ ///
+ /// The entry to remove.
+ public void RemoveEntry(TitleScreenMenuEntry entry);
+}