ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 21:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(ContextMenu): ctor visibility

Browse source
This commit is contained in:
goaaats 2022-01-29 15:35:39 +01:00
parent a3686d9c93
commit 6131c3efa1
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
7 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Game/Gui/ContextMenus/ContextMenuItem.cs
View file

@ -13,7 +13,7 @@ namespace Dalamud.Game.Gui.ContextMenus
/// Initializes a new instance of the <see cref="ContextMenuItem" /> class. /// Initializes a new instance of the <see cref="ContextMenuItem" /> class.
/// </summary> /// </summary>
/// <param name="name">The name of the item.</param> /// <param name="name">The name of the item.</param>
public ContextMenuItem(SeString name) internal ContextMenuItem(SeString name)
{ {
this.Name = name; this.Name = name;
} }

2
Dalamud/Game/Gui/ContextMenus/CustomContextMenuItem.cs
View file

@ -14,7 +14,7 @@ namespace Dalamud.Game.Gui.ContextMenus
/// </summary> /// </summary>
/// <param name="name">The name of the item.</param> /// <param name="name">The name of the item.</param>
/// <param name="itemSelected">The action that will be called when the item is selected.</param> /// <param name="itemSelected">The action that will be called when the item is selected.</param>
internal CustomContextMenuItem(SeString name, CustomContextMenuItemSelectedDelegate itemSelected) public CustomContextMenuItem(SeString name, CustomContextMenuItemSelectedDelegate itemSelected)
: base(new SeString().Append(new UIForegroundPayload(539)).Append($"{SeIconChar.BoxedLetterD.ToIconString()} ").Append(new UIForegroundPayload(0)).Append(name)) : base(new SeString().Append(new UIForegroundPayload(539)).Append($"{SeIconChar.BoxedLetterD.ToIconString()} ").Append(new UIForegroundPayload(0)).Append(name))
{ {
this.ItemSelected = itemSelected; this.ItemSelected = itemSelected;

2
Dalamud/Game/Gui/ContextMenus/CustomContextMenuItemSelectedArgs.cs
View file

@ -10,7 +10,7 @@
/// </summary> /// </summary>
/// <param name="contextMenuOpenedArgs">The currently opened context menu.</param> /// <param name="contextMenuOpenedArgs">The currently opened context menu.</param>
/// <param name="selectedItem">The selected item within the currently opened context menu.</param> /// <param name="selectedItem">The selected item within the currently opened context menu.</param>
public CustomContextMenuItemSelectedArgs(ContextMenuOpenedArgs contextMenuOpenedArgs, CustomContextMenuItem selectedItem) internal CustomContextMenuItemSelectedArgs(ContextMenuOpenedArgs contextMenuOpenedArgs, CustomContextMenuItem selectedItem)
{ {
this.ContextMenuOpenedArgs = contextMenuOpenedArgs; this.ContextMenuOpenedArgs = contextMenuOpenedArgs;
this.SelectedItem = selectedItem; this.SelectedItem = selectedItem;

2
Dalamud/Game/Gui/ContextMenus/GameContextMenuItem.cs
View file

@ -12,7 +12,7 @@ namespace Dalamud.Game.Gui.ContextMenus
/// </summary> /// </summary>
/// <param name="name">The name of the item.</param> /// <param name="name">The name of the item.</param>
/// <param name="selectedAction">The game action that will be handled when the item is selected.</param> /// <param name="selectedAction">The game action that will be handled when the item is selected.</param>
public GameContextMenuItem(SeString name, byte selectedAction) internal GameContextMenuItem(SeString name, byte selectedAction)
: base(name) : base(name)
{ {
this.SelectedAction = selectedAction; this.SelectedAction = selectedAction;

2
Dalamud/Game/Gui/ContextMenus/GameObjectContext.cs
View file

@ -14,7 +14,7 @@ namespace Dalamud.Game.Gui.ContextMenus
/// <param name="contentId">The lower content id of the game object.</param> /// <param name="contentId">The lower content id of the game object.</param>
/// <param name="name">The name of the game object.</param> /// <param name="name">The name of the game object.</param>
/// <param name="worldId">The world id of the game object.</param> /// <param name="worldId">The world id of the game object.</param>
public GameObjectContext(uint? id, ulong? contentId, string? name, ushort? worldId) internal GameObjectContext(uint? id, ulong? contentId, string? name, ushort? worldId)
{ {
this.Id = id; this.Id = id;
this.ContentId = contentId; this.ContentId = contentId;

2
Dalamud/Game/Gui/ContextMenus/InventoryItemContext.cs
View file

@ -11,7 +11,7 @@
/// <param name="id">The id of the item.</param> /// <param name="id">The id of the item.</param>
/// <param name="count">The count of the item in the stack.</param> /// <param name="count">The count of the item in the stack.</param>
/// <param name="isHighQuality">Whether the item is high quality.</param> /// <param name="isHighQuality">Whether the item is high quality.</param>
public InventoryItemContext(uint id, uint count, bool isHighQuality) internal InventoryItemContext(uint id, uint count, bool isHighQuality)
{ {
this.Id = id; this.Id = id;
this.Count = count; this.Count = count;

3
Dalamud/Plugin/Internal/PluginManager.cs
View file

@ -952,7 +952,8 @@ namespace Dalamud.Plugin.Internal
public bool IsManifestBanned(PluginManifest manifest) public bool IsManifestBanned(PluginManifest manifest)
{ {
var configuration = Service<DalamudConfiguration>.Get(); var configuration = Service<DalamudConfiguration>.Get();
return !configuration.LoadBannedPlugins && this.bannedPlugins.Any(ban => ban.Name == manifest.InternalName && ban.AssemblyVersion >= manifest.AssemblyVersion); return !configuration.LoadBannedPlugins && this.bannedPlugins.Any(ban => (ban.Name == manifest.InternalName || ban.Name == Hash.GetStringSha256Hash(manifest.InternalName))
&& ban.AssemblyVersion >= manifest.AssemblyVersion);
} }
/// <summary> /// <summary>