diff --git a/DelvCD/Config/CharacterStateTrigger.cs b/DelvCD/Config/CharacterStateTrigger.cs index a9e5cdd..f095fc4 100644 --- a/DelvCD/Config/CharacterStateTrigger.cs +++ b/DelvCD/Config/CharacterStateTrigger.cs @@ -97,7 +97,7 @@ public override bool IsTriggered(bool preview) IGameObject? actor = TriggerSource switch { - TriggerSource.Player => Singletons.Get().LocalPlayer, + TriggerSource.Player => Singletons.Get().LocalPlayer, TriggerSource.Target => Utils.FindTarget(), TriggerSource.TargetOfTarget => Utils.FindTargetOfTarget(), TriggerSource.FocusTarget => Singletons.Get().FocusTarget, @@ -110,7 +110,7 @@ public override bool IsTriggered(bool preview) } _dataSource.Name = actor.Name.ToString(); - var player = Singletons.Get().LocalPlayer; + var player = Singletons.Get().LocalPlayer; if (player is not null) { Vector3 delta = player.Position - actor.Position; diff --git a/DelvCD/Config/CooldownTrigger.cs b/DelvCD/Config/CooldownTrigger.cs index 9d68251..55bfd26 100644 --- a/DelvCD/Config/CooldownTrigger.cs +++ b/DelvCD/Config/CooldownTrigger.cs @@ -109,12 +109,12 @@ public override bool IsTriggered(bool preview) if (RangeCheck) { - inRange = helper.GetActionInRange(actionId, Singletons.Get().LocalPlayer, Utils.FindTarget()); + inRange = helper.GetActionInRange(actionId, Singletons.Get().LocalPlayer, Utils.FindTarget()); } if (LosCheck) { - inLos = helper.IsTargetInLos(Singletons.Get().LocalPlayer, Utils.FindTarget(), actionId); + inLos = helper.IsTargetInLos(Singletons.Get().LocalPlayer, Utils.FindTarget(), actionId); } if (HighlightCheck) diff --git a/DelvCD/Config/JobGaugeTrigger.cs b/DelvCD/Config/JobGaugeTrigger.cs index c6db489..47db0a0 100644 --- a/DelvCD/Config/JobGaugeTrigger.cs +++ b/DelvCD/Config/JobGaugeTrigger.cs @@ -69,7 +69,7 @@ public override bool IsTriggered(bool preview) return false; } - IPlayerCharacter? player = Singletons.Get().LocalPlayer; + IPlayerCharacter? player = Singletons.Get().LocalPlayer; if (player == null || player.ClassJob.RowId != (uint)_jobGauge.Job) { return false; diff --git a/DelvCD/Config/JobGauges/BlackMageJobGauge.cs b/DelvCD/Config/JobGauges/BlackMageJobGauge.cs index fbfcca1..08437ba 100644 --- a/DelvCD/Config/JobGauges/BlackMageJobGauge.cs +++ b/DelvCD/Config/JobGauges/BlackMageJobGauge.cs @@ -71,7 +71,7 @@ public override unsafe bool IsTriggered(bool preview) _dataSource.Paradox = gauge->ParadoxActive; _dataSource.Astral_Soul_Stacks = gauge->AstralSoulStacks; - IPlayerCharacter? player = Singletons.Get().LocalPlayer; + IPlayerCharacter? player = Singletons.Get().LocalPlayer; _dataSource.Max_Polyglot_Stacks = player == null ? 2 : (player.Level < 80 ? 1 : ((player.Level < 98 ? 2 : 3))); if (preview) { return true; } diff --git a/DelvCD/Config/JobGauges/MonkJobGauge.cs b/DelvCD/Config/JobGauges/MonkJobGauge.cs index 0a70a67..02103d4 100644 --- a/DelvCD/Config/JobGauges/MonkJobGauge.cs +++ b/DelvCD/Config/JobGauges/MonkJobGauge.cs @@ -81,7 +81,7 @@ public override bool IsTriggered(bool preview) _dataSource.Raptor_Stacks = gauge.RaptorFury; _dataSource.Coeurl_Stacks = gauge.CoeurlFury; - IPlayerCharacter? player = Singletons.Get().LocalPlayer; + IPlayerCharacter? player = Singletons.Get().LocalPlayer; _dataSource.Max_Chakra_Stacks = player?.StatusList.FirstOrDefault(s => s.StatusId is 1182 or 2174) != null ? 10 : 5; if (preview) { return true; } diff --git a/DelvCD/Config/JobGauges/ViperJobGauge.cs b/DelvCD/Config/JobGauges/ViperJobGauge.cs index 97bd6eb..829bdd1 100644 --- a/DelvCD/Config/JobGauges/ViperJobGauge.cs +++ b/DelvCD/Config/JobGauges/ViperJobGauge.cs @@ -36,7 +36,7 @@ protected override void InitializeConditions() public override unsafe bool IsTriggered(bool preview) { VPRGauge gauge = Singletons.Get().Get(); - IPlayerCharacter? player = Singletons.Get().LocalPlayer; + IPlayerCharacter? player = Singletons.Get().LocalPlayer; _dataSource.Rattling_Coil_Stacks = gauge.RattlingCoilStacks; _dataSource.Max_Rattling_Coil_Stacks = player == null || player.Level < 88 ? 2 : 3; diff --git a/DelvCD/Config/StatusTrigger.cs b/DelvCD/Config/StatusTrigger.cs index e9add66..d6bd1b4 100644 --- a/DelvCD/Config/StatusTrigger.cs +++ b/DelvCD/Config/StatusTrigger.cs @@ -68,7 +68,7 @@ public override bool IsTriggered(bool preview) return true; } - IPlayerCharacter? player = Singletons.Get().LocalPlayer; + IPlayerCharacter? player = Singletons.Get().LocalPlayer; if (player is null) { return false; diff --git a/DelvCD/DelvCD.csproj b/DelvCD/DelvCD.csproj index 7a92bbb..c6b3051 100644 --- a/DelvCD/DelvCD.csproj +++ b/DelvCD/DelvCD.csproj @@ -1,7 +1,7 @@ - + x64 - net9.0 + net10.0-windows latest x64 Debug;Release @@ -10,9 +10,9 @@ DelvCD - 1.4.0.0 - 1.4.0.0 - 1.4.0.0 + 1.5.0.0 + 1.5.0.0 + 1.5.0.0 diff --git a/DelvCD/Helpers/CharacterState.cs b/DelvCD/Helpers/CharacterState.cs index 726d41b..7e6ce91 100644 --- a/DelvCD/Helpers/CharacterState.cs +++ b/DelvCD/Helpers/CharacterState.cs @@ -58,7 +58,7 @@ public static bool IsInGoldenSaucer() public static Job GetCharacterJob() { - var player = Singletons.Get().LocalPlayer; + var player = Singletons.Get().LocalPlayer; if (player is null) { return Job.UKN; @@ -72,18 +72,18 @@ public static Job GetCharacterJob() public static int GetCharacterLevel() { - return Singletons.Get().LocalPlayer?.Level ?? 0; + return Singletons.Get().LocalPlayer?.Level ?? 0; } public static bool IsWeaponDrawn() { - var player = Singletons.Get().LocalPlayer; + var player = Singletons.Get().LocalPlayer; return player != null && player.StatusFlags.HasFlag(StatusFlags.WeaponOut); } public static unsafe bool ShouldBeVisible() { - if (Singletons.Get().LocalPlayer == null || IsCharacterBusy()) + if (Singletons.Get().LocalPlayer == null || IsCharacterBusy()) { return false; } diff --git a/DelvCD/Helpers/StatusHelpers.cs b/DelvCD/Helpers/StatusHelpers.cs index 0f3be98..f4d6f02 100644 --- a/DelvCD/Helpers/StatusHelpers.cs +++ b/DelvCD/Helpers/StatusHelpers.cs @@ -7,7 +7,7 @@ using Dalamud.Plugin.Services; using Lumina.Excel; -using DalamudStatus = Dalamud.Game.ClientState.Statuses.Status; +using DalamudStatus = Dalamud.Game.ClientState.Statuses.IStatus; using LuminaStatus = Lumina.Excel.Sheets.Status; namespace DelvCD.Helpers @@ -44,7 +44,7 @@ public void GenerateStatusMap() dict.Clear(); } - IPlayerCharacter? player = Singletons.Get().LocalPlayer; + IPlayerCharacter? player = Singletons.Get().LocalPlayer; if (player is null) { return; diff --git a/DelvCD/Helpers/Utils.cs b/DelvCD/Helpers/Utils.cs index 0bb1274..46ea073 100644 --- a/DelvCD/Helpers/Utils.cs +++ b/DelvCD/Helpers/Utils.cs @@ -44,7 +44,7 @@ public static Vector2 GetAnchoredPosition(Vector2 position, Vector2 size, DrawAn return null; } - IGameObject? player = Singletons.Get().LocalPlayer; + IGameObject? player = Singletons.Get().LocalPlayer; if (target.TargetObjectId == 0 && player is not null && player.TargetObjectId == 0) { return player; diff --git a/DelvCD/changelog.md b/DelvCD/changelog.md index 930471c..e3d184a 100644 --- a/DelvCD/changelog.md +++ b/DelvCD/changelog.md @@ -1,5 +1,8 @@ +# 1.5.0.0 +- Added support for Patch 7.4 and Dalamud API 14. + # 1.4.0.0 -- Added support for Patch 7.2 and Dalamud API 12. +- Added support for Patch 7.3 and Dalamud API 13. - Added a setting to change the glow direction CW or CCW. - Fixed config window being shrunk and in the corner of the screen. - Fixed issues with Dancer's Technical Step. diff --git a/DelvCD/packages.lock.json b/DelvCD/packages.lock.json index 1a9884e..9a53d7e 100644 --- a/DelvCD/packages.lock.json +++ b/DelvCD/packages.lock.json @@ -1,18 +1,18 @@ { "version": 1, "dependencies": { - "net9.0": { + "net10.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[13.0.0, )", - "resolved": "13.0.0", - "contentHash": "Mb3cUDSK/vDPQ8gQIeuCw03EMYrej1B4J44a1AvIJ9C759p9XeqdU9Hg4WgOmlnlPe0G7ILTD32PKSUpkQNa8w==" + "requested": "[14.0.0, )", + "resolved": "14.0.0", + "contentHash": "9c1q/eAeAs82mkQWBOaCvbt3GIQxAIadz5b/7pCXDIy9nHPtnRc+tDXEvKR+M36Wvi7n+qBTevRupkLUQp6DFA==" }, "DotNet.ReproducibleBuilds": { "type": "Direct", - "requested": "[1.2.25, )", - "resolved": "1.2.25", - "contentHash": "xCXiw7BCxHJ8pF6wPepRUddlh2dlQlbr81gXA72hdk4FLHkKXas7EH/n+fk5UCA/YfMqG1Z6XaPiUjDbUNBUzg==" + "requested": "[1.2.39, )", + "resolved": "1.2.39", + "contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg==" } } }