diff options
| -rw-r--r-- | Malmstone/Addons/PvPMatchAddon.cs | 2 | ||||
| -rw-r--r-- | Malmstone/Malmstone.csproj | 8 | ||||
| -rw-r--r-- | Malmstone/Services/PVPService.cs | 6 | ||||
| -rw-r--r-- | Malmstone/Utils/MalmstoneXPCalculator.cs | 1 | ||||
| -rw-r--r-- | Malmstone/Utils/UIChanger.cs | 4 | ||||
| -rw-r--r-- | Malmstone/Windows/ConfigWindow.cs | 2 | ||||
| -rw-r--r-- | Malmstone/Windows/MainWindow.cs | 2 | ||||
| -rw-r--r-- | Malmstone/packages.lock.json | 6 |
8 files changed, 13 insertions, 18 deletions
diff --git a/Malmstone/Addons/PvPMatchAddon.cs b/Malmstone/Addons/PvPMatchAddon.cs index 71e3b33..00f9399 100644 --- a/Malmstone/Addons/PvPMatchAddon.cs +++ b/Malmstone/Addons/PvPMatchAddon.cs @@ -127,7 +127,7 @@ namespace Malmstone.Addons { unsafe { - var FrontlineResultUnit = (AtkUnitBase*)addonInfo.Addon; + var FrontlineResultUnit = (AtkUnitBase*)addonInfo.Addon.Address; if (FrontlineResultUnit == null) return; var SeriesExpComponent = FrontlineResultUnit->GetComponentByNodeId(35); var SeriesExpTextNode = (AtkTextNode*)SeriesExpComponent->GetTextNodeById(2); diff --git a/Malmstone/Malmstone.csproj b/Malmstone/Malmstone.csproj index b2a881e..7bfaade 100644 --- a/Malmstone/Malmstone.csproj +++ b/Malmstone/Malmstone.csproj @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> - <Project Sdk="Dalamud.NET.Sdk/12.0.2"> + <Project Sdk="Dalamud.NET.Sdk/13.0.0"> <PropertyGroup> - <Version>1.0.7.4</Version> + <Version>1.0.7.5</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> </PropertyGroup> - - <ItemGroup> - <PackageReference Update="DalamudPackager" Version="12.0.0" /> - </ItemGroup> </Project> diff --git a/Malmstone/Services/PVPService.cs b/Malmstone/Services/PVPService.cs index 12b4c2a..0c61820 100644 --- a/Malmstone/Services/PVPService.cs +++ b/Malmstone/Services/PVPService.cs @@ -26,7 +26,7 @@ namespace Malmstone.Services unsafe { var pvpProfile = PvPProfile.Instance(); - if (pvpProfile != null && pvpProfile->IsLoaded != 0) + if (pvpProfile != null && pvpProfile->IsLoaded) { return new PvPSeriesInfo { @@ -44,7 +44,7 @@ namespace Malmstone.Services unsafe { var pvpProfile = PvPProfile.Instance(); - if (pvpProfile != null && pvpProfile->IsLoaded != 0) + if (pvpProfile != null && pvpProfile->IsLoaded) { CachedFrontlineResults = new PVPProfileFrontlineResults { @@ -132,7 +132,7 @@ namespace Malmstone.Services unsafe { var pvpProfile = PvPProfile.Instance(); - if (pvpProfile != null && pvpProfile->IsLoaded != 0) + if (pvpProfile != null && pvpProfile->IsLoaded) { return new PVPProfileFrontlineResults { diff --git a/Malmstone/Utils/MalmstoneXPCalculator.cs b/Malmstone/Utils/MalmstoneXPCalculator.cs index 965221b..bf11075 100644 --- a/Malmstone/Utils/MalmstoneXPCalculator.cs +++ b/Malmstone/Utils/MalmstoneXPCalculator.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; namespace Malmstone.Utils { diff --git a/Malmstone/Utils/UIChanger.cs b/Malmstone/Utils/UIChanger.cs index d764a83..ca26d69 100644 --- a/Malmstone/Utils/UIChanger.cs +++ b/Malmstone/Utils/UIChanger.cs @@ -17,7 +17,7 @@ public class UIChanger { unsafe { - var PvpRewardWindow = (AtkUnitBase*)addonInfo.Addon; + var PvpRewardWindow = (AtkUnitBase*)addonInfo.Addon.Address; var SeriesLevelTextNode = PvpRewardWindow->GetTextNodeById(16); PvPSeriesInfo? PvPSeriesInfo = Plugin.PvPService.GetPvPSeriesInfo(); if (SeriesLevelTextNode != null && PvPSeriesInfo != null) @@ -33,7 +33,7 @@ public class UIChanger { unsafe { - var PvpProfileWindow = (AtkUnitBase*)addonInfo.Addon; + var PvpProfileWindow = (AtkUnitBase*)addonInfo.Addon.Address; var SeriesLevelTextNode = PvpProfileWindow->GetTextNodeById(24); PvPSeriesInfo? PvPSeriesInfo = Plugin.PvPService.GetPvPSeriesInfo(); if (PvPSeriesInfo == null) diff --git a/Malmstone/Windows/ConfigWindow.cs b/Malmstone/Windows/ConfigWindow.cs index 1e1da6e..eb4e36b 100644 --- a/Malmstone/Windows/ConfigWindow.cs +++ b/Malmstone/Windows/ConfigWindow.cs @@ -1,7 +1,7 @@ using System; using System.Numerics; using Dalamud.Interface.Windowing; -using ImGuiNET; +using Dalamud.Bindings.ImGui; namespace Malmstone.Windows; diff --git a/Malmstone/Windows/MainWindow.cs b/Malmstone/Windows/MainWindow.cs index 72a1a2a..616dc6a 100644 --- a/Malmstone/Windows/MainWindow.cs +++ b/Malmstone/Windows/MainWindow.cs @@ -1,7 +1,7 @@ using System; using System.Numerics; using Dalamud.Interface.Windowing; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using Malmstone.Services; using Malmstone.Utils; diff --git a/Malmstone/packages.lock.json b/Malmstone/packages.lock.json index 2babe9d..a790ca8 100644 --- a/Malmstone/packages.lock.json +++ b/Malmstone/packages.lock.json @@ -4,9 +4,9 @@ "net9.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[12.0.0, )", - "resolved": "12.0.0", - "contentHash": "J5TJLV3f16T/E2H2P17ClWjtfEBPpq3yxvqW46eN36JCm6wR+EaoaYkqG9Rm5sHqs3/nK/vKjWWyvEs/jhKoXw==" + "requested": "[13.0.0, )", + "resolved": "13.0.0", + "contentHash": "Mb3cUDSK/vDPQ8gQIeuCw03EMYrej1B4J44a1AvIJ9C759p9XeqdU9Hg4WgOmlnlPe0G7ILTD32PKSUpkQNa8w==" }, "DotNet.ReproducibleBuilds": { "type": "Direct", |