diff options
Diffstat (limited to 'Malmstone')
| -rw-r--r-- | Malmstone/Malmstone.csproj | 8 | ||||
| -rw-r--r-- | Malmstone/Plugin.cs | 9 | ||||
| -rw-r--r-- | Malmstone/packages.lock.json | 6 |
3 files changed, 10 insertions, 13 deletions
diff --git a/Malmstone/Malmstone.csproj b/Malmstone/Malmstone.csproj index db123b6..828a3a1 100644 --- a/Malmstone/Malmstone.csproj +++ b/Malmstone/Malmstone.csproj @@ -1,15 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> - <Project Sdk="Dalamud.NET.Sdk/14.0.1"> + <Project Sdk="Dalamud.NET.Sdk/15.0.0"> <PropertyGroup> - <Version>1.0.8.2</Version> + <Version>1.0.8.3</Version> <Description>A PVP Series Malmstones Level Calculator</Description> <PackageProjectUrl>https://github.com/goatcorp/Malmstone</PackageProjectUrl> <PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression> <IsPackable>false</IsPackable> <TargetFramework>net10.0-windows</TargetFramework> </PropertyGroup> - <ItemGroup> - <PackageReference Update="DalamudPackager" Version="14.0.1" /> - <PackageReference Update="DotNet.ReproducibleBuilds" Version="1.2.39" /> - </ItemGroup> </Project> diff --git a/Malmstone/Plugin.cs b/Malmstone/Plugin.cs index bb877fd..9d2f73e 100644 --- a/Malmstone/Plugin.cs +++ b/Malmstone/Plugin.cs @@ -26,6 +26,7 @@ public sealed class Plugin : IDalamudPlugin [PluginService] internal static IToastGui ToastGui { get; private set; } = null!; [PluginService] internal static IPluginLog Logger { get; set; } = default!; [PluginService] internal static IClientState ClientState { get; private set; } = null!; + [PluginService] internal static IPlayerState PlayerState { get; private set; } = null!; [PluginService] internal static IFramework Framework { get; private set; } = null!; private const string CommandName = "/pmalm"; @@ -283,9 +284,9 @@ private void OnCommand(string command, string args) private void CheckPlayerLoaded(IFramework framework) { - if(ClientState.LocalPlayer != null) + if(PlayerState.IsLoaded) { - ulong contentId = ClientState.LocalContentId; + ulong contentId = PlayerState.ContentId; int CurrentSeriesLevel = PvPService.GetPvPSeriesInfo()?.CurrentSeriesRank ?? 0; if (Configuration.ExtraLevelsMap.TryGetValue(contentId, out var extraLevels)) { @@ -360,7 +361,7 @@ private void OnCommand(string command, string args) public int GetSavedExtraLevels() { - ulong contentId = ClientState.LocalContentId; + ulong contentId = PlayerState.ContentId; if (Configuration.ExtraLevelsMap.TryGetValue(contentId, out var extraLevels)) { return extraLevels; @@ -382,7 +383,7 @@ private void OnCommand(string command, string args) public bool IncrementExtraLevels(int amount) { - ulong contentId = ClientState.LocalContentId; + ulong contentId = PlayerState.ContentId; if (Configuration.ExtraLevelsMap.TryGetValue(contentId, out var extraLevels)) { Configuration.ExtraLevelsMap[contentId] = extraLevels + amount; diff --git a/Malmstone/packages.lock.json b/Malmstone/packages.lock.json index d9dfac0..c291724 100644 --- a/Malmstone/packages.lock.json +++ b/Malmstone/packages.lock.json @@ -4,9 +4,9 @@ "net10.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[14.0.1, )", - "resolved": "14.0.1", - "contentHash": "y0WWyUE6dhpGdolK3iKgwys05/nZaVf4ZPtIjpLhJBZvHxkkiE23zYRo7K7uqAgoK/QvK5cqF6l3VG5AbgC6KA==" + "requested": "[15.0.0, )", + "resolved": "15.0.0", + "contentHash": "411vwC8/X8Z/sQ2TI6v3SvOn66xFPeOjFn3Zn+h0d3Ox2t1kFm66AhDvmx/qcMwVrR+Hidxj0dadpQ2dgyXMBQ==" }, "DotNet.ReproducibleBuilds": { "type": "Direct", |