diff --git a/Dalamud/Game/Gui/ContextMenus/ContextMenuItem.cs b/Dalamud/Game/Gui/ContextMenus/ContextMenuItem.cs index dcf094e04..31a9f9119 100644 --- a/Dalamud/Game/Gui/ContextMenus/ContextMenuItem.cs +++ b/Dalamud/Game/Gui/ContextMenus/ContextMenuItem.cs @@ -13,7 +13,7 @@ namespace Dalamud.Game.Gui.ContextMenus /// Initializes a new instance of the class. /// /// The name of the item. - public ContextMenuItem(SeString name) + internal ContextMenuItem(SeString name) { this.Name = name; } diff --git a/Dalamud/Game/Gui/ContextMenus/CustomContextMenuItem.cs b/Dalamud/Game/Gui/ContextMenus/CustomContextMenuItem.cs index 50a5c0a9f..a60393efd 100644 --- a/Dalamud/Game/Gui/ContextMenus/CustomContextMenuItem.cs +++ b/Dalamud/Game/Gui/ContextMenus/CustomContextMenuItem.cs @@ -14,7 +14,7 @@ namespace Dalamud.Game.Gui.ContextMenus /// /// The name of the item. /// The action that will be called when the item is selected. - 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)) { this.ItemSelected = itemSelected; diff --git a/Dalamud/Game/Gui/ContextMenus/CustomContextMenuItemSelectedArgs.cs b/Dalamud/Game/Gui/ContextMenus/CustomContextMenuItemSelectedArgs.cs index a73f0364a..f6dd8c76f 100644 --- a/Dalamud/Game/Gui/ContextMenus/CustomContextMenuItemSelectedArgs.cs +++ b/Dalamud/Game/Gui/ContextMenus/CustomContextMenuItemSelectedArgs.cs @@ -10,7 +10,7 @@ /// /// The currently opened context menu. /// The selected item within the currently opened context menu. - public CustomContextMenuItemSelectedArgs(ContextMenuOpenedArgs contextMenuOpenedArgs, CustomContextMenuItem selectedItem) + internal CustomContextMenuItemSelectedArgs(ContextMenuOpenedArgs contextMenuOpenedArgs, CustomContextMenuItem selectedItem) { this.ContextMenuOpenedArgs = contextMenuOpenedArgs; this.SelectedItem = selectedItem; diff --git a/Dalamud/Game/Gui/ContextMenus/GameContextMenuItem.cs b/Dalamud/Game/Gui/ContextMenus/GameContextMenuItem.cs index 5c8628701..06dc5d82f 100644 --- a/Dalamud/Game/Gui/ContextMenus/GameContextMenuItem.cs +++ b/Dalamud/Game/Gui/ContextMenus/GameContextMenuItem.cs @@ -12,7 +12,7 @@ namespace Dalamud.Game.Gui.ContextMenus /// /// The name of the item. /// The game action that will be handled when the item is selected. - public GameContextMenuItem(SeString name, byte selectedAction) + internal GameContextMenuItem(SeString name, byte selectedAction) : base(name) { this.SelectedAction = selectedAction; diff --git a/Dalamud/Game/Gui/ContextMenus/GameObjectContext.cs b/Dalamud/Game/Gui/ContextMenus/GameObjectContext.cs index 29e6d39a3..8b603f558 100644 --- a/Dalamud/Game/Gui/ContextMenus/GameObjectContext.cs +++ b/Dalamud/Game/Gui/ContextMenus/GameObjectContext.cs @@ -14,7 +14,7 @@ namespace Dalamud.Game.Gui.ContextMenus /// The lower content id of the game object. /// The name of the game object. /// The world id of the game object. - public GameObjectContext(uint? id, ulong? contentId, string? name, ushort? worldId) + internal GameObjectContext(uint? id, ulong? contentId, string? name, ushort? worldId) { this.Id = id; this.ContentId = contentId; diff --git a/Dalamud/Game/Gui/ContextMenus/InventoryItemContext.cs b/Dalamud/Game/Gui/ContextMenus/InventoryItemContext.cs index 96d80f18a..4084c7533 100644 --- a/Dalamud/Game/Gui/ContextMenus/InventoryItemContext.cs +++ b/Dalamud/Game/Gui/ContextMenus/InventoryItemContext.cs @@ -11,7 +11,7 @@ /// The id of the item. /// The count of the item in the stack. /// Whether the item is high quality. - public InventoryItemContext(uint id, uint count, bool isHighQuality) + internal InventoryItemContext(uint id, uint count, bool isHighQuality) { this.Id = id; this.Count = count; diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs index 889e081d3..dc751c448 100644 --- a/Dalamud/Plugin/Internal/PluginManager.cs +++ b/Dalamud/Plugin/Internal/PluginManager.cs @@ -952,7 +952,8 @@ namespace Dalamud.Plugin.Internal public bool IsManifestBanned(PluginManifest manifest) { var configuration = Service.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); } ///