advances in using valvequery from @Deathreus

Author: maxijabase

QueryMaster/DotNetZip.dll

@@ -88,6 +88,9 @@
     <Reference Include="System.XML" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="UIAutomationProvider" />
+    <Reference Include="ValveQuery">
+      <HintPath>QueryMaster\ValveQuery.dll</HintPath>
+    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
@@ -549,6 +552,9 @@
     <PackageReference Include="Microsoft-WindowsAPICodePack-Shell">
       <Version>1.1.4</Version>
     </PackageReference>
+    <PackageReference Include="NETStandard.Library">
+      <Version>2.0.3</Version>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.3</Version>
     </PackageReference>

QueryMaster/Newtonsoft.Json.dll

@@ -516,6 +516,7 @@ private void ProcessCheckWorker()
             {
                 EnableServerAnim.Begin();
                 UpdateWindowTitle();
+                LoggingControl.LogAction("Server started.", 2);
             });
             ServerProcess.WaitForExit();
             ServerProcess.Dispose();
@@ -526,8 +527,8 @@ private void ProcessCheckWorker()
                 {
                     DisableServerAnim.Begin();
                     UpdateWindowTitle();
+                    LoggingControl.LogAction("Server stopped.", 2);
                 }
-                LoggingControl.LogAction("Server started.", 2);
             });
         }
         catch (Exception)

QueryMaster/SuperSocket.ClientEngine.dll

@@ -3,7 +3,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using QueryMaster;
+using ValveQuery.GameServer;
 using SPCode.Interop;
 
 namespace SPCode.UI;
@@ -23,34 +23,40 @@ private void Server_Query()
             goto Dispatcher;
         }
 
-        output.Add("Sending commands...");
-
         try
         {
-            var type = EngineType.GoldSource;
-            if (c.RConUseSourceEngine)
+            using var server = ServerQuery.GetServerInstance(c.RConIP, c.RConPort, throwExceptions: true);
+            var serverInfo = server.GetInfo();
+
+            if (serverInfo == null)
+            {
+                output.Add("No server found to send commands to.");
+                goto Dispatcher;
+            }
+
+            output.Add(serverInfo.Name);
+
+            if (!server.GetControl(c.RConPassword, false))
             {
-                type = EngineType.Source;
+                output.Add("Incorrect RCON password.");
+                goto Dispatcher;
             }
 
-            using (var server = ServerQuery.GetServerInstance(type, c.RConIP, c.RConPort, null))
+            output.Add("Sending commands...");
+
+            var cmds = ReplaceRconCMDVariables(c.RConCommands).Split('\n');
+
+            foreach (var cmd in cmds)
             {
-                var serverInfo = server.GetInfo();
-                output.Add(serverInfo.Name);
-                using var rcon = server.GetControl(c.RConPassword);
-                var cmds = ReplaceRconCMDVariables(c.RConCommands).Split('\n');
-                foreach (var cmd in cmds)
+                var t = Task.Run(() =>
                 {
-                    var t = Task.Run(() =>
+                    var command = cmd.Trim('\r').Trim();
+                    if (!string.IsNullOrWhiteSpace(command))
                     {
-                        var command = cmd.Trim('\r').Trim();
-                        if (!string.IsNullOrWhiteSpace(command))
-                        {
-                            output.Add(rcon.SendCommand(command));
-                        }
-                    });
-                    t.Wait();
-                }
+                        server.Rcon.SendCommand(command);
+                    }
+                });
+                t.Wait();
             }
             output.Add("Commands sent.");
         }