fix: simplify data recording.

ArchiDog1998 · Jul 22, 2024 · 9ffe44c · 9ffe44c
1 parent 7710096
commit 9ffe44c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/ActionTimelineEx/Configurations/Actions/ActionSetting.cs b/ActionTimelineEx/Configurations/Actions/ActionSetting.cs
@@ -27,6 +27,7 @@ public abstract class ActionSetting
 
     private uint _actionId;
 
+    [JsonIgnore]
     public bool IsEmpty => ActionId == 0;
 
     public uint ActionId
@@ -41,6 +42,7 @@ public uint ActionId
         }
     }
 
+    [JsonIgnore]
     [UI("Action ID")]
     public int ActionID { get => (int) ActionId; set => ActionId = (uint)value; }
 

diff --git a/ActionTimelineEx/Configurations/Actions/ActionSettingAttribute.cs b/ActionTimelineEx/Configurations/Actions/ActionSettingAttribute.cs
@@ -4,7 +4,6 @@
 using FFXIVClientStructs.FFXIV.Client.Game;
 using ImGuiNET;
 using Lumina.Excel.GeneratedSheets;
-using System;
 using System.Numerics;
 using XIVConfigUI;
 using XIVConfigUI.Attributes;

diff --git a/ActionTimelineEx/Configurations/RotationSetting.cs b/ActionTimelineEx/Configurations/RotationSetting.cs
@@ -40,9 +40,9 @@ public void Draw(float heightReduce)
     {
         var gcdHeight = Plugin.Settings.GCDIconSize;
         var spacing = Plugin.Settings.IconSpacing;
-        var drawList = ImGui.GetBackgroundDrawList();
+        var drawList = ImGui.GetWindowDrawList();
 
-        var wholeHeight = ImGui.GetWindowPos().Y - heightReduce;
+        var wholeHeight = ImGui.GetWindowSize().Y - heightReduce;
         var windowPos = ImGui.GetWindowPos() + Vector2.UnitY * heightReduce;
 
         var pos = windowPos + new Vector2(gcdHeight * 0.2f,

diff --git a/ActionTimelineEx/Localization/Localization.json b/ActionTimelineEx/Localization/Localization.json
@@ -1,5 +1,5 @@
 {
-  "ActionTimelineEx.DescriptionAboutCommand": "Opens the ActionTimelineEx configuration window.\n `/atle reset` to reset the rotation helper count.",
+  "ActionTimelineEx.DescriptionAboutCommand": "Opens the ActionTimelineEx configuration window.\n\"/atle reset\" to reset the rotation helper count.\n\"/atle toggle\" to toggle the rotation helper's visibility.",
   "ActionTimelineEx.Punchline": "Show your actions in real-time.",
   "XIVConfigUI.LocalString.Searching": "Search... ",
   "ActionTimelineEx.Windows.RotationHelperItem": "Rotation Helper",
@@ -154,11 +154,11 @@
   "ActionTimelineEx.Helpers.ActionType.SystemAction": "SystemAction",
   "ActionTimelineEx.Helpers.ActionType.LimitBreak": "LimitBreak",
   "ActionTimelineEx.Helpers.ActionType.DutyAction": "DutyAction",
-  "ActionTimelineEx.Configurations.Actions.GCDActionDescription": "Inner Chaos (GCD)",
+  "ActionTimelineEx.Configurations.Actions.GCDActionDescription": "Fell Cleave (GCD)",
   "ActionTimelineEx.Configurations.Actions.oGCDActionName.ActionType": "Type",
   "ActionTimelineEx.Configurations.Actions.ActionSettingType.Action": "Action",
   "ActionTimelineEx.Configurations.Actions.ActionSettingType.Item": "Item",
-  "ActionTimelineEx.Configurations.Actions.oGCDActionDescription": "Infuriate (oGCD)",
+  "ActionTimelineEx.Configurations.Actions.oGCDActionDescription": "Inner Release (oGCD)",
   "ActionTimelineEx.Configurations.Actions.ActionSetting": "ActionSetting",
   "ActionTimelineEx.Configurations.Actions.ActionSettingDescription": "Heavy Swing (GCD)",
   "ActionTimelineEx.Configurations.Actions.ActionSettingName.ActionID": "Action ID",

diff --git a/ActionTimelineEx/Plugin.cs b/ActionTimelineEx/Plugin.cs
@@ -67,7 +67,7 @@ public class Plugin : IDalamudPlugin
     public Plugin(IDalamudPluginInterface pluginInterface)
     {
         ECommonsMain.Init(pluginInterface, this);
-        XIVConfigUIMain.Init(pluginInterface, "/atle", "Opens the ActionTimelineEx configuration window.\n `/atle reset` to reset the rotation helper count.", PluginCommand, typeof(Settings), typeof(DrawingSettings), typeof(GroupItem), typeof(UiString));
+        XIVConfigUIMain.Init(pluginInterface, "/atle", "Opens the ActionTimelineEx configuration window.\n\"/atle reset\" to reset the rotation helper count.\n\"/atle toggle\" to toggle the rotation helper's visibility.", PluginCommand, typeof(Settings), typeof(DrawingSettings), typeof(GroupItem), typeof(UiString));
         XIVDrawerMain.Init(pluginInterface, "ActionTimelineExOverlay");
 
         Svc.PluginInterface.UiBuilder.Draw += Draw;
@@ -80,8 +80,9 @@ public Plugin(IDalamudPluginInterface pluginInterface)
         {
             Settings = pluginInterface.GetPluginConfig() as Settings ?? new Settings();
         }
-        catch
+        catch(Exception ex)
         {
+            Svc.Log.Error(ex, "Failed to load the configs!");
             Settings = new Settings();
         }