Merge pull request #22 from ArchiDog1998/main

RP

ActionTimelineEx/ActionTimelineEx.csproj

@@ -5,15 +5,15 @@
 		<Authors>ArchiTed</Authors>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
-		<Version>1.3.4</Version>
+		<Version>1.3.5</Version>
 		<Nullable>enable</Nullable>
 		<DalamudLibPath>$(AppData)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="DalamudPackager" Version="2.1.11" />
+		<PackageReference Include="DalamudPackager" Version="2.1.12" />
 		<ProjectReference Include="..\ECommons\ECommons\ECommons.csproj" />
 
 		<Reference Include="Dalamud">

ActionTimelineEx/ActionTimelineEx.yaml

@@ -6,7 +6,7 @@ description: |-
 punchline: Show your actions in real-time.
 repo_url: https://github.com/ArchiDog1998/ActionTimelineEx
 icon_url: https://xivapi.com/i/000000/000073_hr1.png
-dalamud_api_level: 8
+dalamud_api_level: 9
 tags:
   - UI
 category_tags:

ActionTimelineEx/Helpers/DrawHelper.cs

@@ -1,4 +1,5 @@
-using ECommons.DalamudServices;
+using Dalamud.Interface.Internal;
+using ECommons.DalamudServices;
 using ECommons.ImGuiMethods;
 using ImGuiNET;
 using ImGuiScene;
@@ -12,7 +13,7 @@ internal static class DrawHelper
     private static readonly Vector2 _uv1 = new Vector2(96 * 5 / 852f, 0),
     _uv2 = new Vector2((96 * 5 + 144) / 852f, 0.5f);
 
