From 4178733806eaeacfed466c81ea9bd2d1ebf1dafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?=
 <53346444+ArchiDog1998@users.noreply.github.com>
Date: Sat, 27 Jul 2024 22:42:33 +0800
Subject: [PATCH] fix: remove the custom recast time.

---
 .../Configurations/Actions/GCDAction.cs       | 23 +------------------
 ActionTimelineEx/Configurations/Settings.cs   |  2 --
 XIVConfigUI                                   |  2 +-
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/ActionTimelineEx/Configurations/Actions/GCDAction.cs b/ActionTimelineEx/Configurations/Actions/GCDAction.cs
index 9d94a83..5259c1d 100644
--- a/ActionTimelineEx/Configurations/Actions/GCDAction.cs
+++ b/ActionTimelineEx/Configurations/Actions/GCDAction.cs
@@ -1,11 +1,9 @@
 using ActionTimelineEx.Helpers;
-using ECommons.DalamudServices;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using ImGuiNET;
 using System.ComponentModel;
 using System.Numerics;
 using XIVConfigUI.Attributes;
-using Action = Lumina.Excel.GeneratedSheets.Action;
 
 namespace ActionTimelineEx.Configurations.Actions;
 
@@ -14,26 +12,7 @@ public class GCDAction : ActionSetting
 {
     internal override ActionSettingType Type => ActionSettingType.Action;
 
-    internal float Gcd
-    {
-        get
-        {
-            var recastTime = Svc.Data.GetExcelSheet<Action>()?.GetRow(ActionId)?.Recast100ms ?? 0;
-
-            return GcdOverride == 0
-            ? Plugin.Settings.RotationHelper.GcdTime / 2.5f * recastTime / 10f
-            : GcdOverride;
-        }
-    }
-
-    [JsonIgnore]
-    [Range(0, 20, ConfigUnitType.Seconds)]
-    [UI("Recast time override")]
-    public float GcdOverride
-    {
-        get => Plugin.Settings.ActionRecast.TryGetValue(ActionId, out var v) ? v : 0f;
-        set => Plugin.Settings.ActionRecast[ActionId] = value;
-    }
+    internal float Gcd => ActionManager.GetAdjustedRecastTime(FFXIVClientStructs.FFXIV.Client.Game.ActionType.Action, ActionId) / 1000f;
 
     [UI]
     public List<oGCDAction> oGCDs { get; set; } = [];
diff --git a/ActionTimelineEx/Configurations/Settings.cs b/ActionTimelineEx/Configurations/Settings.cs
index c8cd309..c0ca48d 100644
--- a/ActionTimelineEx/Configurations/Settings.cs
+++ b/ActionTimelineEx/Configurations/Settings.cs
@@ -148,8 +148,6 @@ internal RotationsSetting RotationHelper
 
     private static readonly RotationsSetting EmptyHolder = new();
 
-    public Dictionary<uint, float> ActionRecast { get; set; } = [];
-
     public int Version { get; set; } = 6;
 
     public void Save()
diff --git a/XIVConfigUI b/XIVConfigUI
index aa82808..77509c8 160000
--- a/XIVConfigUI
+++ b/XIVConfigUI
@@ -1 +1 @@
-Subproject commit aa82808b06bdbc16517f8ae8166d3b6769aaac74
+Subproject commit 77509c8fc646e51335ab549a0a4d7b36cc8a6964