From fcb8a35266f1783ee3914dafc9ae6a85d53d1258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Mon, 2 Oct 2023 22:26:47 +0800 Subject: [PATCH] fix: api 9 --- ActionTimelineEx/Helpers/DrawHelper.cs | 12 ++++++------ ActionTimelineEx/Timeline/StatusLineItem.cs | 3 ++- ActionTimelineEx/Timeline/TimelineItem.cs | 7 ++++--- ActionTimelineEx/Timeline/TimelineManager.cs | 8 ++++---- ActionTimelineEx/Windows/SettingsWindow.cs | 1 + ActionTimelineEx/Windows/TimelineWindow.cs | 1 + ECommons | 2 +- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ActionTimelineEx/Helpers/DrawHelper.cs b/ActionTimelineEx/Helpers/DrawHelper.cs index 257a6b1..53d8f27 100644 --- a/ActionTimelineEx/Helpers/DrawHelper.cs +++ b/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("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($"ui/icon/{icon/1000:D3}000/{icon:D6}.tex"); if(tex == null) { textureColorCache[icon] = uint.MaxValue; diff --git a/ActionTimelineEx/Timeline/StatusLineItem.cs b/ActionTimelineEx/Timeline/StatusLineItem.cs index df28947..f916d22 100644 --- a/ActionTimelineEx/Timeline/StatusLineItem.cs +++ b/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); diff --git a/ActionTimelineEx/Timeline/TimelineItem.cs b/ActionTimelineEx/Timeline/TimelineItem.cs index 1e64579..a3db8a1 100644 --- a/ActionTimelineEx/Timeline/TimelineItem.cs +++ b/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)); } diff --git a/ActionTimelineEx/Timeline/TimelineManager.cs b/ActionTimelineEx/Timeline/TimelineManager.cs index 033ae7e..22011c3 100644 --- a/ActionTimelineEx/Timeline/TimelineManager.cs +++ b/ActionTimelineEx/Timeline/TimelineManager.cs @@ -28,7 +28,7 @@ public TimelineManager() { try { - SignatureHelper.Initialise(this); + Svc.Hook.InitializeFromAttributes(this); _onActorControlHook?.Enable(); _onCastHook?.Enable(); @@ -36,7 +36,7 @@ public TimelineManager() } catch (Exception e) { - PluginLog.Error("Error initiating hooks: " + e.Message); + Svc.Log.Error("Error initiating hooks: " + e.Message); } } @@ -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"); } } } diff --git a/ActionTimelineEx/Windows/SettingsWindow.cs b/ActionTimelineEx/Windows/SettingsWindow.cs index 5a3e162..33e83bf 100644 --- a/ActionTimelineEx/Windows/SettingsWindow.cs +++ b/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; diff --git a/ActionTimelineEx/Windows/TimelineWindow.cs b/ActionTimelineEx/Windows/TimelineWindow.cs index 8090f38..a6f84b8 100644 --- a/ActionTimelineEx/Windows/TimelineWindow.cs +++ b/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; diff --git a/ECommons b/ECommons index 427a252..ee1f836 160000 --- a/ECommons +++ b/ECommons @@ -1 +1 @@ -Subproject commit 427a252eceaa274c48f79f1d9aa0a2c2d898cbf9 +Subproject commit ee1f8368541e5f82e820bebae40731ee79862397