Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
fix: some fix, maybe.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Jul 3, 2024
1 parent e858b08 commit 661debc
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 9 deletions.
3 changes: 1 addition & 2 deletions ActionTimelineEx/ActionTimelineEx.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"Author": "Tischel, ArchiTed",
"Name": "ActionTimelineEx",
"InternalName": "ActionTimelineEx",
"AssemblyVersion": "1.3.6.0",
"Description": "Configurable timeline display of all the actions you use.",
"ApplicableVersion": "any",
"RepoUrl": "https://github.com/ArchiDog1998/ActionTimelineEx",
Expand All @@ -12,7 +11,7 @@
"CategoryTags": [
"UI"
],
"DalamudApiLevel": 9,
"DalamudApiLevel": 10,
"LoadRequiredState": 0,
"LoadSync": false,
"CanUnloadAsync": false,
Expand Down
13 changes: 12 additions & 1 deletion ActionTimelineEx/Localization/Localization.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,16 @@
"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."
"XIVConfigUI.Attributes.ConfigUnitType.Pixels": "Display Unit, in pixels.",
"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",
"ActionTimeline.Windows.SettingsWindow+AddOne": "AddOne",
"ActionTimeline.Windows.SettingsWindow+ChangeLog": "ChangeLog",
"ActionTimelineEx.Punchline": "Show your actions in real-time.",
"ActionTimelineEx.Description": "Configurable timeline display of all the actions you use."
}
1 change: 0 additions & 1 deletion ActionTimelineEx/Timeline/StatusLineItem.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ActionTimeline.Helpers;
using ActionTimelineEx.Configurations;
using Dalamud.Interface.Internal;
using Dalamud.Interface.Textures.TextureWraps;
using ImGuiNET;
using System.Numerics;
Expand Down
2 changes: 1 addition & 1 deletion ActionTimelineEx/Timeline/TimelineManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public void Dispose()
}

#endregion

