From dec8fbef338dc442ca19f1a78304956dd2f19e9b Mon Sep 17 00:00:00 2001
From: Timerix22 <timerix11@gmail.com>
Date: Sun, 7 Jan 2024 14:52:00 +0600
Subject: [PATCH] DTLib updated

---
 minecraft-launcher-client/Network.cs             | 9 ++++++++-
 minecraft-launcher-client/launcher-client.csproj | 6 +++---
 minecraft-launcher-server/Server.cs              | 6 ++----
 minecraft-launcher-server/launcher-server.csproj | 6 +++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/minecraft-launcher-client/Network.cs b/minecraft-launcher-client/Network.cs
index 8f4d686..b7fb0b2 100644
--- a/minecraft-launcher-client/Network.cs
+++ b/minecraft-launcher-client/Network.cs
@@ -55,21 +55,28 @@ public class Network
         var manifestPath = Path.Concat(dirOnServer, "manifest.dtsod");
         Logger.LogDebug(nameof(Network), manifestPath);
         string manifestContent = Fsp.DownloadFileToMemory(manifestPath).BytesToString();
+        Logger.LogDebug(nameof(Network), manifestContent);
         var manifest = new DtsodV23(manifestContent);
         var hasher = new Hasher();
         foreach (var fileOnServerData in manifest)
         {
             IOPath fileOnClient = Path.Concat(dirOnClient, fileOnServerData.Key);
             if (!File.Exists(fileOnClient) || (overwrite && hasher.HashFile(fileOnClient).HashToString() != fileOnServerData.Value))
+            {
+                Logger.LogDebug(nameof(Network), $"downloading {fileOnClient}");
                 Fsp.DownloadFile(Path.Concat(dirOnServer, fileOnServerData.Key), fileOnClient);
+            }
         }
         // удаление лишних файлов
         if (delete_excess)
         {
             foreach (var file in Directory.GetAllFiles(dirOnClient))
             {
-                if (!manifest.ContainsKey(file.RemoveBase(dirOnClient).Str.Replace('\\','/'))) 
+                if (!manifest.ContainsKey(file.RemoveBase(dirOnClient).Str.Replace('\\','/')))
+                {
+                    Logger.LogDebug(nameof(Network), $"deleting {file}");
                     File.Delete(file);
+                }
             }
         }
     }
diff --git a/minecraft-launcher-client/launcher-client.csproj b/minecraft-launcher-client/launcher-client.csproj
index f800f50..41812ab 100644
--- a/minecraft-launcher-client/launcher-client.csproj
+++ b/minecraft-launcher-client/launcher-client.csproj
@@ -23,8 +23,8 @@
       <PackageReference Include="Costura.Fody" Version="5.7.0">
         <PrivateAssets>all</PrivateAssets>
       </PackageReference>
-      <PackageReference Include="DTLib.Dtsod" Version="1.3.1"  />
-      <PackageReference Include="DTLib.Logging" Version="1.3.1" />
-      <PackageReference Include="DTLib.Network" Version="1.3.3" />
+      <PackageReference Include="DTLib.Dtsod" Version="1.3.3" />
+      <PackageReference Include="DTLib.Logging" Version="1.3.3" />
+      <PackageReference Include="DTLib.Network" Version="1.4.1" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/minecraft-launcher-server/Server.cs b/minecraft-launcher-server/Server.cs
index ba44ebd..53954fd 100644
--- a/minecraft-launcher-server/Server.cs
+++ b/minecraft-launcher-server/Server.cs
@@ -24,11 +24,9 @@ static class Server
     static readonly Socket mainSocket = new(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
     static ServerConfig Config = null!;
     public static readonly IOPath shared_dir = "public";
-
-
+    
     static void Main(string[] args)
     {
-        Timer? updateCheckTimer = null;
         try
         {
             Console.Title = "minecraft_launcher_server";
@@ -39,7 +37,7 @@ static class Server
             
             CheckUpdates();
             // check for updates every 5 minutes
-            updateCheckTimer = new Timer(true, 5*60 * 1000, CheckUpdates);
+            var updateCheckTimer = new Timer(true, 5*60 * 1000, CheckUpdates);
             updateCheckTimer.Start();
             
             
diff --git a/minecraft-launcher-server/launcher-server.csproj b/minecraft-launcher-server/launcher-server.csproj
index 9f4471e..a047f49 100644
--- a/minecraft-launcher-server/launcher-server.csproj
+++ b/minecraft-launcher-server/launcher-server.csproj
@@ -12,8 +12,8 @@
     <InvariantGlobalization>true</InvariantGlobalization>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DTLib.Dtsod" Version="1.3.1" />
-    <PackageReference Include="DTLib.Logging" Version="1.3.1" />
-    <PackageReference Include="DTLib.Network" Version="1.3.3" />
+    <PackageReference Include="DTLib.Dtsod" Version="1.3.3" />
+    <PackageReference Include="DTLib.Logging" Version="1.3.3" />
+    <PackageReference Include="DTLib.Network" Version="1.4.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file