fix: update watcher.

ArchiDog1998 · May 24, 2023 · 76816e0 · 76816e0
1 parent 537c7cc
commit 76816e0
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 307 deletions.
diff --git a/RotationSolver.Basic/Data/ActionEffect.cs b/RotationSolver.Basic/Data/ActionEffect.cs
diff --git a/RotationSolver.Basic/Data/ActionEffectHeader.cs b/RotationSolver.Basic/Data/ActionEffectHeader.cs
diff --git a/RotationSolver.Basic/Data/ActionEffectSet.cs b/RotationSolver.Basic/Data/ActionEffectSet.cs
diff --git a/RotationSolver.Basic/Data/ActionEffectType.cs b/RotationSolver.Basic/Data/ActionEffectType.cs
diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -17,8 +17,8 @@ public static class DataCenter
     internal static DateTime EffectEndTime { private get; set; } = DateTime.Now;
 
     internal static bool InEffectTime => DateTime.Now >= EffectTime && DateTime.Now <= EffectEndTime;
-    internal static Dictionary<uint, ushort> HealHP { get; set; } = new Dictionary<uint, ushort>();
-    internal static Dictionary<uint, ushort> ApplyStatus { private get; set; } = new Dictionary<uint, ushort>();
+    internal static Dictionary<ulong, uint> HealHP { get; set; } = new Dictionary<ulong, uint>();
+    internal static Dictionary<ulong, uint> ApplyStatus { private get; set; } = new Dictionary<ulong, uint>();
     internal static uint MPGain { get; set; }
     internal static bool HasApplyStatus(uint id, StatusID[] ids)
     {

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs b/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs
@@ -136,7 +136,7 @@ public abstract partial class CustomRotation
     protected static float WeaponElapsed => DataCenter.WeaponElapsed;
     #endregion
 
-    protected static ClientLanguage Language => Service.Language;
+    protected static ClientLanguage Language => Svc.ClientState.ClientLanguage;
     protected static TerritoryContentType TerritoryContentType => DataCenter.TerritoryContentType;
 
     protected static float Ping => DataCenter.Ping;

diff --git a/RotationSolver.Basic/Service.cs b/RotationSolver.Basic/Service.cs
@@ -21,7 +21,6 @@ public static class Service
 
     public static float CountDownTime => Countdown.TimeRemaining;
 
-
     public static PluginConfiguration Config { get; set; }
     public static PluginConfiguration Default { get; } = new PluginConfiguration();
 
@@ -31,7 +30,6 @@ public static ActionID GetAdjustedActionId(ActionID id)
     public static unsafe uint GetAdjustedActionId(uint id)
     => ActionManager.Instance()->GetAdjustedActionId(id);
 
-
     public unsafe static IEnumerable<IntPtr> GetAddons<T>() where T : struct
     {
         if(typeof(T).GetCustomAttribute<Addon>() is not Addon on) return Array.Empty<nint>();
@@ -45,7 +43,4 @@ public unsafe static IEnumerable<IntPtr> GetAddons<T>() where T : struct
 
     internal static TextureWrap GetTextureIcon(uint id) => Svc.Data.GetImGuiTextureIcon(id);
     internal static TextureWrap GetTexture(string path) => Svc.Data.GetImGuiTexture(path);
-
-    public static ClientLanguage Language => Svc.ClientState.ClientLanguage;
-
 }
diff --git a/RotationSolver/RotationSolverPlugin.cs b/RotationSolver/RotationSolverPlugin.cs
@@ -58,8 +58,8 @@ public RotationSolverPlugin(DalamudPluginInterface pluginInterface)
         Svc.PluginInterface.UiBuilder.Draw += OverlayWindow.Draw;
 
         MajorUpdater.Enable();
+        Watcher.Enable();
         OtherConfiguration.Init();
-        _dis.Add(new Watcher());
         _dis.Add(new MovingController());
         _dis.Add(new LocalizationManager());
 #if DEBUG
@@ -91,6 +91,8 @@ internal static void ChangeUITranslation()
     public void Dispose()
     {
         RSCommands.Disable();
+        Watcher.Disable();
+
         Svc.PluginInterface.UiBuilder.OpenConfigUi -= OnOpenConfigUi;
         Svc.PluginInterface.UiBuilder.Draw -= windowSystem.Draw;
         Svc.PluginInterface.UiBuilder.Draw -= OverlayWindow.Draw;