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

Merge branch 'master' into services

Browse source 
# Conflicts:
#	Penumbra/CommandHandler.cs
#	Penumbra/Penumbra.cs
This commit is contained in:
Ottermandias 2023-03-25 16:58:33 +01:00
commit e33f49e097
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Penumbra/CommandHandler.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Runtime.CompilerServices;
using Dalamud.Game;
using Dalamud.Game.Command;
using Dalamud.Game.Gui;
using Dalamud.Game.Text.SeStringHandling;
@ -8,7 +9,6 @@ using ImGuiNET;
using Penumbra.Api.Enums;
using Penumbra.Collections;
using Penumbra.GameData.Actors;
using Penumbra.Interop;
using Penumbra.Interop.Services;
using Penumbra.Mods;
using Penumbra.Services;
@ -31,7 +31,7 @@ public class CommandHandler : IDisposable
private readonly ModCollection.Manager _collectionManager;
private readonly Penumbra _penumbra;
public CommandHandler(CommandManager commandManager, ChatGui chat, RedrawService redrawService, Configuration config,
public CommandHandler(Framework framework, CommandManager commandManager, ChatGui chat, RedrawService redrawService, Configuration config,
ConfigWindow configWindow, Mod.Manager modManager, ModCollection.Manager collectionManager, ActorService actors, Penumbra penumbra)
{
_commandManager = commandManager;
@ -43,17 +43,18 @@ public class CommandHandler : IDisposable
_actors = actors.AwaitedService;
_chat = chat;
_penumbra = penumbra;
_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)
{

10
repo.json
View file

@ -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"
}
]