修正对任意版本的放行, 修了一下无法检查更新时会崩溃的问题, 添加新增版本号

Megghy · Megghy · commit c00b7f57a888 · 2022-04-01T11:02:12.000+08:00
diff --git a/MultiSEngine/Core/Adapter/BaseAdapter.cs b/MultiSEngine/Core/Adapter/BaseAdapter.cs
@@ -25,8 +25,8 @@ public BaseAdapter(ClientData client, Socket connection)
         public int ErrorCount { get; protected set; } = 0;
         protected bool ShouldStop { get; set; } = false;
         public int VersionNum => Client?.Player?.VersionNum ?? -1;
-        public virtual PacketSerializer InternalClientSerializer => VersionNum == -1 ? Net.DefaultClientSerializer : Net.ClientSerializer[VersionNum];
-        public virtual PacketSerializer InternalServerSerializer => VersionNum == -1 ? Net.DefaultServerSerializer : Net.ServerSerializer[VersionNum];
+        public virtual PacketSerializer InternalClientSerializer => Net.ClientSerializer.TryGetValue(VersionNum, out var result) ? result : Net.DefaultClientSerializer;
+        public virtual PacketSerializer InternalServerSerializer => Net.ServerSerializer.TryGetValue(VersionNum, out var result) ? result : Net.DefaultServerSerializer;
         public ClientData Client { get; protected set; }
         public Socket Connection { get; internal set; }
         protected BinaryReader NetReader { get; set; }
diff --git a/MultiSEngine/Core/Net.cs b/MultiSEngine/Core/Net.cs
@@ -16,8 +16,8 @@ public class Net
         public static Socket SocketServer { get; internal set; }
         public static readonly Dictionary<int, PacketSerializer> ClientSerializer = new();
         public static readonly Dictionary<int, PacketSerializer> ServerSerializer = new();
