Lelia
/
ARDiscard
forked from liza/ARDiscard
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'character-post-processing'

master
Liza 2023-09-13 20:27:02 +02:00
parent 3bf3d52b40 2025b0253d
commit 28190571f5
Signed by: liza
GPG Key ID: 7199F8D727D55F67
4 changed files with 77 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ARDiscard/ARDiscard.csproj
View File

@ -17,7 +17,7 @@
<PropertyGroup> <PropertyGroup>
<DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath> <DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
<AutoRetainerLibPath>$(appdata)\XIVLauncher\installedPlugins\AutoRetainer\4.1.0.9\</AutoRetainerLibPath> <AutoRetainerLibPath>$(appdata)\XIVLauncher\installedPlugins\AutoRetainer\4.1.1.1\</AutoRetainerLibPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'"> <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">

98
ARDiscard/AutoDiscardPlogon.cs
View File

@ -56,36 +56,52 @@ public class AutoDiscardPlogon : IDalamudPlugin
_autoRetainerApi = new(); _autoRetainerApi = new();
_taskManager = new(); _taskManager = new();
_autoRetainerApi.OnRetainerReadyToPostprocess += DoPostProcess; _autoRetainerApi.OnRetainerPostprocessStep += CheckRetainerPostProcess;
_autoRetainerApi.OnRetainerPostprocessStep += CheckPostProcess; _autoRetainerApi.OnRetainerReadyToPostprocess += DoRetainerPostProcess;
_autoRetainerApi.OnCharacterPostprocessStep += CheckCharacterPostProcess;
_autoRetainerApi.OnCharacterReadyToPostProcess += DoCharacterPostProcess;
} }
public string Name => "Discard after AutoRetainer"; public string Name => "Discard after AutoRetainer";
private unsafe void CheckPostProcess(string retainerName) private void CheckRetainerPostProcess(string retainerName) =>
CheckPostProcessInternal(PostProcessType.Retainer, retainerName, _configuration.RunAfterVenture);
private void CheckCharacterPostProcess() =>
CheckPostProcessInternal(PostProcessType.Character, "current character", _configuration.RunBeforeLogout);
private unsafe void CheckPostProcessInternal(PostProcessType type, string name, bool enabled)
{ {
if (!_configuration.RunAfterVenture) if (!enabled)
{ {
PluginLog.Information($"Not running post-venture tasks for {retainerName}, disabled globally"); PluginLog.Information($"Not running post-venture tasks for {name}, disabled globally");
} }
else if (_configuration.ExcludedCharacters.Any(x => x.LocalContentId == _clientState.LocalContentId)) else if (_configuration.ExcludedCharacters.Any(x => x.LocalContentId == _clientState.LocalContentId))
{ {
PluginLog.Information($"Not running post-venture tasks for {retainerName}, disabled for current character"); PluginLog.Information($"Not running post-venture tasks for {name}, disabled for current character");
} }
else if (_inventoryUtils.GetNextItemToDiscard() == null) else if (_inventoryUtils.GetNextItemToDiscard() == null)
{ {
PluginLog.Information($"Not running post-venture tasks for {retainerName}, no items to discard"); PluginLog.Information($"Not running post-venture tasks for {name}, no items to discard");
} }
else else
{ {
PluginLog.Information($"Requesting post-processing for {retainerName}"); PluginLog.Information($"Requesting post-processing for {name}");
_autoRetainerApi.RequestPostprocess(); if (type == PostProcessType.Retainer)
_autoRetainerApi.RequestRetainerPostprocess();
else if (type == PostProcessType.Character)
_autoRetainerApi.RequestCharacterPostprocess();
} }
} }
private void DoPostProcess(string retainerName) private void DoRetainerPostProcess(string retainerName)
{ {
_taskManager.Enqueue(() => DiscardNextItem(true)); _taskManager.Enqueue(() => DiscardNextItem(PostProcessType.Retainer));
}
private void DoCharacterPostProcess()
{
_taskManager.Enqueue(() => DiscardNextItem(PostProcessType.Character));
} }
private void OpenConfig(string command, string arguments) => OpenConfigUi(); private void OpenConfig(string command, string arguments) => OpenConfigUi();
@ -97,18 +113,20 @@ public class AutoDiscardPlogon : IDalamudPlugin
private void ProcessCommand(string command, string arguments) private void ProcessCommand(string command, string arguments)
{ {
_taskManager.Enqueue(() => DiscardNextItem(false)); _taskManager.Enqueue(() => DiscardNextItem(PostProcessType.FromCommand));
} }
private unsafe void DiscardNextItem(bool finishRetainerAction) private unsafe void DiscardNextItem(PostProcessType type)
{ {
PluginLog.Information($"DiscardNextItem (retainer = {finishRetainerAction})"); PluginLog.Information($"DiscardNextItem (type = {type})");
InventoryItem* nextItem = _inventoryUtils.GetNextItemToDiscard(); InventoryItem* nextItem = _inventoryUtils.GetNextItemToDiscard();
if (nextItem == null) if (nextItem == null)
{ {
PluginLog.Information($"No item to discard found"); PluginLog.Information($"No item to discard found");
if (finishRetainerAction) if (type == PostProcessType.Retainer)
_autoRetainerApi.FinishPostProcess(); _autoRetainerApi.FinishRetainerPostProcess();
else if (type == PostProcessType.Character)
_autoRetainerApi.FinishCharacterPostProcess();
else else
_chatGui.Print("Done discarding."); _chatGui.Print("Done discarding.");
} }
@ -122,11 +140,11 @@ public class AutoDiscardPlogon : IDalamudPlugin
_cancelDiscardAfter = DateTime.Now.AddSeconds(15); _cancelDiscardAfter = DateTime.Now.AddSeconds(15);
_taskManager.DelayNext(20); _taskManager.DelayNext(20);
_taskManager.Enqueue(() => ConfirmDiscardItem(finishRetainerAction, inventoryType, slot)); _taskManager.Enqueue(() => ConfirmDiscardItem(type, inventoryType, slot));
} }
} }
private unsafe void ConfirmDiscardItem(bool finishRetainerAction, InventoryType inventoryType, short slot) private unsafe void ConfirmDiscardItem(PostProcessType type, InventoryType inventoryType, short slot)
{ {
var addon = GetDiscardAddon(); var addon = GetDiscardAddon();
if (addon != null) if (addon != null)
@ -136,7 +154,7 @@ public class AutoDiscardPlogon : IDalamudPlugin
ClickSelectYesNo.Using((nint)addon).Yes(); ClickSelectYesNo.Using((nint)addon).Yes();
_taskManager.DelayNext(20); _taskManager.DelayNext(20);
_taskManager.Enqueue(() => ContinueAfterDiscard(finishRetainerAction, inventoryType, slot)); _taskManager.Enqueue(() => ContinueAfterDiscard(type, inventoryType, slot));
} }
else else
{ {
@ -144,8 +162,10 @@ public class AutoDiscardPlogon : IDalamudPlugin
if (nextItem == null) if (nextItem == null)
{ {
PluginLog.Information("Addon is not visible, but next item is also no longer set"); PluginLog.Information("Addon is not visible, but next item is also no longer set");
if (finishRetainerAction) if (type == PostProcessType.Retainer)
_autoRetainerApi.FinishPostProcess(); _autoRetainerApi.FinishRetainerPostProcess();
else if (type == PostProcessType.Character)
_autoRetainerApi.FinishCharacterPostProcess();
else else
_chatGui.Print("Done discarding."); _chatGui.Print("Done discarding.");
} }
@ -154,26 +174,28 @@ public class AutoDiscardPlogon : IDalamudPlugin
PluginLog.Information( PluginLog.Information(
$"Addon is not (yet) visible, still trying to discard item in slot {slot} in inventory {inventoryType}"); $"Addon is not (yet) visible, still trying to discard item in slot {slot} in inventory {inventoryType}");
_taskManager.DelayNext(100); _taskManager.DelayNext(100);
_taskManager.Enqueue(() => ConfirmDiscardItem(finishRetainerAction, inventoryType, slot)); _taskManager.Enqueue(() => ConfirmDiscardItem(type, inventoryType, slot));
} }
else else
{ {
PluginLog.Information( PluginLog.Information(
$"Addon is not (yet) visible, but slot or inventory type changed, retrying from start"); $"Addon is not (yet) visible, but slot or inventory type changed, retrying from start");
_taskManager.DelayNext(100); _taskManager.DelayNext(100);
_taskManager.Enqueue(() => DiscardNextItem(finishRetainerAction)); _taskManager.Enqueue(() => DiscardNextItem(type));
} }
} }
} }
private unsafe void ContinueAfterDiscard(bool finishRetainerAction, InventoryType inventoryType, short slot) private unsafe void ContinueAfterDiscard(PostProcessType type, InventoryType inventoryType, short slot)
{ {
InventoryItem* nextItem = _inventoryUtils.GetNextItemToDiscard(); InventoryItem* nextItem = _inventoryUtils.GetNextItemToDiscard();
if (nextItem == null) if (nextItem == null)
{ {
PluginLog.Information($"Continuing after discard: no next item (retainer = {finishRetainerAction})"); PluginLog.Information($"Continuing after discard: no next item (type = {type})");
if (finishRetainerAction) if (type == PostProcessType.Retainer)
_autoRetainerApi.FinishPostProcess(); _autoRetainerApi.FinishRetainerPostProcess();
else if (type == PostProcessType.Character)
_autoRetainerApi.FinishCharacterPostProcess();
else else
_chatGui.Print("Done discarding."); _chatGui.Print("Done discarding.");
} }
@ -182,8 +204,10 @@ public class AutoDiscardPlogon : IDalamudPlugin
if (_cancelDiscardAfter < DateTime.Now) if (_cancelDiscardAfter < DateTime.Now)
{ {
PluginLog.Information("No longer waiting for plugin to pop up, assume discard failed"); PluginLog.Information("No longer waiting for plugin to pop up, assume discard failed");
if (finishRetainerAction) if (type == PostProcessType.Retainer)
_autoRetainerApi.FinishPostProcess(); _autoRetainerApi.FinishRetainerPostProcess();
else if (type == PostProcessType.Character)
_autoRetainerApi.FinishCharacterPostProcess();
else else
_chatGui.PrintError("Discarding probably failed due to an error."); _chatGui.PrintError("Discarding probably failed due to an error.");
} }
@ -191,18 +215,23 @@ public class AutoDiscardPlogon : IDalamudPlugin
{ {
PluginLog.Information($"ContinueAfterDiscard: Waiting for server response until {_cancelDiscardAfter}"); PluginLog.Information($"ContinueAfterDiscard: Waiting for server response until {_cancelDiscardAfter}");
_taskManager.DelayNext(20); _taskManager.DelayNext(20);
_taskManager.Enqueue(() => ContinueAfterDiscard(finishRetainerAction, inventoryType, slot)); _taskManager.Enqueue(() => ContinueAfterDiscard(type, inventoryType, slot));
} }
} }
else else
{ {
PluginLog.Information($"ContinueAfterDiscard: Discovered different item to discard"); PluginLog.Information($"ContinueAfterDiscard: Discovered different item to discard");
_taskManager.EnqueueImmediate(() => DiscardNextItem(finishRetainerAction)); _taskManager.EnqueueImmediate(() => DiscardNextItem(type));
} }
} }
public void Dispose() public void Dispose()
{ {
_autoRetainerApi.OnRetainerPostprocessStep -= CheckRetainerPostProcess;
_autoRetainerApi.OnRetainerReadyToPostprocess -= DoRetainerPostProcess;
_autoRetainerApi.OnCharacterPostprocessStep -= CheckCharacterPostProcess;
_autoRetainerApi.OnCharacterReadyToPostProcess -= DoCharacterPostProcess;
_autoRetainerApi.Dispose(); _autoRetainerApi.Dispose();
ECommonsMain.Dispose(); ECommonsMain.Dispose();
@ -240,4 +269,11 @@ public class AutoDiscardPlogon : IDalamudPlugin
return null; return null;
} }
public enum PostProcessType
{
Retainer,
Character,
FromCommand,
}
} }

