Upgrade dependencies

Titlehhhh · Sep 22, 2024 · b5d13a8 · b5d13a8
1 parent 8e4bd33
commit b5d13a8
Show file tree

Hide file tree

Showing 12 changed files with 109 additions and 41 deletions.
diff --git a/src/McProtoNet/McProtoNet.Abstractions/McProtoNet.Abstractions.csproj b/src/McProtoNet/McProtoNet.Abstractions/McProtoNet.Abstractions.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DotNext" Version="5.7.0" />
+        <PackageReference Include="DotNext" Version="5.13.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/McProtoNet/McProtoNet.NBT/McProtoNet.NBT.csproj b/src/McProtoNet/McProtoNet.NBT/McProtoNet.NBT.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
@@ -12,7 +12,10 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="ConfigureAwait.Fody" Version="3.3.2"/>
-        <PackageReference Include="DotNext" Version="5.7.0" />
-        <PackageReference Include="MinVer" Version="5.0.0"/>
+        <PackageReference Include="DotNext" Version="5.13.0" />
+        <PackageReference Include="MinVer" Version="6.0.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 </Project>
diff --git a/src/McProtoNet/McProtoNet.NBT/NbtSpanReader.cs b/src/McProtoNet/McProtoNet.NBT/NbtSpanReader.cs
@@ -21,11 +21,11 @@ public NbtSpanReader(ReadOnlySpan<byte> data)
     }
 
 
