From 0d3fbc245bd34d68a0190502d5774973b90f8821 Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Wed, 24 Aug 2022 01:40:21 +0200
Subject: [PATCH] test version for .net6/dalamudapi7

---
 MareSynchronos/Factories/CharacterDataFactory.cs |  2 +-
 MareSynchronos/Managers/CachedPlayer.cs          | 10 ++++++----
 MareSynchronos/Managers/PlayerManager.cs         |  1 -
 MareSynchronos/MareSynchronos.csproj             | 12 ++++++------
 MareSynchronos/UI/CompactUI.cs                   |  2 +-
 Penumbra                                         |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/MareSynchronos/Factories/CharacterDataFactory.cs b/MareSynchronos/Factories/CharacterDataFactory.cs
index 58547ed..ee851d9 100644
--- a/MareSynchronos/Factories/CharacterDataFactory.cs
+++ b/MareSynchronos/Factories/CharacterDataFactory.cs
@@ -169,7 +169,7 @@ public class CharacterDataFactory
 
     private void AddReplacementsFromTexture(string texPath, ObjectKind objectKind, CharacterData cache, int inheritanceLevel = 0, bool doNotReverseResolve = true)
     {
-        if (texPath.IsNullOrEmpty()) return;
+        if (string.IsNullOrEmpty(texPath)) return;
 
         //Logger.Verbose("Adding File Replacement for Texture " + texPath);
 
diff --git a/MareSynchronos/Managers/CachedPlayer.cs b/MareSynchronos/Managers/CachedPlayer.cs
index 8ef1d8c..335eb43 100644
--- a/MareSynchronos/Managers/CachedPlayer.cs
+++ b/MareSynchronos/Managers/CachedPlayer.cs
@@ -9,9 +9,9 @@ using FFXIVClientStructs.FFXIV.Client.Game.Character;
 using MareSynchronos.API;
 using MareSynchronos.FileCacheDB;
 using MareSynchronos.Interop;
+using MareSynchronos.Models;
 using MareSynchronos.Utils;
 using MareSynchronos.WebAPI;
-using Penumbra.GameData.Structs;
 
 namespace MareSynchronos.Managers;
 
@@ -59,7 +59,7 @@ public class CachedPlayer
 
     private CharacterCacheDto _cachedData = new();
 
-    private CharacterEquipment? _currentCharacterEquipment;
+    private PlayerRelatedObject? _currentCharacterEquipment;
 
     public void ApplyCharacterData(CharacterCacheDto characterData)
     {
@@ -363,7 +363,8 @@ public class CachedPlayer
         _dalamudUtil.FrameworkUpdate += DalamudUtilOnFrameworkUpdate;
         _ipcManager.PenumbraRedrawEvent += IpcManagerOnPenumbraRedrawEvent;
         _originalGlamourerData = _ipcManager.GlamourerGetCharacterCustomization(PlayerCharacter);
-        _currentCharacterEquipment = new CharacterEquipment(PlayerCharacter);
+        _currentCharacterEquipment = new PlayerRelatedObject(ObjectKind.Player, IntPtr.Zero, IntPtr.Zero,
+            () => _dalamudUtil.GetPlayerCharacterFromObjectTableByName(PlayerName)?.Address ?? IntPtr.Zero);
         _isDisposed = false;
         if (cache != null)
         {
@@ -382,7 +383,8 @@ public class CachedPlayer
             return;
         }
 
-        if (!_currentCharacterEquipment!.CompareAndUpdate(PlayerCharacter))
+        _currentCharacterEquipment?.CheckAndUpdateObject();
+        if (_currentCharacterEquipment?.HasUnprocessedUpdate ?? false)
         {
             OnPlayerChanged();
         }
diff --git a/MareSynchronos/Managers/PlayerManager.cs b/MareSynchronos/Managers/PlayerManager.cs
index b925018..d23bbed 100644
--- a/MareSynchronos/Managers/PlayerManager.cs
+++ b/MareSynchronos/Managers/PlayerManager.cs
@@ -29,7 +29,6 @@ namespace MareSynchronos.Managers
 
         private CancellationTokenSource? _playerChangedCts = new();
         private DateTime _lastPlayerObjectCheck;
-        private CharacterEquipment? _currentCharacterEquipment = new();
 
         private List<PlayerRelatedObject> playerRelatedObjects = new List<PlayerRelatedObject>();
 
diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index 8633aa1..3153f8f 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -3,14 +3,14 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.3.5</Version>
+    <Version>0.3.6</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net5.0-windows7.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <Platforms>x64</Platforms>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
@@ -21,15 +21,15 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
+    <DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\6692d56\</DalamudLibPath>
     <AssemblyVersion></AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DalamudPackager" Version="2.1.7" />
+    <PackageReference Include="DalamudPackager" Version="2.1.8" />
     <PackageReference Include="lz4net" Version="1.0.15.93" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs
index 3097f10..e63cbe0 100644
--- a/MareSynchronos/UI/CompactUI.cs
+++ b/MareSynchronos/UI/CompactUI.cs
@@ -167,7 +167,7 @@ namespace MareSynchronos.UI
             _showUidForEntry.TryGetValue(entry.OtherUID, out var showUidInsteadOfName);
             if (!showUidInsteadOfName && _configuration.GetCurrentServerUidComments().TryGetValue(entry.OtherUID, out var playerText))
             {
-                if (playerText.IsNullOrEmpty())
+                if (string.IsNullOrEmpty(playerText))
                 {
                     playerText = entry.OtherUID;
                 }
diff --git a/Penumbra b/Penumbra
index cfc441b..cfeb20a 160000
--- a/Penumbra
+++ b/Penumbra
@@ -1 +1 @@
-Subproject commit cfc441b9b1acaaf1bf2da758bd875cfb5229ab60
+Subproject commit cfeb20a18efc41221ca5aaa2f3562c93536a8f4d