liza/Influx
liza/Influx
1
0
Fork 1
Code Issues Pull Requests 1 Releases 23 Activity

Added auto enroll feature #1

Open
Asuna wants to merge 4 commits from Asuna/Influx:master into master
pull from: Asuna/Influx:master
merge into: liza:master
Conversation 0 Commits 4 Files Changed 5 +85 -23
5 changed files with 85 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Influx.sln
View File

@ -1,34 +1,58 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Influx", "Influx\Influx.csproj", "{588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}" # Visual Studio Version 17
VisualStudioVersion = 17.11.35222.181
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Influx", "Influx\Influx.csproj", "{588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "LLib\LLib.csproj", "{C11552A8-9C8C-4084-A669-AAFE55E24DCC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LLib", "LLib\LLib.csproj", "{C11552A8-9C8C-4084-A669-AAFE55E24DCC}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ECommons", "ECommons\ECommons\ECommons.csproj", "{FC6E184C-5B01-4298-87DF-CC10C4955936}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ECommons", "ECommons\ECommons\ECommons.csproj", "{FC6E184C-5B01-4298-87DF-CC10C4955936}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRetainerAPI", "AutoRetainerAPI\AutoRetainerAPI\AutoRetainerAPI.csproj", "{7352C470-D652-4909-AD90-8A5171A86698}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoRetainerAPI", "AutoRetainerAPI\AutoRetainerAPI\AutoRetainerAPI.csproj", "{7352C470-D652-4909-AD90-8A5171A86698}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU DebugForms|x64 = DebugForms|x64
Release|x64 = Release|x64
ReleaseForms|x64 = ReleaseForms|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.Debug|x64.ActiveCfg = Debug|x64
{588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.Debug|Any CPU.Build.0 = Debug|Any CPU {588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.Debug|x64.Build.0 = Debug|x64
{588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.Release|Any CPU.ActiveCfg = Release|Any CPU {588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.DebugForms|x64.ActiveCfg = Debug|x64
{588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.Release|Any CPU.Build.0 = Release|Any CPU {588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.DebugForms|x64.Build.0 = Debug|x64
{C11552A8-9C8C-4084-A669-AAFE55E24DCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.Release|x64.ActiveCfg = Release|x64
{C11552A8-9C8C-4084-A669-AAFE55E24DCC}.Debug|Any CPU.Build.0 = Debug|Any CPU {588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.Release|x64.Build.0 = Release|x64
{C11552A8-9C8C-4084-A669-AAFE55E24DCC}.Release|Any CPU.ActiveCfg = Release|Any CPU {588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.ReleaseForms|x64.ActiveCfg = Release|x64
{C11552A8-9C8C-4084-A669-AAFE55E24DCC}.Release|Any CPU.Build.0 = Release|Any CPU {588F6FDE-C6DF-42D9-BD7A-941BE2EB7E44}.ReleaseForms|x64.Build.0 = Release|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.Debug|Any CPU.ActiveCfg = Debug|x64 {C11552A8-9C8C-4084-A669-AAFE55E24DCC}.Debug|x64.ActiveCfg = Debug|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.Debug|Any CPU.Build.0 = Debug|x64 {C11552A8-9C8C-4084-A669-AAFE55E24DCC}.Debug|x64.Build.0 = Debug|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.Release|Any CPU.ActiveCfg = Release|x64 {C11552A8-9C8C-4084-A669-AAFE55E24DCC}.DebugForms|x64.ActiveCfg = Debug|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.Release|Any CPU.Build.0 = Release|x64 {C11552A8-9C8C-4084-A669-AAFE55E24DCC}.DebugForms|x64.Build.0 = Debug|x64
{7352C470-D652-4909-AD90-8A5171A86698}.Debug|Any CPU.ActiveCfg = Debug|x64 {C11552A8-9C8C-4084-A669-AAFE55E24DCC}.Release|x64.ActiveCfg = Release|x64
{7352C470-D652-4909-AD90-8A5171A86698}.Debug|Any CPU.Build.0 = Debug|x64 {C11552A8-9C8C-4084-A669-AAFE55E24DCC}.Release|x64.Build.0 = Release|x64
{7352C470-D652-4909-AD90-8A5171A86698}.Release|Any CPU.ActiveCfg = Release|x64 {C11552A8-9C8C-4084-A669-AAFE55E24DCC}.ReleaseForms|x64.ActiveCfg = Release|x64
{7352C470-D652-4909-AD90-8A5171A86698}.Release|Any CPU.Build.0 = Release|x64 {C11552A8-9C8C-4084-A669-AAFE55E24DCC}.ReleaseForms|x64.Build.0 = Release|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.Debug|x64.ActiveCfg = Debug|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.Debug|x64.Build.0 = Debug|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.DebugForms|x64.ActiveCfg = DebugForms|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.DebugForms|x64.Build.0 = DebugForms|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.Release|x64.ActiveCfg = Release|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.Release|x64.Build.0 = Release|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.ReleaseForms|x64.ActiveCfg = ReleaseForms|x64
{FC6E184C-5B01-4298-87DF-CC10C4955936}.ReleaseForms|x64.Build.0 = ReleaseForms|x64
{7352C470-D652-4909-AD90-8A5171A86698}.Debug|x64.ActiveCfg = Debug|x64
{7352C470-D652-4909-AD90-8A5171A86698}.Debug|x64.Build.0 = Debug|x64
{7352C470-D652-4909-AD90-8A5171A86698}.DebugForms|x64.ActiveCfg = Debug|x64
{7352C470-D652-4909-AD90-8A5171A86698}.DebugForms|x64.Build.0 = Debug|x64
{7352C470-D652-4909-AD90-8A5171A86698}.Release|x64.ActiveCfg = Release|x64
{7352C470-D652-4909-AD90-8A5171A86698}.Release|x64.Build.0 = Release|x64
{7352C470-D652-4909-AD90-8A5171A86698}.ReleaseForms|x64.ActiveCfg = Release|x64
{7352C470-D652-4909-AD90-8A5171A86698}.ReleaseForms|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

1
Influx/Configuration.cs
View File

@ -8,6 +8,7 @@ internal sealed class Configuration : IPluginConfiguration
public int Version { get; set; } = 1; public int Version { get; set; } = 1;
public ServerConfiguration Server { get; set; } = new(); public ServerConfiguration Server { get; set; } = new();
public bool AutoEnrollCharacters { get; set; }
public IList<CharacterInfo> IncludedCharacters { get; set; } = new List<CharacterInfo>(); public IList<CharacterInfo> IncludedCharacters { get; set; } = new List<CharacterInfo>();
public IList<FilterInfo> IncludedInventoryFilters { get; set; } = new List<FilterInfo>(); public IList<FilterInfo> IncludedInventoryFilters { get; set; } = new List<FilterInfo>();

30
Influx/InfluxPlugin.cs
View File

@ -8,6 +8,7 @@ using Dalamud.Game.Command;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Plugin; using Dalamud.Plugin;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using ECommons;
using Influx.AllaganTools; using Influx.AllaganTools;
using Influx.Influx; using Influx.Influx;
using Influx.LocalStatistics; using Influx.LocalStatistics;
@ -65,7 +66,13 @@ internal sealed class InfluxPlugin : IDalamudPlugin
_configurationWindow.ConfigUpdated += (_, _) => _influxStatisticsClient.UpdateClient(); _configurationWindow.ConfigUpdated += (_, _) => _influxStatisticsClient.UpdateClient();
_windowSystem.AddWindow(_configurationWindow); _windowSystem.AddWindow(_configurationWindow);
_commandManager.AddHandler("/influx", new CommandInfo(ProcessCommand)); _commandManager.AddHandler("/influx", new CommandInfo(ProcessCommand)
{
HelpMessage = """
Opens influx configuration
/influx gil - Opens influx statistics
"""
});
_timer = new Timer(TimeSpan.FromMinutes(1)); _timer = new Timer(TimeSpan.FromMinutes(1));
_timer.Elapsed += (_, _) => UpdateStatistics(); _timer.Elapsed += (_, _) => UpdateStatistics();
@ -74,7 +81,10 @@ internal sealed class InfluxPlugin : IDalamudPlugin
_pluginInterface.UiBuilder.Draw += _windowSystem.Draw; _pluginInterface.UiBuilder.Draw += _windowSystem.Draw;
_pluginInterface.UiBuilder.OpenConfigUi += _configurationWindow.Toggle; _pluginInterface.UiBuilder.OpenConfigUi += _configurationWindow.Toggle;
_pluginInterface.UiBuilder.OpenMainUi += _statisticsWindow.Toggle;
_condition.ConditionChange += UpdateOnLogout; _condition.ConditionChange += UpdateOnLogout;
_clientState.Login += AutoEnrollCharacter;
} }
private Configuration LoadConfig() private Configuration LoadConfig()
@ -194,6 +204,22 @@ internal sealed class InfluxPlugin : IDalamudPlugin
return allSubs; return allSubs;
} }
private void AutoEnrollCharacter()
{
if (_configuration.AutoEnrollCharacters)
{
_configuration.IncludedCharacters.Add(new Configuration.CharacterInfo
{
LocalContentId = _clientState.LocalContentId,
CachedPlayerName = _clientState.LocalPlayer?.Name.ToString() ?? "??",
CachedWorldName = _clientState.LocalPlayer?.HomeWorld.Value.Name.ToString(),
});
_pluginInterface.SavePluginConfig(_configuration);
}
}
private void UpdateOnLogout(ConditionFlag flag, bool value) private void UpdateOnLogout(ConditionFlag flag, bool value)
{ {
if (flag == ConditionFlag.LoggingOut && value) if (flag == ConditionFlag.LoggingOut && value)
@ -220,9 +246,11 @@ internal sealed class InfluxPlugin : IDalamudPlugin
_timer.Dispose(); _timer.Dispose();
_windowSystem.RemoveAllWindows(); _windowSystem.RemoveAllWindows();
_commandManager.RemoveHandler("/influx"); _commandManager.RemoveHandler("/influx");
_commandManager.RemoveHandler("/influx gil");
_influxStatisticsClient.Dispose(); _influxStatisticsClient.Dispose();
_fcStatsCalculator.Dispose(); _fcStatsCalculator.Dispose();
_localStatsCalculator.Dispose(); _localStatsCalculator.Dispose();
_allaganToolsIpc.Dispose(); _allaganToolsIpc.Dispose();
_clientState.Login -= AutoEnrollCharacter;
} }
} }

2
Influx/LocalStatistics/LocalStatsCalculator.cs
View File

@ -243,6 +243,8 @@ internal sealed class LocalStatsCalculator : IDisposable
} }
} }
private unsafe List<short> ExtractClassJobLevels(PlayerState* playerState) private unsafe List<short> ExtractClassJobLevels(PlayerState* playerState)
{ {
List<short> levels = new(); List<short> levels = new();

7
Influx/Windows/ConfigurationWindow.cs
View File

@ -103,6 +103,13 @@ internal sealed class ConfigurationWindow : Window
if (!tabItem) if (!tabItem)
return; return;
var refIncludeAll = _configuration.AutoEnrollCharacters;
if (ImGui.Checkbox("Auto enroll characters on login", ref refIncludeAll))
{
_configuration.AutoEnrollCharacters = refIncludeAll;
liza commented 2025-01-06 00:36:27 +00:00
Review
Copy Link

This is probably missing a Save(true); if I'm not mistaken.

This is probably missing a `Save(true);` if I'm not mistaken.
Asuna commented 2025-01-06 17:46:37 +00:00
Review
Copy Link

Thanks!! Fixed and will repush in a sec

Thanks!! Fixed and will repush in a sec
Save(true);
}
if (_clientState is { IsLoggedIn: true, LocalContentId: > 0, LocalPlayer.HomeWorld.RowId: > 0 }) if (_clientState is { IsLoggedIn: true, LocalContentId: > 0, LocalPlayer.HomeWorld.RowId: > 0 })
{ {
string worldName = _clientState.LocalPlayer.HomeWorld.Value.Name.ToString(); string worldName = _clientState.LocalPlayer.HomeWorld.Value.Name.ToString();