From cbdc868271fdefd41e5aee83e61093314d7bad53 Mon Sep 17 00:00:00 2001
From: Rutherther <fandabohacek@gmail.com>
Date: Tue, 14 Feb 2023 18:15:52 +0100
Subject: [PATCH] chore: update dependencies

---
 src/PacketLogger/Models/NostaleProcess.cs     |  6 +++---
 .../Models/Packets/ClientPacketProvider.cs    |  4 ++--
 src/PacketLogger/PacketLogger.csproj          | 19 +++++++++--------
 .../ViewModels/DocumentViewModel.cs           | 21 ++++++++++++-------
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/PacketLogger/Models/NostaleProcess.cs b/src/PacketLogger/Models/NostaleProcess.cs
index ab1f3db..6887718 100644
--- a/src/PacketLogger/Models/NostaleProcess.cs
+++ b/src/PacketLogger/Models/NostaleProcess.cs
@@ -62,13 +62,13 @@ public class NostaleProcess : ObservableObject
     {
         try
         {
-            if (BrowserManager.IsInGame != _wasInGame)
+            if (BrowserManager.IsInGame.Get() != _wasInGame)
             {
                 OnPropertyChanging(nameof(BrowserManager));
                 OnPropertyChanged(nameof(BrowserManager));
             }
 
-            var currentCharacterName = BrowserManager.IsInGame ? BrowserManager.PlayerManager.Player.Name : null;
+            var currentCharacterName = BrowserManager.IsInGame.Get() ? BrowserManager.PlayerManager.Get().Player.Name : null;
             var changed = _lastCharacterName != currentCharacterName;
 
             if (changed)
@@ -76,7 +76,7 @@ public class NostaleProcess : ObservableObject
                 OnPropertyChanging(nameof(CharacterString));
             }
 
-            _wasInGame = BrowserManager.IsInGame;
+            _wasInGame = BrowserManager.IsInGame.Get();
             _lastCharacterName = currentCharacterName;
 
             if (changed)
diff --git a/src/PacketLogger/Models/Packets/ClientPacketProvider.cs b/src/PacketLogger/Models/Packets/ClientPacketProvider.cs
index e182aad..58df879 100644
--- a/src/PacketLogger/Models/Packets/ClientPacketProvider.cs
+++ b/src/PacketLogger/Models/Packets/ClientPacketProvider.cs
@@ -50,8 +50,8 @@ public abstract class ClientPacketProvider : ReactiveObject, IPacketProvider
     }
 
     /// <inheritdoc />
-    public string Name => (_process.BrowserManager.IsInGame
-        ? _process.BrowserManager.PlayerManager.Player.Name
+    public string Name => (_process.BrowserManager.IsInGame.Get()
+        ? _process.BrowserManager.PlayerManager.Get().Player.Name
         : null) ?? $"Not in game ({_process.Process.Id})";
 
     /// <inheritdoc />
diff --git a/src/PacketLogger/PacketLogger.csproj b/src/PacketLogger/PacketLogger.csproj
index 46d9ae4..c135744 100644
--- a/src/PacketLogger/PacketLogger.csproj
+++ b/src/PacketLogger/PacketLogger.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
@@ -35,19 +35,20 @@
       <IncludeAssets>All</IncludeAssets>
       <PrivateAssets>None</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="NosSmooth.Core" Version="4.0.2" />
-    <PackageReference Include="NosSmooth.Injector" Version="1.1.1-main4158362079" />
-    <PackageReference Include="NosSmooth.Cryptography" Version="1.0.0-main4161214102" />
-    <PackageReference Include="NosSmooth.LocalBinding" Version="1.1.0-main4155845215" />
+    <PackageReference Include="NosSmooth.Core" Version="4.0.3" />
+    <PackageReference Include="NosSmooth.Injector" Version="1.1.1" />
+    <PackageReference Include="NosSmooth.Cryptography" Version="1.0.0" />
+    <PackageReference Include="NosSmooth.LocalBinding" Version="2.0.0" />
     <PackageReference Include="NosSmooth.PacketSerializer.Abstractions" Version="1.3.1" />
-    <PackageReference Include="NosSmooth.Pcap" Version="1.0.0-main4161214102" />
-    <PackageReference Include="Projektanker.Icons.Avalonia" Version="5.8.0" />
-    <PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="5.8.0" />
+    <PackageReference Include="NosSmooth.Pcap" Version="1.0.0" />
+    <PackageReference Include="Projektanker.Icons.Avalonia" Version="5.9.0" />
+    <PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="5.9.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.1.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Remora.Results" Version="7.2.3" />
-    <PackageReference Include="System.Text.Json" Version="7.0.1" />
+    <PackageReference Include="System.Management" Version="7.0.0" />
+    <PackageReference Include="System.Text.Json" Version="7.0.2" />
     <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
   </ItemGroup>
 
diff --git a/src/PacketLogger/ViewModels/DocumentViewModel.cs b/src/PacketLogger/ViewModels/DocumentViewModel.cs
index ec243e1..6ccf598 100644
--- a/src/PacketLogger/ViewModels/DocumentViewModel.cs
+++ b/src/PacketLogger/ViewModels/DocumentViewModel.cs
@@ -174,8 +174,8 @@ public class DocumentViewModel : Document, INotifyPropertyChanged, IDisposable
                     (
                         _ =>
                         {
-                            Title = (process.BrowserManager.IsInGame
-                                ? process.BrowserManager.PlayerManager.Player.Name
+                            Title = (process.BrowserManager.IsInGame.Get()
+                                ? process.BrowserManager.PlayerManager.Get().Player.Name
                                 : null) ?? $"Not in game ({process.Process.Id})";
                         }
                     )
@@ -195,10 +195,15 @@ public class DocumentViewModel : Document, INotifyPropertyChanged, IDisposable
             {
                 Loading = true;
 
-                // var encryptionKey = process.BrowserManager.IsInGame ? process.BrowserManager.NtClient.EncryptionKey : 0;
-                var encryptionKey = 0;
+                var initialEncryptionKey = 0;
+                if (process.BrowserManager.IsInGame.Get())
+                {
+                    var encryptionKeyOptional = process.BrowserManager.NtClient.Map(client => client.EncryptionKey);
+                    encryptionKeyOptional.TryGet(out initialEncryptionKey);
+                }
+
                 var client = ActivatorUtilities.CreateInstance<PcapNostaleClient>
-                    (services, process.Process, encryptionKey, Encoding.Default);
+                    (services, process.Process, initialEncryptionKey, Encoding.Default);
 
                 var provider = new PcapPacketProvider(process, client);
                 _packetProvider = provider;
@@ -210,8 +215,8 @@ public class DocumentViewModel : Document, INotifyPropertyChanged, IDisposable
                     (
                         _ =>
                         {
-                            Title = (process.BrowserManager.IsInGame
-                                ? process.BrowserManager.PlayerManager.Player.Name
+                            Title = (process.BrowserManager.IsInGame.Get()
+                                ? process.BrowserManager.PlayerManager.Get().Player.Name
                                 : null) ?? $"Not in game ({process.Process.Id})";
                         }
                     )
@@ -260,7 +265,7 @@ public class DocumentViewModel : Document, INotifyPropertyChanged, IDisposable
     /// <summary>
     /// Gets the processes observable.
     /// </summary>
-    public ObservableCollection<NostaleProcess> Processes => _processes.Processes;
+    public NostaleProcesses Processes => _processes;
 
     /// <summary>
     /// Gets packet provider.
-- 
2.49.0