v0.12.0-A1: Fixed motd fetch.

Shiroiame-Kusu · Feb 12, 2024 · f12e9bf · f12e9bf
1 parent 31ef8fe
commit f12e9bf
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/Serein/Universal/Base/Motd/Motdje.cs b/Serein/Universal/Base/Motd/Motdje.cs
@@ -7,6 +7,7 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
+using static Serein.Base.Motd.MotdjePacket;
 
 namespace Serein.Base.Motd
 {
@@ -113,16 +114,38 @@ internal override void Get()
                 Origin = Origin.Substring(Origin.IndexOf('{'));
                 Logger.Output(LogType.Debug, $"Origin: {Origin}");
 
-                MotdjePacket.Packet packet = JsonConvert.DeserializeObject<MotdjePacket.Packet>(Origin) ?? throw new ArgumentNullException();
+                //MotdjePacket.Packet packet = JsonConvert.DeserializeObject<MotdjePacket.Packet>(Origin) ?? throw new ArgumentNullException();
                 JObject PacketData = JObject.Parse(Origin);
                 PlayerListData = PacketData["players"]?.ToObject<JObject>();
                 IsSuccessful = true;
-                OnlinePlayer = packet.Players.Online;
+                try
+                {
+                    MotdjePacket.Packet packet = JsonConvert.DeserializeObject<MotdjePacket.Packet>(Origin);
+                    OnlinePlayer = packet.Players.Online;
+                    MaxPlayer = packet.Players.Max;
+                    Version = packet.Version.Name;
+                    Protocol = packet.Version.Protocol.ToString();
+                    Description = packet.Description?.Text;
+                    Favicon = packet.Favicon;
+                }
+                catch(Exception e)
+                {   
+                    Console.WriteLine(e.ToString());
+                    OnlinePlayer = (long)PacketData["players"]["online"];
+                    MaxPlayer = (long)PacketData["players"]["max"];
+                    Version = PacketData["version"]["name"].ToString();
+                    Protocol = PacketData["version"]["protocol"].ToString();
+                    Description = PacketData["description"].ToString();
+                    //Favicon = PacketData.Favicon;
+                }
+
+                /*OnlinePlayer = packet.Players.Online;
                 MaxPlayer = packet.Players.Max;
                 Version = packet.Version.Name;
                 Protocol = packet.Version.Protocol.ToString();
                 Description = packet.Description?.Text;
                 Favicon = packet.Favicon;
+                */
             }
             else
             {

diff --git a/Serein/Universal/Utils/Runtime.cs b/Serein/Universal/Utils/Runtime.cs
@@ -7,6 +7,8 @@
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
+using System.Threading;
+
 
 #if !CONSOLE
 using Ookii.Dialogs.Wpf;
@@ -28,6 +30,8 @@ public static void Init()
         {
             CrashInterception.Init();
             Debug.WriteLine(Global.LOGO);
+            ProcessThreadCollection threadCollection = Process.GetCurrentProcess().Threads;
+
             Directory.SetCurrentDirectory(Global.PATH);
             IO.ReadAll();
             Task.Run(SystemInfo.Init);

diff --git a/Serein/WPF/Serein-WPF.csproj b/Serein/WPF/Serein-WPF.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
+		<OutputType>Exe</OutputType>
 		<TargetFrameworks>net6.0-windows</TargetFrameworks>
 		<UseWPF>true</UseWPF>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>