fix: key item fix and remove item fix.

ActionTimelineEx/Configurations/ActionSetting.cs

@@ -1,4 +1,4 @@
-using ActionTimeline.Helpers;
+using ActionTimelineEx.Helpers;
 using ECommons.DalamudServices;
 using ImGuiNET;
 using System.Numerics;

ActionTimelineEx/Configurations/Settings.cs

@@ -1,18 +1,17 @@
-using ActionTimelineEx.Configurations;
-using Dalamud.Configuration;
+using Dalamud.Configuration;
 using ECommons.DalamudServices;
 using ECommons.ExcelServices;
 using ECommons.GameHelpers;
 using System.Numerics;
 using XIVConfigUI.Attributes;
 
-namespace ActionTimeline;
+namespace ActionTimelineEx.Configurations;
 
 internal class TimelineChoicesAttribute : ChoicesAttribute
 {
     protected override Pair[] GetChoices()
     {
-        return [..Plugin.Settings.EditSetting?.RotationSettings.Select(i => i.Name)];
+        return [.. Plugin.Settings.EditSetting?.RotationSettings.Select(i => i.Name)];
     }
 }
 
@@ -109,12 +108,12 @@ public string RotationName
     [JsonIgnore]
     internal RotationsSetting? EditSetting { get; set; } = null;
 