-    public T ReadAsTag<T>(bool readRootName = true) where T : NbtTag
+    public T ReadAsTag<T>(bool readRootName) where T : NbtTag
     {
         NbtTagType type = ReadTagType();
         string? rootName = readRootName ? ReadString() : null;
-        if (_reader.RemainingCount >= 512) // Recursive
+        if (_reader.RemainingCount <= 512) // Recursive
         {
             return ReadRecursive(type, rootName) as T ?? throw new InvalidOperationException($"Error cast to {typeof(T)}");
         }

diff --git a/src/McProtoNet/McProtoNet.Protocol/McProtoNet.Protocol.csproj b/src/McProtoNet/McProtoNet.Protocol/McProtoNet.Protocol.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/src/McProtoNet/McProtoNet.Protocol/Protocols/MultiProtocol.cs b/src/McProtoNet/McProtoNet.Protocol/Protocols/MultiProtocol.cs
@@ -22,7 +22,7 @@ public sealed class MultiProtocol : ProtocolBase
 {
     private Subject<KeepAlivePacket> _onKeepAlive = new Subject<KeepAlivePacket>();
     private static readonly byte[] bitset = new byte[3];
-
+    public Subject<Unit> OnJoinGame { get; } = new();
     public MultiProtocol(IPacketBroker client) : base(client)
     {
         //SupportedVersion = 755;
@@ -65,11 +65,16 @@ protected override void OnPacketReceived(InputPacket packet)
             >= 764 and <= 765 => 0x1B,
             >= 766 and <= 767 => 0x1D,
         };
-
+        if (packet.Id == 0x2B)
+        {
+            OnJoinGame.OnNext(Unit.Default);
+            return;
+        }
         if (keepAlive == packet.Id)
         {
             scoped var reader = new MinecraftPrimitiveReaderSlim(packet.Data);
-            _onKeepAlive.OnNext(new KeepAlivePacket(reader.ReadSignedLong()));
+            //_onKeepAlive.OnNext(new KeepAlivePacket(reader.ReadSignedLong()));
+            _ = SendKeepAlive(reader.ReadSignedLong());
         }
         else if (disconnect == packet.Id)
         {
@@ -79,7 +84,8 @@ protected override void OnPacketReceived(InputPacket packet)
                // var reason = reader.ReadNbt();
                NbtSpanReader nbtReader = new NbtSpanReader(packet.Data.Span);
 
-               var nbt = nbtReader.ReadAsTag<NbtTag>();
+               var nbt = nbtReader.ReadAsTag<NbtTag>(false);
+               Console.WriteLine($"{nbt} ThreadName: {Thread.CurrentThread.Name}");
             }
             else
             {

diff --git a/src/McProtoNet/McProtoNet.Serialization/McProtoNet.Serialization.csproj b/src/McProtoNet/McProtoNet.Serialization/McProtoNet.Serialization.csproj
@@ -1,18 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DotNext" Version="5.7.0" />
-        <PackageReference Include="DotNext.IO" Version="5.7.0" />
-        <PackageReference Include="DotNext.Unsafe" Version="5.7.0" />
+        <PackageReference Include="DotNext" Version="5.13.0" />
+        <PackageReference Include="DotNext.IO" Version="5.13.0" />
+        <PackageReference Include="DotNext.Unsafe" Version="5.13.0" />
         <PackageReference Include="ZString" Version="2.6.0"/>
-        <PackageReference Include="MinVer" Version="5.0.0"/>
+        <PackageReference Include="MinVer" Version="6.0.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/McProtoNet/McProtoNet.Tests/McProtoNet.Tests.csproj b/src/McProtoNet/McProtoNet.Tests/McProtoNet.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <LangVersion>12</LangVersion>
         <IsPackable>false</IsPackable>

diff --git a/src/McProtoNet/McProtoNet.Utils/McProtoNet.Utils.csproj b/src/McProtoNet/McProtoNet.Utils/McProtoNet.Utils.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

diff --git a/src/McProtoNet/McProtoNet/Client/MinecraftClient.cs b/src/McProtoNet/McProtoNet/Client/MinecraftClient.cs
@@ -1,6 +1,7 @@
 using System.Net.Sockets;
 using DotNext;
 using DotNext.Threading;
+using Fody;
 using LibDeflate;
 using McProtoNet.Abstractions;
 using McProtoNet.Protocol;
@@ -117,8 +118,10 @@ public async Task Start()
 
 
             var result = await minecraftLogin.Login(mainStream, loginOptions, CTS.Token);
-
-            _ = MainLoop(result, CTS.Token);
+
+                _ = MainLoop(result, CTS.Token);
+
+
         }
         catch (OperationCanceledException ex)
         {
@@ -147,6 +150,7 @@ private void OnException(Exception ex)
         StateChanged?.Invoke(this, new StateEventArgs(ex, _state));
     }
 
+    [ConfigureAwait(true)]
     private async Task MainLoop(LoginizationResult loginizationResult, CancellationToken cancellationToken)
     {
         _packetSender = new MinecraftPacketSender();
@@ -162,7 +166,8 @@ private async Task MainLoop(LoginizationResult loginizationResult, CancellationT
         {
             while (!cancellationToken.IsCancellationRequested)
             {
-                var packet = await _packetReader.ReadNextPacketAsync(cancellationToken);
+                var packet = await _packetReader
+                    .ReadNextPacketAsync(cancellationToken);
                 try
                 {
                     PacketReceived?.Invoke(this, packet);
@@ -208,8 +213,6 @@ private async ValueTask ConnectAsync(CancellationToken cancellationToken)
             }
             else
             {
-
-
                 await newTcp.ConnectAsync(Host, Port, cancellationToken);
                 mainStream = newTcp.GetStream();
             }

diff --git a/src/McProtoNet/McProtoNet/McProtoNet.csproj b/src/McProtoNet/McProtoNet/McProtoNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>preview</LangVersion>
@@ -12,10 +12,13 @@
 
     <ItemGroup>
         <PackageReference Include="ConfigureAwait.Fody" Version="3.3.2"/>
-        <PackageReference Include="DotNext.IO" Version="5.7.0" />
-        <PackageReference Include="DotNext.Threading" Version="5.7.0" />
-        <PackageReference Include="MinVer" Version="5.0.0"/>
-        <PackageReference Include="DotNext" Version="5.7.0" />
+        <PackageReference Include="DotNext.IO" Version="5.13.0" />
+        <PackageReference Include="DotNext.Threading" Version="5.13.0" />
+        <PackageReference Include="MinVer" Version="6.0.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="DotNext" Version="5.13.0" />
         <PackageReference Include="LibDeflate.NET" Version="1.19.0"/>
         <PackageReference Include="Portable.BouncyCastle" Version="1.9.0"/>
 

diff --git a/src/Sandbox/SandBoxMcProtoNet/Program.cs b/src/Sandbox/SandBoxMcProtoNet/Program.cs
@@ -1,6 +1,8 @@
 // See https://aka.ms/new-console-template for more information
 
+using System.Collections.Concurrent;
 using System.Diagnostics;
+using System.Reactive.Linq;
 using System.Text;
 using DotNext.Collections.Generic;
 using McProtoNet.Client;
@@ -14,22 +16,70 @@ public static async Task Main(string[] args)
         Console.WriteLine("Start");
         try
         {
-            MinecraftClient client = new MinecraftClient()
+            var list = new List<MinecraftClient>();
+            var listProtocols = new List<MultiProtocol>();
+            for (int i = 0; i < 300; i++)
             {
-                ConnectTimeout = TimeSpan.FromSeconds(30),
-                Host = "192.168.0.7",
-                Port = 25565,
-                Username = "TestBot",
-                Version = MinecraftVersion.Latest
-            };
-
-            var protoTest = new MultiProtocol(client);
-            await client.Start();
+                MinecraftClient client = new MinecraftClient()
+                {
+                    ConnectTimeout = TimeSpan.FromSeconds(30),
+                    Host = "192.168.0.7",
+                    Port = 25565,
+                    Username = $"TitleBot_{i + 1:D3}",
+                    Version = MinecraftVersion.Latest
+                };
+
+                var protoTest = new MultiProtocol(client);
+                listProtocols.Add(protoTest);
+                list.Add(client);
+            }
+
+            List<Task> tasks = new List<Task>();
+            int index = 0;
+            await foreach (var minecraftClient in list)
+            {
+                static async Task RunBot(MinecraftClient client, MultiProtocol proto)
+                {
+                    for (int i = 0; i < 10; i++)
+                    {
+                        try
+                        {
+                            await client.Start();
+                            await proto.OnJoinGame.FirstOrDefaultAsync();
+                            break;
+                        }
+                        catch (Exception e)
+                        {
+                            // Console.WriteLine(e);
+                        }
+                    }
+                }
+
+                tasks.Add(RunBot(minecraftClient, listProtocols[index++]));
+            }
+
+            await Task.WhenAll(tasks);
+            //while (true)
+            {
+                await Task.Delay(5000);
+                var sends = listProtocols.Select(async b =>
+                {
+                    try
+                    {
+                        await b.SendChatPacket("Hello from Minecraft Holy Client");
+                    }
+                    catch
+                    {
+                        // ignored
+                    }
+                });
+                await Task.WhenAll(sends);
+            }
         }
         catch (Exception e)
         {
             Console.WriteLine(e);
-            throw;
+            // throw;
         }
 
         await Task.Delay(-1);

diff --git a/src/Sandbox/SandBoxMcProtoNet/SandBoxMcProtoNet.csproj b/src/Sandbox/SandBoxMcProtoNet/SandBoxMcProtoNet.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>