Update for Patch 6.2

LeonBlade · Aug 25, 2022 · bd2429a · bd2429a
1 parent ea96d0f
commit bd2429a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/HeelsPlugin/ConfigModel.cs b/HeelsPlugin/ConfigModel.cs
@@ -12,5 +12,10 @@ public class ConfigModel
     public bool Enabled;
     public Sexes SexFilter = (Sexes)255;
     public Races RaceFilter = (Races)255;
+
+    public ConfigModel()
+    {
+      Name = "";
+    }
   }
 }
diff --git a/HeelsPlugin/Gui/ConfigItem.cs b/HeelsPlugin/Gui/ConfigItem.cs
@@ -11,7 +11,7 @@ public class ConfigItem
     private readonly int key = 0;
     private readonly ComboWithFilter<Item> combo;
     private readonly ConfigModel config;
-    private string ItemName
+    private string? ItemName
     {
       get
       {
@@ -31,7 +31,7 @@ private string ItemName
             (short)item.ModelMain == config.Model;
         });
         if (foundItem != null)
-          return foundItem?.Name;
+          return foundItem.Name ?? "";
         return "(Invalid item found)";
       }
     }

diff --git a/HeelsPlugin/HeelsPlugin.csproj b/HeelsPlugin/HeelsPlugin.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.1.8</Version>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <Version>1.1.9</Version>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <LangVersion>latest</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
@@ -12,7 +12,7 @@
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <PreserveCompilationContext>false</PreserveCompilationContext>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <OutputPath>$(AppData)\XIVLauncher\devPlugins\BDTHPlugin</OutputPath>
+    <OutputPath>$(AppData)\XIVLauncher\devPlugins\HeelsPlugin</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/HeelsPlugin/HeelsPlugin.json b/HeelsPlugin/HeelsPlugin.json
@@ -3,10 +3,10 @@
   "Name": "Heels Plugin",
   "Description": "Offsets your character off the ground for when wearing heels.",
   "InternalName": "HeelsPlugin",
-  "AssemblyVersion": "1.1.8",
+  "AssemblyVersion": "1.1.9",
   "RepoUrl": "https://github.com/LeonBlade/HeelsPlugin",
   "ApplicableVersion": "any",
   "Tags": ["heels", "high heels", "height", "offset", "leonblade"],
-  "DalamudApiLevel": 6,
+  "DalamudApiLevel": 7,
   "IconUrl": "https://github.com/LeonBlade/HeelsPlugin/raw/main/icon.png"
 }
diff --git a/HeelsPlugin/PluginMemory.cs b/HeelsPlugin/PluginMemory.cs
@@ -1,6 +1,4 @@
 using Dalamud.Game.ClientState.Objects.Enums;
-using Dalamud.Game.ClientState.Objects.SubKinds;
-using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Hooking;
 using Dalamud.Logging;
 using System;
@@ -19,10 +17,7 @@ public class PluginMemory
     public PluginMemory()
     {
       playerMovementFunc = Plugin.SigScanner.ScanText("E8 ?? ?? ?? ?? 48 8B CB E8 ?? ?? ?? ?? 48 8B CB E8 ?? ?? ?? ?? 48 8B 03 48 8B CB FF 50 ?? 83 F8 ?? 75 ??");
-      playerMovementHook = new Hook<PlayerMovementDelegate>(
-        playerMovementFunc,
-        new PlayerMovementDelegate(PlayerMovementHook)
-      );
+      playerMovementHook = Hook<PlayerMovementDelegate>.FromAddress(playerMovementFunc, new PlayerMovementDelegate(PlayerMovementHook));
 
       playerMovementHook.Enable();
     }
@@ -43,7 +38,7 @@ public void Dispose()
       }
     }
 
-    private ConfigModel GetConfigForModelId(EquipItem inModel)
+    private ConfigModel? GetConfigForModelId(EquipItem inModel)
     {
       var foundConfig = Plugin.Configuration.Configs.Where(config =>
       {
@@ -80,7 +75,7 @@ public EquipItem GetPlayerFeet()
 
     public EquipItem GetPlayerFeet(IntPtr player)
     {
-      var feet = (uint)Marshal.ReadInt32(player + 0x808 + 0x10);
+      var feet = (uint)Marshal.ReadInt32(player + 0x818 + 0x10);
       return new EquipItem(feet);
     }
 

diff --git a/HeelsPlugin/PluginUI.cs b/HeelsPlugin/PluginUI.cs
@@ -74,7 +74,7 @@ private ComboWithFilter<Item> CreateCombo(int id)
           var model = new EquipItem((uint)item.ModelMain);
           var ids = $"{model.Main}, {model.Variant}";
           var size = ImGui.CalcTextSize(ids).X;
-          ImGui.SameLine(ImGui.GetWindowContentRegionWidth() - size - ImGui.GetStyle().ItemInnerSpacing.X);
+          ImGui.SameLine(ImGui.GetWindowContentRegionMax().X - size - ImGui.GetStyle().ItemInnerSpacing.X);
           ImGui.TextColored(GreyVector, ids);
           return ret;
         }