-    private static readonly RotationsSetting EmptyHolder = new ();
+    private static readonly RotationsSetting EmptyHolder = new();
     public RotationsSetting GetSetting(uint territoryId)
     {
         if (!_rotationHelpers.TryGetValue(territoryId, out var dict)) _rotationHelpers[territoryId] = dict = [];
 
-        if(!Player.Available) return EmptyHolder;
+        if (!Player.Available) return EmptyHolder;
 
         var job = Player.Job;
         if (!dict.TryGetValue(job, out var result)) dict[job] = result = new();

ActionTimelineEx/Helpers/DrawHelper.cs

@@ -6,7 +6,7 @@
 using System.Numerics;
 using XIVConfigUI;
 
-namespace ActionTimeline.Helpers;
+namespace ActionTimelineEx.Helpers;
 
 internal static class DrawHelper
 {
@@ -28,11 +28,11 @@ public static void DrawActionIcon(this ImDrawListPtr drawList, uint iconId, bool
     }
 
     public static IDalamudTextureWrap? GetTextureFromIconId(uint iconId, bool highQuality = true)
-        => ImageLoader.GetTexture(new GameIconLookup( iconId, false, highQuality), out var texture) ? texture 
+        => ImageLoader.GetTexture(new GameIconLookup(iconId, false, highQuality), out var texture) ? texture
         : ImageLoader.GetTexture(new GameIconLookup(0, false, highQuality), out texture) ? texture : null;
 
     private static readonly Dictionary<uint, uint> textureColorCache = [];
-    private static readonly Queue<uint> calculating = new ();
+    private static readonly Queue<uint> calculating = new();
     public static uint GetTextureAverageColor(uint iconId)
     {
         if (textureColorCache.TryGetValue(iconId, out var color)) return color;
@@ -51,10 +51,10 @@ private static void CalculateColor()
 
         Task.Run(() =>
         {
-            while(calculating.TryDequeue(out var icon))
+            while (calculating.TryDequeue(out var icon))
             {
-                var tex = Svc.Data.GetFile<TexFile>($"ui/icon/{icon/1000:D3}000/{icon:D6}.tex");
-                if(tex == null)
+                var tex = Svc.Data.GetFile<TexFile>($"ui/icon/{icon / 1000:D3}000/{icon:D6}.tex");
+                if (tex == null)
                 {
                     textureColorCache[icon] = uint.MaxValue;
                     continue;

ActionTimelineEx/Helpers/RotationHelper.cs

@@ -1,5 +1,4 @@
-using ActionTimeline;
-using ActionTimelineEx.Configurations;
+using ActionTimelineEx.Configurations;
 using ActionTimelineEx.Windows;
 using ECommons.DalamudServices;
 using ECommons.GameHelpers;

ActionTimelineEx/Localization/Localization.json

@@ -1,133 +1,14 @@
 {
   "ActionTimelineEx.DescriptionAboutCommand": "Opens the ActionTimelineEx configuration window.\n `/atle reset` to reset the rotation helper count.",
-  "ActionTimeline.SettingsName.Record": "Record Data",
-  "ActionTimeline.SettingsName.ShowTimelineOnlyInDuty": "Show Only In Duty",
-  "ActionTimeline.SettingsName.ShowTimelineOnlyInCombat": "Show Only In Combat",
-  "ActionTimeline.SettingsName.HideTimelineInCutscene": "Hide In Cutscene",
-  "ActionTimeline.SettingsName.HideTimelineInQuestEvent": "Hide In Quest Event",
-  "ActionTimeline.SettingsName.SayClipping": "Say Clipping Time",
-  "ActionTimeline.SettingsName.ClippintTime": "Clipping Range",
-  "ActionTimeline.SettingsName.RecordTargetStatus": "Record Target Status",
-  "ActionTimeline.SettingsName.ShowDonate": "Show the donate link.",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.Name": "The timeline Name",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.Enable": "Enable",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.IsRotation": "Is Rotation",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.IsHorizonal": "Is Horizonal",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.IsReverse": "Is Reverse",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.Locked": "Locked",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.LockedBackgroundColor": "Locked Background Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.UnlockedBackgroundColor": "Unlocked Background Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.SizePerSecond": "Size per second",
-  "ActionTimelineEx.Configurations.DrawingSettingsDescription.SizePerSecond": "This is the width of every second drawn on the window.",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.TimeOffsetSetting": "Offset Time",
-  "ActionTimelineEx.Configurations.DrawingSettingsDescription.TimeOffsetSetting": "If your Is Rotation is on, this means the Offset time of rotation, or this is the advanced time about action using.",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.CenterOffset": "Center Offset",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GCDIconSize": "GCD Icon Size",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.ShowOGCD": "Show Off GCD",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.OGCDIconSize": "Off GCD Icon Size",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.OGCDOffset": "Off GCD Vertical Offset",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.ShowAutoAttack": "Show Auto Attack",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.AutoAttackIconSize": "Auto Attack Icon Size",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.AutoAttackOffset": "Auto Attack Offset",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.ShowStatus": "Show Status Gain Lose",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.StatusIconSize": "Status Icon Size",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.StatusIconAlpha": "Status Icon Alpha",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.StatusGainColor": "Status Gain Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.StatusLoseColor": "Status Lose Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.StatusOffset": "Status Offset",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.ShowDamageType": "Show Damage Type",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.DirectColor": "Direct Damage Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.CriticalColor": "Critical Damage Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.CriticalDirectColor": "Critical Direct Damage Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.BackgroundColor": "Bar Background Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GCDBorderColor": "GCD Border Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GCDThickness": "GCD Border Thickness",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GCDRound": "GCD Border Round",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GCDHeight": "GCD Bar Height",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.CastInProgressColor": "Cast In Progress Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.CastFinishedColor": "Cast Finished Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.CastCanceledColor": "Cast Canceled Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.ShowAnimationLock": "Show Animation Lock Time",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.AnimationLockColor": "Animation Lock Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.ShowStatusLine": "Show Status Line",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.StatusLineSize": "Status Line Height",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.ShowGrid": "Show Grid",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridStartLineWidth": "Start Line Width",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridStartLineColor": "Start Line Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.ShowGridCenterLine": "Show Center Line",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridCenterLineWidth": "Center Line Width",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridCenterLineColor": "Center Line Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridLineWidth": "Line Width",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridLineColor": "Line Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridDivideBySeconds": "Divide By Seconds",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridShowSecondsText": "Show Text",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridSubdivideSeconds": "Sub-Divide By Seconds",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridSubdivisionCount": "Sub-Division Count",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridSubdivisionLineWidth": "Sub-Division Line Width",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GridSubdivisionLineColor": "Sub-Division Line Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GCDClippingThreshold": "Threshold",
-  "ActionTimelineEx.Configurations.DrawingSettingsDescription.GCDClippingThreshold": "This can be used filter out \"false positives\" due to latency or other factors. Any GCD clipping detected that is shorter than this value will be ignored.\nIt is strongly recommended that you test out different values and find out what works best for your setup.",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GCDClippingMaxTime": "Max Time",
-  "ActionTimelineEx.Configurations.DrawingSettingsDescription.GCDClippingMaxTime": "Any GCD clip longer than this will be capped",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GCDClippingColor": "Color",
-  "ActionTimelineEx.Configurations.DrawingSettingsName.GCDClippingTextColor": "Text Color",
-  "ActionTimelineEx.Configurations.GroupItem.General": "General",
-  "ActionTimelineEx.Configurations.GroupItem.Icons": "Icons",
-  "ActionTimelineEx.Configurations.GroupItem.Bar": "Bar",
-  "ActionTimelineEx.Configurations.GroupItem.Grid": "Grid",
-  "ActionTimelineEx.Configurations.GroupItem.GcdClipping": "GCD Clipping",
-  "ActionTimelineEx.Configurations.UiString.Setting": "Setting",
-  "ActionTimelineEx.Configurations.UiString.ShowedStatuses": "Showed Statuses",
-  "ActionTimelineEx.Configurations.UiString.NotStatues": "Don't record these statuses",
-  "ActionTimelineEx.Configurations.UiString.Wait": "Please wait for a second.",
-  "ActionTimelineEx.Configurations.UiString.Confirm": "Are you sure to remove this timeline?",
-  "ActionTimelineEx.Configurations.UiString.Remove": "Click to remove this timeline.",
-  "ActionTimelineEx.Configurations.UiString.AddOne": "Add One Timeline",
-  "ActionTimelineEx.Configurations.UiString.RemoveDesc": "Remove this Item:",
-  "XIVConfigUI.LocalString.Search_Result": "Search Result",
-  "XIVConfigUI.LocalString.Searching": "Search... ",
-  "XIVConfigUI.LocalString.Search": "Search",
-  "XIVConfigUI.LocalString.ResetToDefault": "Reset to Default Value.",
-  "XIVConfigUI.LocalString.ExecuteCommand": "Execute \"{0}\"",
-  "XIVConfigUI.LocalString.CopyCommand": "Copy \"{0}\"",
-  "XIVConfigUI.LocalString.Localization": "Click to open the crowdin for modifying localization!",
-  "XIVConfigUI.LocalString.SourceCode": "Click to see the source code!",
-  "XIVConfigUI.LocalString.Remove": "Remove",
-  "XIVConfigUI.LocalString.MoveUp": "Move Up",
-  "XIVConfigUI.LocalString.MoveDown": "Move Down",
-  "XIVConfigUI.LocalString.CopyToClipboard": "Copy to Clipboard",
-  "XIVConfigUI.LocalString.FromClipboard": "From Clipboard",
-  "XIVConfigUI.LocalString.List": "List",
-  "XIVConfigUI.LocalString.Nothing": "No items in Combo",
-  "XIVConfigUI.Attributes.ConfigUnitType.Seconds": "Time Unit, in seconds.",
-  "XIVConfigUI.Attributes.ConfigUnitType.Degree": "Angle Unit, in degrees.",
-  "XIVConfigUI.Attributes.ConfigUnitType.Yalms": "Distance Unit, in yalms.",
-  "XIVConfigUI.Attributes.ConfigUnitType.Percent": "Ratio Unit, as percentage.",
-  "XIVConfigUI.Attributes.ConfigUnitType.Pixels": "Display Unit, in pixels.",
   "ActionTimelineEx.Punchline": "Show your actions in real-time.",
-  "ActionTimelineEx.Description": "Configurable timeline display of all the actions you use.",
-  "ActionTimelineEx.Windows.ChangeLogItem": "ChangeLog",
-  "ActionTimeline.SettingsName.DrawRotation": "Draw Rotation",
-  "ActionTimeline.SettingsName.RotationChoice": "Rotation Choice",
-  "ActionTimeline.SettingsName.RotationName": "Rotation Name",
-  "ActionTimeline.SettingsName.RotationCount": "Rotation Count",
-  "ActionTimeline.SettingsName.RotationHighlightColor": "Rotation Highlight Color",
-  "ActionTimeline.SettingsName.Position": "Rotation Position",
-  "ActionTimeline.SettingsName.RotationLocked": "Locked",
-  "ActionTimeline.SettingsName.RotationLockedBackgroundColor": "Locked Background Color",
-  "ActionTimeline.SettingsName.RotationUnlockedBackgroundColor": "Unlocked Background Color",
-  "ActionTimeline.SettingsName.GCDIconSize": "GCD Icon Size",
-  "ActionTimeline.SettingsName.OGCDIconSize": "Off GCD Icon Size",
-  "ActionTimeline.SettingsName.IconSpacing": "Icon Spacing",
-  "ActionTimelineEx.Configurations.UiString.RotationSetting": "Rotation Setting",
-  "ActionTimelineEx.Configurations.UiString.Rotation": "Rotation",
+  "XIVConfigUI.LocalString.Searching": "Search... ",
   "ActionTimelineEx.Windows.RotationHelperItem": "Rotation Helper",
-  "ActionTimelineEx.Configurations.ActionSetting": "ActionSetting",
-  "ActionTimelineEx.Configurations.ActionSettingType.Action": "Action",
-  "ActionTimelineEx.Configurations.ActionSettingType.Item": "Item",
-  "ActionTimelineEx.Configurations.ActionSettingName.Type": "Type",
-  "ActionTimelineEx.Configurations.ActionSettingName.Id": "Id",
-  "ActionTimelineEx.Configurations.ActionSettingDescription": "Maim (GCD)",
-  "ActionTimelineEx.Configurations.UiString.RotationReset": "Reset Count",
-  "ActionTimeline.SettingsName.ShowWrongClick": "Show the wrong clicking"
+  "ActionTimelineEx.Windows.ChangeLogItem": "ChangeLog",
+  "ActionTimelineEx.Description": "Configurable timeline display of all the actions you use.",
+  "XIVConfigUI.LocalString.SourceCode": "Click to see the source code!",
+  "XIVConfigUI.LocalString.Localization": "Click to open the crowdin for modifying localization!",
+  "ActionTimelineEx.Configurations.UiString.AddOne": "Add One Timeline",
+  "ActionTimelineEx.Configurations.UiString.Setting": "Setting",
+  "ActionTimelineEx.Configurations.UiString.ShowedStatuses": "Showed Statuses",
+  "ActionTimelineEx.Configurations.UiString.NotStatues": "Don't record these statuses"
 }

ActionTimelineEx/Plugin.cs

@@ -1,7 +1,6 @@
-using ActionTimeline.Timeline;
-using ActionTimeline.Windows;
-using ActionTimelineEx.Configurations;
+using ActionTimelineEx.Configurations;
 using ActionTimelineEx.Helpers;
+using ActionTimelineEx.Timeline;
 using ActionTimelineEx.Windows;
 using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Interface.Windowing;
@@ -12,7 +11,7 @@
 using XIVConfigUI;
 using XIVDrawer;
 
-namespace ActionTimeline;
+namespace ActionTimelineEx;
 
 public class Plugin : IDalamudPlugin
 {
@@ -156,16 +155,16 @@ private static bool ShowTimeline()
             return false;
         }
 
-        if (Settings.HideTimelineInCutscene 
-            && (Svc.Condition[ConditionFlag.WatchingCutscene] 
+        if (Settings.HideTimelineInCutscene
+            && (Svc.Condition[ConditionFlag.WatchingCutscene]
             || Svc.Condition[ConditionFlag.WatchingCutscene78]
             || Svc.Condition[ConditionFlag.OccupiedInCutSceneEvent]))
         {
             return false;
         }
 
-        if (Settings.HideTimelineInQuestEvent 
-            && (Svc.Condition[ConditionFlag.OccupiedInQuestEvent]))
+        if (Settings.HideTimelineInQuestEvent
+            && Svc.Condition[ConditionFlag.OccupiedInQuestEvent])
         {
             return false;
         }

ActionTimelineEx/Timeline/ActionCate.cs

@@ -1,4 +1,4 @@
-namespace RotationSolver.Basic.Data;
+namespace ActionTimelineEx.Timeline;
 
 /// <summary>
 /// The action Category.

ActionTimelineEx/Timeline/StatusLineItem.cs

@@ -1,5 +1,5 @@
-using ActionTimeline.Helpers;
-using ActionTimelineEx.Configurations;
+using ActionTimelineEx.Configurations;
+using ActionTimelineEx.Helpers;
 using Dalamud.Interface.Textures.TextureWraps;
 using ImGuiNET;
 using System.Numerics;

ActionTimelineEx/Timeline/TimelineItem.cs

@@ -1,5 +1,5 @@
-using ActionTimeline.Helpers;
-using ActionTimelineEx.Configurations;
+using ActionTimelineEx.Configurations;
+using ActionTimelineEx.Helpers;
 using Dalamud.Interface;
 using Dalamud.Interface.Textures.TextureWraps;
 using ImGuiNET;