From 374fc03ce907efd92ab2ffa9b67d661bccf02f45 Mon Sep 17 00:00:00 2001 From: t0w0bi Date: Thu, 18 Dec 2025 17:01:42 +0000 Subject: [PATCH] Update workflow API14 --- .../workflows/release-clubpenguin-on-tag.yml | 6 ++--- Glamourer.Api | 2 +- MareSynchronos/MareSynchronos.csproj | 2 +- MareSynchronos/Services/DalamudUtilService.cs | 27 ++++++++++--------- Penumbra.Api | 2 +- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.gitea/workflows/release-clubpenguin-on-tag.yml b/.gitea/workflows/release-clubpenguin-on-tag.yml index 0af1d0e..221fec8 100644 --- a/.gitea/workflows/release-clubpenguin-on-tag.yml +++ b/.gitea/workflows/release-clubpenguin-on-tag.yml @@ -7,7 +7,7 @@ on: env: PLUGIN_NAME: ClubPenguinSync - DOTNET_VERSION: 9.x + DOTNET_VERSION: 10.x jobs: build-and-update-repo: @@ -22,10 +22,10 @@ jobs: fetch-depth: 0 submodules: true - - name: Setup .NET 9 SDK + - name: Setup .NET 10 SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.x + dotnet-version: 10.x - name: Download Dalamud run: | diff --git a/Glamourer.Api b/Glamourer.Api index 54c1944..3bfd1db 160000 --- a/Glamourer.Api +++ b/Glamourer.Api @@ -1 +1 @@ -Subproject commit 54c1944dc7db704733b4788520e494761bb0b58e +Subproject commit 3bfd1db3a471f6e808c4d981485a08f58a4bf6cd diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj index 265c54e..bc66717 100644 --- a/MareSynchronos/MareSynchronos.csproj +++ b/MareSynchronos/MareSynchronos.csproj @@ -1,5 +1,5 @@  - + ClubPenguinSync 1.7.1.4 diff --git a/MareSynchronos/Services/DalamudUtilService.cs b/MareSynchronos/Services/DalamudUtilService.cs index 16016fd..ce44ffc 100644 --- a/MareSynchronos/Services/DalamudUtilService.cs +++ b/MareSynchronos/Services/DalamudUtilService.cs @@ -7,6 +7,7 @@ using Dalamud.Utility; using FFXIVClientStructs.FFXIV.Client.Game; using FFXIVClientStructs.FFXIV.Client.Game.Character; using FFXIVClientStructs.FFXIV.Client.Game.Control; +using FFXIVClientStructs.FFXIV.Client.Game.Object; using FFXIVClientStructs.FFXIV.Client.Graphics.Scene; using FFXIVClientStructs.FFXIV.Client.UI.Agent; using Lumina.Excel.Sheets; @@ -139,7 +140,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber _ = RunOnFrameworkThread(() => { var addr = GetPlayerCharacterFromCachedTableByIdent(ident); - var pc = _clientState.LocalPlayer!; + var pc = _objectTable.LocalPlayer!; var gobj = CreateGameObject(addr); // Any further than roughly 55y is out of range for targetting if (gobj != null && Vector3.Distance(pc.Position, gobj.Position) < 55.0f) @@ -243,7 +244,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber public bool GetIsPlayerPresent() { EnsureIsOnFramework(); - return _clientState.LocalPlayer != null && _clientState.LocalPlayer.IsValid(); + return _objectTable.LocalPlayer != null && _objectTable.LocalPlayer.IsValid(); } public async Task GetIsPlayerPresentAsync() @@ -287,7 +288,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber public IPlayerCharacter GetPlayerCharacter() { EnsureIsOnFramework(); - return _clientState.LocalPlayer!; + return _objectTable.LocalPlayer!; } public IntPtr GetPlayerCharacterFromCachedTableByName(string characterName) @@ -309,7 +310,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber public string GetPlayerName() { EnsureIsOnFramework(); - return _clientState.LocalPlayer?.Name.ToString() ?? "--"; + return _objectTable.LocalPlayer?.Name.ToString() ?? "--"; } public async Task GetPlayerNameAsync() @@ -325,7 +326,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber public IntPtr GetPlayerPointer() { EnsureIsOnFramework(); - return _clientState.LocalPlayer?.Address ?? IntPtr.Zero; + return _objectTable.LocalPlayer?.Address ?? IntPtr.Zero; } public async Task GetPlayerPointerAsync() @@ -336,13 +337,13 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber public uint GetHomeWorldId() { EnsureIsOnFramework(); - return _clientState.LocalPlayer?.HomeWorld.RowId ?? 0; + return _objectTable.LocalPlayer?.HomeWorld.RowId ?? 0; } public uint GetWorldId() { EnsureIsOnFramework(); - return _clientState.LocalPlayer!.CurrentWorld.RowId; + return _objectTable.LocalPlayer!.CurrentWorld.RowId; } public unsafe LocationInfo GetMapData() @@ -351,8 +352,8 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber var agentMap = AgentMap.Instance(); var houseMan = HousingManager.Instance(); uint serverId = 0; - if (_clientState.LocalPlayer == null) serverId = 0; - else serverId = _clientState.LocalPlayer.CurrentWorld.RowId; + if (_objectTable.LocalPlayer == null) serverId = 0; + else serverId = _objectTable.LocalPlayer.CurrentWorld.RowId; uint mapId = agentMap == null ? 0 : agentMap->CurrentMapId; uint territoryId = agentMap == null ? 0 : agentMap->CurrentTerritoryId; uint divisionId = houseMan == null ? 0 : (uint)(houseMan->GetCurrentDivision()); @@ -473,7 +474,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber _framework.Update += ClubPenguinSync.Plugin.Self.OnFrameworkUpdate; if (IsLoggedIn) { - _classJobId = _clientState.LocalPlayer!.ClassJob.RowId; + _classJobId = _objectTable.LocalPlayer!.ClassJob.RowId; } _logger.LogInformation("Started DalamudUtilService"); @@ -582,7 +583,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber bool isDrawingChanged = false; if ((nint)drawObj != IntPtr.Zero) { - isDrawing = gameObj->RenderFlags == 0b100000000000; + isDrawing = gameObj->RenderFlags == VisibilityFlags.Model; if (!isDrawing) { isDrawing = ((CharacterBase*)drawObj)->HasModelInSlotLoaded != 0; @@ -635,7 +636,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber private unsafe void FrameworkOnUpdateInternal() { - if (_clientState.LocalPlayer?.IsDead ?? false) + if (_objectTable.LocalPlayer?.IsDead ?? false) { return; } @@ -764,7 +765,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber Mediator.Publish(new ResumeScanMessage(nameof(ConditionFlag.BetweenAreas))); } - var localPlayer = _clientState.LocalPlayer; + var localPlayer = _objectTable.LocalPlayer; if (localPlayer != null) { _classJobId = localPlayer.ClassJob.RowId; diff --git a/Penumbra.Api b/Penumbra.Api index dd14131..e4934cc 160000 --- a/Penumbra.Api +++ b/Penumbra.Api @@ -1 +1 @@ -Subproject commit dd14131793e5ae47cc8e9232f46469216017b5aa +Subproject commit e4934ccca0379f22dadf989ab2d34f30b3c5c7ea