From 391c88e1a8c4397ff364ee0197c2f5ba98b81db2 Mon Sep 17 00:00:00 2001 From: Seathasky Date: Fri, 19 Dec 2025 19:44:04 -0500 Subject: [PATCH] 1.7.2 .net 10 / api 14 update --- BDTHPlugin/BDTHPlugin.csproj | 12 ++++-------- BDTHPlugin/BDTHPlugin.json | 4 ++-- BDTHPlugin/Interface/Windows/FurnitureList.cs | 6 ++++-- BDTHPlugin/Plugin.cs | 4 ++++ BDTHPlugin/packages.lock.json | 19 +++++++++++++++++++ 5 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 BDTHPlugin/packages.lock.json diff --git a/BDTHPlugin/BDTHPlugin.csproj b/BDTHPlugin/BDTHPlugin.csproj index 823d944..9a357be 100644 --- a/BDTHPlugin/BDTHPlugin.csproj +++ b/BDTHPlugin/BDTHPlugin.csproj @@ -1,18 +1,14 @@ - + - 1.7.1 - net9.0-windows + 1.7.2 + net10.0-windows true latest false false false + $(NoWarn);MSB3277 - - - - - Always diff --git a/BDTHPlugin/BDTHPlugin.json b/BDTHPlugin/BDTHPlugin.json index d873402..d86717f 100644 --- a/BDTHPlugin/BDTHPlugin.json +++ b/BDTHPlugin/BDTHPlugin.json @@ -4,10 +4,10 @@ "Description": "Move around housing items with coordinates and allows you to place anywhere.", "Punchline": "House decorating made easy!", "InternalName": "BDTHPlugin", - "AssemblyVersion": "1.7.1", + "AssemblyVersion": "1.7.2", "RepoUrl": "https://github.com/LeonBlade/BDTHPlugin", "ApplicableVersion": "any", "Tags": ["bdth", "housing", "float", "place", "glitch", "furnishing", "LeonBlade"], - "DalamudApiLevel": 13, + "DalamudApiLevel": 14, "IconUrl": "https://github.com/LeonBlade/BDTHPlugin/raw/main/icon.png" } diff --git a/BDTHPlugin/Interface/Windows/FurnitureList.cs b/BDTHPlugin/Interface/Windows/FurnitureList.cs index b7143b2..b6f1117 100644 --- a/BDTHPlugin/Interface/Windows/FurnitureList.cs +++ b/BDTHPlugin/Interface/Windows/FurnitureList.cs @@ -4,6 +4,8 @@ using Dalamud.Interface.Windowing; using Dalamud.Bindings.ImGui; +using Dalamud.Game.ClientState; +using Dalamud.Game.ClientState.Objects; namespace BDTHPlugin.Interface.Windows { @@ -51,10 +53,10 @@ public unsafe override void Draw() ImGui.BeginChild("FurnishingList"); - if (Plugin.ClientState.LocalPlayer == null) + if (Plugin.ObjectTable.LocalPlayer == null) return; - var playerPos = Plugin.ClientState.LocalPlayer.Position; + var playerPos = Plugin.ObjectTable.LocalPlayer.Position; // An active item is being selected. // var hasActiveItem = Memory.HousingStructure->ActiveItem != null; diff --git a/BDTHPlugin/Plugin.cs b/BDTHPlugin/Plugin.cs index 530861b..838e2e1 100644 --- a/BDTHPlugin/Plugin.cs +++ b/BDTHPlugin/Plugin.cs @@ -1,5 +1,7 @@ using Dalamud.Game; using Dalamud.Game.ClientState.Conditions; +using Dalamud.Game.ClientState; +using Dalamud.Game.ClientState.Objects; using Dalamud.Game.Command; using Dalamud.IoC; using Dalamud.Plugin; @@ -26,6 +28,8 @@ public class Plugin : IDalamudPlugin [PluginService] public static IDataManager Data { get; private set; } = null!; [PluginService] public static ICommandManager CommandManager { get; private set; } = null!; [PluginService] public static IClientState ClientState { get; private set; } = null!; + [PluginService] public static IObjectTable ObjectTable { get; private set; } = null!; + [PluginService] public static IPlayerState PlayerState { get; private set; } = null!; [PluginService] public static IFramework Framework { get; private set; } = null!; [PluginService] public static IChatGui Chat { get; private set; } = null!; [PluginService] public static IGameGui GameGui { get; private set; } = null!; diff --git a/BDTHPlugin/packages.lock.json b/BDTHPlugin/packages.lock.json new file mode 100644 index 0000000..d360632 --- /dev/null +++ b/BDTHPlugin/packages.lock.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "dependencies": { + "net10.0-windows7.0": { + "DalamudPackager": { + "type": "Direct", + "requested": "[14.0.1, )", + "resolved": "14.0.1", + "contentHash": "y0WWyUE6dhpGdolK3iKgwys05/nZaVf4ZPtIjpLhJBZvHxkkiE23zYRo7K7uqAgoK/QvK5cqF6l3VG5AbgC6KA==" + }, + "DotNet.ReproducibleBuilds": { + "type": "Direct", + "requested": "[1.2.39, )", + "resolved": "1.2.39", + "contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg==" + } + } + } +} \ No newline at end of file