private delegate void OnActorControlDelegate(uint entityId, ActorControlCategory type, uint buffID, uint direct, uint actionId, uint sourceId, uint arg4, uint arg5, ulong targetId, byte a10);
[Signature("E8 ?? ?? ?? ?? 0F B7 0B 83 E9 64", DetourName = nameof(OnActorControl))]
private readonly Hook<OnActorControlDelegate>? _onActorControlHook = null;
Expand Down Expand Up @@ -437,6 +436,7 @@ private async void OnActorControl(uint entityId, ActorControlCategory type, uint

private unsafe void OnCast(uint sourceId, IntPtr ptr)
{
Svc.Log.Error("Start cast");
_onCastHook?.Original(sourceId, ptr);

try
Expand Down
2 changes: 0 additions & 2 deletions ActionTimelineEx/Windows/SettingsWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
using Dalamud.Interface;
using Dalamud.Interface.Colors;
using Dalamud.Interface.GameFonts;
using Dalamud.Interface.Internal;
using Dalamud.Interface.Textures.TextureWraps;
using Dalamud.Interface.Utility;
using ECommons.Commands;
using ECommons.DalamudServices;
using ImGuiNET;
using Lumina.Excel.GeneratedSheets;
Expand Down
2 changes: 1 addition & 1 deletion ECommons
Submodule ECommons updated 48 files
+3 −3 ECommons/Automation/UIInput/ClickHelper.cs
+1 −1 ECommons/ECommons.csproj
+10 −0 ECommons/ExcelServices/Job.cs
+2 −2 ECommons/EzCmd.cs
+18 −1 ECommons/Funding/PatreonBanner.cs
+2 −1 ECommons/GameFunctions/CharacterFunctions.cs
+1 −0 ECommons/GameHelpers/Player.cs
+31 −1 ECommons/GenericHelpers.cs
+14 −0 ECommons/ImGuiMethods/GradientColor.cs
+3 −3 ECommons/UIHelpers/AddonFinder.cs
+20 −0 ECommons/UIHelpers/AddonMasterImplementations/!AddonMaster.cs
+58 −0 ECommons/UIHelpers/AddonMasterImplementations/!AddonMasterBase.cs
+0 −22 ECommons/UIHelpers/AddonMasterImplementations/AddonMasterBase.cs
+19 −0 ECommons/UIHelpers/AddonMasterImplementations/ContentsFinderConfirm.cs
+29 −0 ECommons/UIHelpers/AddonMasterImplementations/GrandCompanySupplyReward.cs
+30 −0 ECommons/UIHelpers/AddonMasterImplementations/ItemInspectionResult.cs
+18 −0 ECommons/UIHelpers/AddonMasterImplementations/JournalResult.cs
+20 −0 ECommons/UIHelpers/AddonMasterImplementations/MateriaAttachDialog.cs
+27 −0 ECommons/UIHelpers/AddonMasterImplementations/MateriaRetrieveDialog.cs
+31 −0 ECommons/UIHelpers/AddonMasterImplementations/MaterializeDialog.cs
+0 −24 ECommons/UIHelpers/AddonMasterImplementations/MaterializeDialogMaster.cs
+30 −0 ECommons/UIHelpers/AddonMasterImplementations/RecipeNote.cs
+30 −0 ECommons/UIHelpers/AddonMasterImplementations/Repair.cs
+0 −23 ECommons/UIHelpers/AddonMasterImplementations/RepairMaster.cs
+53 −0 ECommons/UIHelpers/AddonMasterImplementations/Request.cs
+0 −44 ECommons/UIHelpers/AddonMasterImplementations/RequestMaster.cs
+19 −0 ECommons/UIHelpers/AddonMasterImplementations/RetainerItemTransferList.cs
+18 −0 ECommons/UIHelpers/AddonMasterImplementations/RetainerItemTransferProgress.cs
+52 −0 ECommons/UIHelpers/AddonMasterImplementations/RetainerList.cs
+28 −0 ECommons/UIHelpers/AddonMasterImplementations/RetainerTaskAsk.cs
+30 −0 ECommons/UIHelpers/AddonMasterImplementations/RetainerTaskResult.cs
+19 −0 ECommons/UIHelpers/AddonMasterImplementations/SalvageDialog.cs
+48 −0 ECommons/UIHelpers/AddonMasterImplementations/SelectIconString.cs
+21 −0 ECommons/UIHelpers/AddonMasterImplementations/SelectOk.cs
+76 −0 ECommons/UIHelpers/AddonMasterImplementations/SelectString.cs
+0 −53 ECommons/UIHelpers/AddonMasterImplementations/SelectStringMaster.cs
+42 −0 ECommons/UIHelpers/AddonMasterImplementations/SelectYesno.cs
+0 −41 ECommons/UIHelpers/AddonMasterImplementations/SelectYesnoMaster.cs
+30 −0 ECommons/UIHelpers/AddonMasterImplementations/ShopCardDialog.cs
+32 −0 ECommons/UIHelpers/AddonMasterImplementations/Talk.cs
+0 −36 ECommons/UIHelpers/AddonMasterImplementations/TalkMaster.cs
+44 −0 ECommons/UIHelpers/AddonMasterImplementations/TitleDCWorldMap.cs
+77 −0 ECommons/UIHelpers/AddonMasterImplementations/_CharaSelectListMenu.cs
+61 −0 ECommons/UIHelpers/AddonMasterImplementations/_CharaSelectWorldServer.cs
+37 −0 ECommons/UIHelpers/AddonMasterImplementations/_TitleMenu.cs
+30 −0 ECommons/UIHelpers/AtkEventDataBuilder.cs
+2 −0 ECommons/UIHelpers/AtkReader.cs
+1 −1 ECommons/UIHelpers/AtkReaderImplementations/ReaderRetainerList.cs
2 changes: 1 addition & 1 deletion XIVConfigUI

0 comments on commit 661debc

Please sign in to comment.