9
ARDiscard/ConfigWindow.cs
View File

@ -57,6 +57,13 @@ public class ConfigWindow : Window
Save(); Save();
} }
bool runBeforeLogout = _configuration.RunBeforeLogout;
if (ImGui.Checkbox("[Global] Run before logging out in Multi-Mode", ref runBeforeLogout))
{
_configuration.RunBeforeLogout = runBeforeLogout;
Save();
}
if (ImGui.BeginTabBar("AutoDiscardTabs")) if (ImGui.BeginTabBar("AutoDiscardTabs"))
{ {
DrawDiscardList(); DrawDiscardList();
@ -181,7 +188,7 @@ public class ConfigWindow : Window
} }
else else
{ {
if (_configuration.RunAfterVenture) if (_configuration.RunAfterVenture || _configuration.RunBeforeLogout)
{ {
ImGui.TextColored(ImGuiColors.HealerGreen, ImGui.TextColored(ImGuiColors.HealerGreen,
"This character is currently included (and will be post-processed in autoretainer)."); "This character is currently included (and will be post-processed in autoretainer).");

1
ARDiscard/Configuration.cs
View File

@ -7,6 +7,7 @@ public class Configuration : IPluginConfiguration
{ {
public int Version { get; set; } = 1; public int Version { get; set; } = 1;
public bool RunAfterVenture { get; set; } public bool RunAfterVenture { get; set; }
public bool RunBeforeLogout { get; set; }
public List<uint> DiscardingItems { get; set; } = new(); public List<uint> DiscardingItems { get; set; } = new();
public List<CharacterInfo> ExcludedCharacters { get; set; } = new(); public List<CharacterInfo> ExcludedCharacters { get; set; } = new();