-        public static PacketSerializer DefaultClientSerializer => ClientSerializer[Config.Instance.ServerVersion > Data.Versions.Last() ? Modules.Data.Versions.Last() : Config.Instance.ServerVersion];
-        public static PacketSerializer DefaultServerSerializer => ServerSerializer[Config.Instance.ServerVersion > Data.Versions.Last() ? Modules.Data.Versions.Last() : Config.Instance.ServerVersion];
+        public static PacketSerializer DefaultClientSerializer => ClientSerializer[Config.Instance.ServerVersion > Data.Versions.Last() ? Data.Versions.Last() : Config.Instance.ServerVersion];
+        public static PacketSerializer DefaultServerSerializer => ServerSerializer[Config.Instance.ServerVersion > Data.Versions.Last() ? Data.Versions.Last() : Config.Instance.ServerVersion];
         [AutoInit(postMsg: "Opened socket server successfully.")]
         public static void Init()
         {
diff --git a/MultiSEngine/Modules/ClientHelper.cs b/MultiSEngine/Modules/ClientHelper.cs
@@ -226,7 +226,7 @@ public static void ReadVersion(this ClientData client, string version)
             client.Player.VersionNum = version.StartsWith("Terraria") && int.TryParse(version[8..], out var v)
                             ? v
                             : Config.Instance.DefaultServerInternal.VersionNum;
-            Logs.Info($"Version of {client.Name} is {Data.Convert(client.Player.VersionNum)}.");
+            Logs.Info($"Version of {client.Name} is {Data.Convert(client.Player.VersionNum)}<{client.Player.VersionNum}>.");
         }
         public static bool HandleCommand(this ClientData client, string cmd)
         {
diff --git a/MultiSEngine/Modules/Cmds/ConsoleCommand.cs b/MultiSEngine/Modules/Cmds/ConsoleCommand.cs
@@ -11,6 +11,8 @@ internal class ConsoleCommand : Core.Command.CmdBase
         public override bool ServerCommand => true;
         public override bool Execute(ClientData client, string cmdName, string[] parma)
         {
+            if (string.IsNullOrEmpty(cmdName))
+                return true;
             var internalCommand = Data.Commands.FirstOrDefault(c => c.Name == "mse");
             switch (cmdName)
             {
@@ -20,6 +22,7 @@ public override bool Execute(ClientData client, string cmdName, string[] parma)
                     break;
                 case "ol":
                 case "online":
+                case "playing":
                     Logs.Info($"{Data.Clients.Count} Player(s) Online:{Environment.NewLine}{string.Join(", ", from c in Data.Clients let text = $"{c.Name} <{c.Server?.Name ?? "FakeWorld"}>" select text)}", false);
                     break;
                 case "stop":
diff --git a/MultiSEngine/Modules/Data.cs b/MultiSEngine/Modules/Data.cs
@@ -35,10 +35,14 @@ public static string Convert(int version)
                 "Terraria242" => "v1.4.3",
                 "Terraria243" => "v1.4.3.1",
                 "Terraria244" => "v1.4.3.2",
+                "Terraria245" => "v1.4.3.3",
+                "Terraria246" => "v1.4.3.4",
+                "Terraria247" => "v1.4.3.5",
+                "Terraria248" => "v1.4.3.6",
                 _ => "Unknown",
             };
         }
-        public static readonly int[] Versions = { 230, 233, 234, 235, 236, 237, 238, 242, 243, 244 };
+        public static readonly int[] Versions = { 230, 233, 234, 235, 236, 237, 238, 242, 243, 244, 245, 246, 247, 248 };
         [AutoInit(order: 0)]
         public static void Init()
         {
diff --git a/MultiSEngine/Modules/Updater.cs b/MultiSEngine/Modules/Updater.cs
@@ -26,7 +26,7 @@ public static void Init()
             Interval = 1000 * 60 * 5,
             AutoReset = true
         };
-        private static async void CheckUpdate(object sender, ElapsedEventArgs e)
+        internal static async void CheckUpdate(object sender, ElapsedEventArgs e)
         {
             try
             {
diff --git a/MultiSEngine/Program.cs b/MultiSEngine/Program.cs
@@ -24,17 +24,14 @@ static void Main(string[] args)
         private static void ShowLogo()
         {
             Console.WriteLine(@"
-    __  ___      ____  _ _____ ______            _          
-   /  |/  /_  __/ / /_(_) ___// ____/___  ____ _(_)___  ___ 
-  / /|_/ / / / / / __/ /\__ \/ __/ / __ \/ __ `/ / __ \/ _ \
- / /  / / /_/ / / /_/ /___/ / /___/ / / / /_/ / / / / /  __/
-/_/  /_/\__,_/_/\__/_//____/_____/_/ /_/\__, /_/_/ /_/\___/ 
+        __  ___      ____  _ _____ ______            _          
+       /  |/  /_  __/ / /_(_) ___// ____/___  ____ _(_)___  ___ 
+      / /|_/ / / / / / __/ /\__ \/ __/ / __ \/ __ `/ / __ \/ _ \
+     / /  / / /_/ / / /_/ /___/ / /___/ / / / /_/ / / / / /  __/
+    /_/  /_/\__,_/_/\__/_//____/_____/_/ /_/\__, /_/_/ /_/\___/ 
                                        /____/               
 ");
-            var version = Assembly.GetExecutingAssembly().GetName().Version;
-            var newest = Updater.GetNewestVersion().Result;
-            Console.WriteLine($" - Version {version}, Latest Version {(newest > version ? newest : version)}");
-            Console.WriteLine();
+            Updater.CheckUpdate(null, null);
         }
         private static void AutoInit()
         {

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ public static void ReadVersion(this ClientData client, string version)`
`226`	`226`	`client.Player.VersionNum = version.StartsWith("Terraria") && int.TryParse(version[8..], out var v)`
`227`	`227`	`? v`
`228`	`228`	`: Config.Instance.DefaultServerInternal.VersionNum;`
`229`		`- Logs.Info($"Version of {client.Name} is {Data.Convert(client.Player.VersionNum)}.");`
	`229`	`+ Logs.Info($"Version of {client.Name} is {Data.Convert(client.Player.VersionNum)}<{client.Player.VersionNum}>.");`
`230`	`230`	`}`
`231`	`231`	`public static bool HandleCommand(this ClientData client, string cmd)`
`232`	`232`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static void Init()`
`26`	`26`	`Interval = 1000 * 60 * 5,`
`27`	`27`	`AutoReset = true`
`28`	`28`	`};`
`29`		`- private static async void CheckUpdate(object sender, ElapsedEventArgs e)`
	`29`	`+ internal static async void CheckUpdate(object sender, ElapsedEventArgs e)`
`30`	`30`	`{`
`31`	`31`	`try`
`32`	`32`	`{`