-    private static TextureWrap? _roundTex;
+    private static IDalamudTextureWrap? _roundTex;
     public static void Init()
     {
         var tex = Svc.Data.GetFile<TexFile>("ui/uld/icona_frame_hr1.tex");
@@ -42,7 +43,7 @@ public static void DrawDamage(this ImDrawListPtr drawList, Vector2 position, flo
 
     public static void DrawActionIcon(this ImDrawListPtr drawList, uint iconId, bool isHq, Vector2 position, float size)
     {
-        TextureWrap? texture = GetTextureFromIconId(iconId, isHq);
+        IDalamudTextureWrap? texture = GetTextureFromIconId(iconId, isHq);
         if (texture == null) return;
 
         var pixPerUnit = size / 82;
@@ -64,7 +65,7 @@ public static Vector4 ChangeAlpha(this Vector4 color, float alpha)
         return color;
     }
 
-    public static TextureWrap? GetTextureFromIconId(uint iconId, bool highQuality = false)
+    public static IDalamudTextureWrap? GetTextureFromIconId(uint iconId, bool highQuality = false)
         => ThreadLoadImageHandler.TryGetIconTextureWrap(iconId, highQuality, out var texture) ? texture 
         : ThreadLoadImageHandler.TryGetIconTextureWrap(0, highQuality, out texture) ? texture : null;
 
@@ -90,8 +91,7 @@ private static void CalculateColor()
         {
             while(calculating.TryDequeue(out var icon))
             {
-                var tex = Svc.Data.GetIcon(icon, false);
-
+                var tex = Svc.Data.GetFile<TexFile>($"ui/icon/{icon/1000:D3}000/{icon:D6}.tex");
                 if(tex == null)
                 {
                     textureColorCache[icon] = uint.MaxValue;

ActionTimelineEx/Timeline/StatusLineItem.cs

@@ -1,5 +1,6 @@
 using ActionTimeline.Helpers;
 using ActionTimelineEx.Configurations;
+using Dalamud.Interface.Internal;
 using ImGuiNET;
 using ImGuiScene;
 using System.Numerics;
@@ -35,7 +36,7 @@ public void DrawItemWithCenter(Vector2 centerPos, Vector2 windowPos, DrawingSett
         var flag = ImDrawFlags.RoundCornersAll;
         var rounding = setting.GCDRound;
 
-        TextureWrap? texture = DrawHelper.GetTextureFromIconId(Icon);
+        IDalamudTextureWrap? texture = DrawHelper.GetTextureFromIconId(Icon);
         if (texture == null) return;
 
         var col = DrawHelper.GetTextureAverageColor(Icon);

ActionTimelineEx/Timeline/TimelineItem.cs

@@ -1,6 +1,7 @@
 using ActionTimeline.Helpers;
 using ActionTimelineEx.Configurations;
 using Dalamud.Interface;
+using Dalamud.Interface.Internal;
 using ImGuiNET;
 using ImGuiScene;
 using RotationSolver.Basic.Data;
@@ -72,12 +73,12 @@ public void DrawItemWithCenter(Vector2 centerPos, TimelineLayer icon, DrawingSet
         }
     }
 
-    private static (TextureWrap texture, string? name)[] GetTextures(HashSet<(uint icon, string? name)> iconIds)
+    private static (IDalamudTextureWrap texture, string? name)[] GetTextures(HashSet<(uint icon, string? name)> iconIds)
     {
-        var result = new List<(TextureWrap texture, string? name)>(iconIds.Count);
+        var result = new List<(IDalamudTextureWrap texture, string? name)>(iconIds.Count);
         foreach (var item in iconIds)
         {
-            TextureWrap? texture = DrawHelper.GetTextureFromIconId(item.icon);
+            IDalamudTextureWrap? texture = DrawHelper.GetTextureFromIconId(item.icon);
             if (texture == null) continue;
             result.Add((texture, item.name));
         }

ActionTimelineEx/Timeline/TimelineManager.cs

@@ -28,15 +28,15 @@ public TimelineManager()
     {
         try
         {
-            SignatureHelper.Initialise(this);
+            Svc.Hook.InitializeFromAttributes(this);
             _onActorControlHook?.Enable();
             _onCastHook?.Enable();
 
             ActionEffect.ActionEffectEvent += ActionFromSelf;
         }
         catch (Exception e)
         {
-            PluginLog.Error("Error initiating hooks: " + e.Message);
+            Svc.Log.Error("Error initiating hooks: " + e.Message);
         }
     }
 
@@ -161,7 +161,7 @@ private static TimelineItemType GetActionType(uint actionId, ActionType type)
     {
         switch (type)
         {
-            case ActionType.Spell:
+            case ActionType.Action:
                 var action = Svc.Data.GetExcelSheet<Action>()?.GetRow(actionId);
                 if (action == null) break;
 
@@ -447,7 +447,7 @@ private async void OnActorControl(uint entityId, ActorControlCategory type, uint
 
         catch (Exception ex)
         {
-            PluginLog.Warning(ex, "Something wrong with OnActorControl!");
+            Svc.Log.Warning(ex, "Something wrong with OnActorControl!");
         }
     }
 
@@ -477,7 +477,7 @@ private unsafe void OnCast(uint sourceId, IntPtr ptr)
         }
         catch(Exception ex)
         {
-            PluginLog.Warning(ex, "Something wrong with OnCast1");
+            Svc.Log.Warning(ex, "Something wrong with OnCast1");
         }
     }
 }

ActionTimelineEx/Windows/SettingsWindow.cs

@@ -3,6 +3,7 @@
 using ActionTimelineEx.Configurations;
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
+using Dalamud.Interface.Utility;
 using Dalamud.Interface.Windowing;
 using Dalamud.Utility;
 using ECommons.Commands;

ActionTimelineEx/Windows/TimelineWindow.cs

@@ -2,6 +2,7 @@
 using ActionTimelineEx.Configurations;
 using ActionTimelineEx.Timeline;
 using Dalamud.Interface;
+using Dalamud.Interface.Utility;
 using ImGuiNET;
 using System.Numerics;
 

ActionTimelineEx/packages.lock.json

@@ -4,9 +4,9 @@
     "net7.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.11, )",
-        "resolved": "2.1.11",
-        "contentHash": "9qlAWoRRTiL/geAvuwR/g6Bcbrd/bJJgVnB/RurBiyKs6srsP0bvpoo8IK+Eg8EA6jWeM6/YJWs66w4FIAzqPw=="
+        "requested": "[2.1.12, )",
+        "resolved": "2.1.12",
+        "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
       },
       "ecommons": {
         "type": "Project"

manifest.json

@@ -10,7 +10,7 @@
   "CategoryTags": [
     "UI"
   ],
-  "DalamudApiLevel": 8,
+  "DalamudApiLevel": 9,
   "LoadRequiredState": 0,
   "LoadSync": false,
   "CanUnloadAsync": false,