From 348da388790ccd9d439f7bcda5f2399eb7c7d36e Mon Sep 17 00:00:00 2001 From: Actions User Date: Sat, 25 Mar 2023 11:36:14 +0000 Subject: [PATCH 1/2] [CI] Updating repo.json for refs/tags/0.6.6.4 --- repo.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/repo.json b/repo.json index 599faae9..66e305b5 100644 --- a/repo.json +++ b/repo.json @@ -4,8 +4,8 @@ "Name": "Penumbra", "Description": "Runtime mod loader and manager.", "InternalName": "Penumbra", - "AssemblyVersion": "0.6.6.3", - "TestingAssemblyVersion": "0.6.6.3", + "AssemblyVersion": "0.6.6.4", + "TestingAssemblyVersion": "0.6.6.4", "RepoUrl": "https://github.com/xivdev/Penumbra", "ApplicableVersion": "any", "DalamudApiLevel": 8, @@ -16,9 +16,9 @@ "LoadPriority": 69420, "LoadRequiredState": 2, "LoadSync": true, - "DownloadLinkInstall": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.3/Penumbra.zip", - "DownloadLinkTesting": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.3/Penumbra.zip", - "DownloadLinkUpdate": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.3/Penumbra.zip", + "DownloadLinkInstall": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.4/Penumbra.zip", + "DownloadLinkTesting": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.4/Penumbra.zip", + "DownloadLinkUpdate": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.4/Penumbra.zip", "IconUrl": "https://raw.githubusercontent.com/xivdev/Penumbra/master/images/icon.png" } ] From c958935f40520c5f3e714bc7857c2803f2c12f5c Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Sat, 25 Mar 2023 16:55:39 +0100 Subject: [PATCH 2/2] Run command registration on framework. --- Penumbra/CommandHandler.cs | 19 +++++++++++-------- Penumbra/Penumbra.cs | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Penumbra/CommandHandler.cs b/Penumbra/CommandHandler.cs index 4f53a7b6..30415ed8 100644 --- a/Penumbra/CommandHandler.cs +++ b/Penumbra/CommandHandler.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using System.Runtime.CompilerServices; +using Dalamud.Game; using Dalamud.Game.Command; using Dalamud.Game.Text.SeStringHandling; using ImGuiNET; @@ -66,7 +67,8 @@ public class CommandHandler : IDisposable private readonly Mod.Manager _modManager; private readonly ModCollection.Manager _collectionManager; - public CommandHandler( CommandManager commandManager, ObjectReloader objectReloader, Configuration config, Penumbra penumbra, ConfigWindow configWindow, Mod.Manager modManager, + public CommandHandler( Framework framework, CommandManager commandManager, ObjectReloader objectReloader, Configuration config, Penumbra penumbra, ConfigWindow configWindow, + Mod.Manager modManager, ModCollection.Manager collectionManager, ActorManager actors ) { _commandManager = commandManager; @@ -77,17 +79,18 @@ public class CommandHandler : IDisposable _modManager = modManager; _collectionManager = collectionManager; _actors = actors; - _commandManager.AddHandler( CommandName, new CommandInfo( OnCommand ) + framework.RunOnFrameworkThread( () => { - HelpMessage = "Without arguments, toggles the main window. Use /penumbra help to get further command help.", - ShowInHelp = true, + _commandManager.AddHandler( CommandName, new CommandInfo( OnCommand ) + { + HelpMessage = "Without arguments, toggles the main window. Use /penumbra help to get further command help.", + ShowInHelp = true, + } ); } ); } public void Dispose() - { - _commandManager.RemoveHandler( CommandName ); - } + => _commandManager.RemoveHandler( CommandName ); private void OnCommand( string command, string arguments ) { @@ -586,7 +589,7 @@ public class CommandHandler : IDisposable } } - private static void Print( Func text ) + private static void Print( Func< SeString > text ) { if( Penumbra.Config.PrintSuccessfulCommandsToChat ) { diff --git a/Penumbra/Penumbra.cs b/Penumbra/Penumbra.cs index 8d8c70d2..a8e5eb7f 100644 --- a/Penumbra/Penumbra.cs +++ b/Penumbra/Penumbra.cs @@ -186,7 +186,7 @@ public class Penumbra : IDalamudPlugin }; var btn = new LaunchButton( cfg ); var system = new WindowSystem( Name ); - var cmd = new CommandHandler( Dalamud.Commands, ObjectReloader, Config, this, cfg, ModManager, CollectionManager, Actors ); + var cmd = new CommandHandler( Dalamud.Framework, Dalamud.Commands, ObjectReloader, Config, this, cfg, ModManager, CollectionManager, Actors ); system.AddWindow( cfg ); system.AddWindow( cfg.ModEditPopup ); system.AddWindow( changelog );