Replace system.threading.timer with system.timers.timer

master v0.10
Liza 2024-03-06 01:18:20 +01:00
parent 72ba501bd6
commit b8fa10500e
Signed by: liza
GPG Key ID: 7199F8D727D55F67
2 changed files with 9 additions and 14 deletions

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework> <TargetFramework>net7.0-windows</TargetFramework>
<Version>0.9</Version> <Version>0.10</Version>
<LangVersion>11.0</LangVersion> <LangVersion>11.0</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

View File

@ -2,28 +2,17 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Timers;
using System.Threading;
using AutoRetainerAPI;
using Dalamud.Game.Addon.Lifecycle;
using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
using Dalamud.Game.Command; using Dalamud.Game.Command;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Memory;
using Dalamud.Plugin; using Dalamud.Plugin;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using ECommons;
using ECommons.Automation;
using FFXIVClientStructs.FFXIV.Client.System.Framework;
using FFXIVClientStructs.FFXIV.Client.UI.Info;
using FFXIVClientStructs.FFXIV.Component.GUI;
using Influx.AllaganTools; using Influx.AllaganTools;
using Influx.Influx; using Influx.Influx;
using Influx.LocalStatistics; using Influx.LocalStatistics;
using Influx.SubmarineTracker; using Influx.SubmarineTracker;
using Influx.Windows; using Influx.Windows;
using LLib; using LLib;
using Task = System.Threading.Tasks.Task;
namespace Influx; namespace Influx;
@ -72,7 +61,12 @@ public class InfluxPlugin : IDalamudPlugin
_windowSystem.AddWindow(_configurationWindow); _windowSystem.AddWindow(_configurationWindow);
_commandManager.AddHandler("/influx", new CommandInfo(ProcessCommand)); _commandManager.AddHandler("/influx", new CommandInfo(ProcessCommand));
_timer = new Timer(_ => UpdateStatistics(), null, TimeSpan.Zero, TimeSpan.FromMinutes(1));
_timer = new Timer(TimeSpan.FromMinutes(1));
_timer.Elapsed += (_, _) => UpdateStatistics();
_timer.AutoReset = true;
_timer.Enabled = true;
_pluginInterface.UiBuilder.Draw += _windowSystem.Draw; _pluginInterface.UiBuilder.Draw += _windowSystem.Draw;
_pluginInterface.UiBuilder.OpenConfigUi += _configurationWindow.Toggle; _pluginInterface.UiBuilder.OpenConfigUi += _configurationWindow.Toggle;
} }
@ -158,6 +152,7 @@ public class InfluxPlugin : IDalamudPlugin
{ {
_pluginInterface.UiBuilder.OpenConfigUi -= _configurationWindow.Toggle; _pluginInterface.UiBuilder.OpenConfigUi -= _configurationWindow.Toggle;
_pluginInterface.UiBuilder.Draw -= _windowSystem.Draw; _pluginInterface.UiBuilder.Draw -= _windowSystem.Draw;
_timer.Stop();
_timer.Dispose(); _timer.Dispose();
_windowSystem.RemoveAllWindows(); _windowSystem.RemoveAllWindows();
_commandManager.RemoveHandler("/influx"); _commandManager.RemoveHandler("/influx");