From b436abf1316a7543fe355f6c5835d8c350f28eaa Mon Sep 17 00:00:00 2001
From: Sardelka <sardelka9515@gmail.com>
Date: Sat, 13 Aug 2022 11:42:29 +0800
Subject: [PATCH] Some hint

---
 RageCoop.Client/Menus/Sub/ServersMenu.cs | 16 ++++++++-----
 RageCoop.Client/Util/Util.cs             |  1 +
 RageCoop.Server/Networking/Server.cs     | 30 ++++++++++++------------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/RageCoop.Client/Menus/Sub/ServersMenu.cs b/RageCoop.Client/Menus/Sub/ServersMenu.cs
index 03f4445..b7cab4e 100644
--- a/RageCoop.Client/Menus/Sub/ServersMenu.cs
+++ b/RageCoop.Client/Menus/Sub/ServersMenu.cs
@@ -75,18 +75,18 @@ namespace RageCoop.Client.Menus
                 CleanUpList();
                 foreach (ServerInfo server in serverList)
                 {
-                    string address = $"{server.Address}:{server.Port}";
-                    NativeItem tmpItem = new NativeItem($"[{server.Country}] {server.Name}", $"~b~{address}~s~~n~~g~Version {server.Version}.x~s~") { AltTitle = $"[{server.Players}/{server.MaxPlayers}]" };
+                    string address = $"{server.address}:{server.port}";
+                    NativeItem tmpItem = new NativeItem($"[{server.country}] {server.name}", $"~b~{address}~s~~n~~g~Version {server.version}.x~s~") { AltTitle = $"[{server.players}/{server.maxPlayers}]" };
                     tmpItem.Activated += (object sender, EventArgs e) =>
                     {
                         try
                         {
                             Menu.Visible = false;
-                            if (server.ZeroTier)
+                            if (server.useZT)
                             {
-                                address=$"{server.ZeroTierAddress}:{server.Port}";
-                                Main.QueueAction(() => { Notification.Show($"~y~Joining ZeroTier network... {server.ZeroTierNetWorkID}"); });
-                                if (ZeroTierHelper.Join(server.ZeroTierNetWorkID)==null)
+                                address=$"{server.ztAddress}:{server.port}";
+                                Main.QueueAction(() => { Notification.Show($"~y~Joining ZeroTier network... {server.ztID}"); });
+                                if (ZeroTierHelper.Join(server.ztID)==null)
                                 {
                                     throw new Exception("Failed to obtain ZeroTier network IP");
                                 }
@@ -103,6 +103,10 @@ namespace RageCoop.Client.Menus
                         catch (Exception ex)
                         {
                             Notification.Show($"~r~{ex.Message}");
+                            if (server.useZT)
+                            {
+                                Notification.Show($"Make sure ZeroTier is correctly installed, download it from https://www.zerotier.com/");
+                            }
                         }
                     };
                     Menu.Add(tmpItem);
diff --git a/RageCoop.Client/Util/Util.cs b/RageCoop.Client/Util/Util.cs
index 44d69c5..fa17e2c 100644
--- a/RageCoop.Client/Util/Util.cs
+++ b/RageCoop.Client/Util/Util.cs
@@ -246,6 +246,7 @@ namespace RageCoop.Client
                 }
                 lineList.Add("ReloadKey=Insert");
                 File.WriteAllLines("ScriptHookVDotNet.ini", lineList.ToArray());
+                GTA.UI.Notification.Show("Reload cannot be performed automatically, please type \"Reload()\" manually in the SHVDN console.");
             }
             Keys key = (Keys)Enum.Parse(typeof(Keys), reloadKey, true);
 
diff --git a/RageCoop.Server/Networking/Server.cs b/RageCoop.Server/Networking/Server.cs
index 6c24755..e5de4de 100644
--- a/RageCoop.Server/Networking/Server.cs
+++ b/RageCoop.Server/Networking/Server.cs
@@ -131,21 +131,21 @@ namespace RageCoop.Server
                         {
                             var serverInfo = new ServerInfo
                             {
-                                Address = info.Address,
-                                Port=Settings.Port.ToString(),
-                                Country=info.Country,
-                                Name=Settings.Name,
-                                Version=_compatibleVersion.Replace("_", "."),
-                                Players=MainNetServer.ConnectionsCount.ToString(),
-                                MaxPlayers=Settings.MaxPlayers.ToString(),
-                                Description=Settings.Description,
-                                Website=Settings.Website,
-                                GameMode=Settings.GameMode,
-                                Language=Settings.Language,
-                                P2P=Settings.UseP2P,
-                                ZeroTier=Settings.UseZeroTier,
-                                ZeroTierNetWorkID=Settings.UseZeroTier ? Settings.ZeroTierNetworkID : "",
-                                ZeroTierAddress=Settings.UseZeroTier ? ZeroTierHelper.Networks[Settings.ZeroTierNetworkID].Addresses.Where(x => !x.Contains(":")).First() : "0.0.0.0",
+                                address = info.Address,
+                                port=Settings.Port.ToString(),
+                                country=info.Country,
+                                name=Settings.Name,
+                                version=_compatibleVersion.Replace("_", "."),
+                                players=MainNetServer.ConnectionsCount.ToString(),
+                                maxPlayers=Settings.MaxPlayers.ToString(),
+                                description=Settings.Description,
+                                website=Settings.Website,
+                                gameMode=Settings.GameMode,
+                                language=Settings.Language,
+                                useP2P=Settings.UseP2P,
+                                useZT=Settings.UseZeroTier,
+                                ztID=Settings.UseZeroTier ? Settings.ZeroTierNetworkID : "",
+                                ztAddress=Settings.UseZeroTier ? ZeroTierHelper.Networks[Settings.ZeroTierNetworkID].Addresses.Where(x => !x.Contains(":")).First() : "0.0.0.0",
                             };
                             string msg = JsonConvert.SerializeObject(serverInfo);