Backups/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial migration commit to .NET 7

Browse Source 
Menu, sync and other stuff except resource system should be working.
We're far from finished
This commit is contained in:
Sardelka9515
2023-01-28 20:51:29 +08:00
parent 0112140f0e
commit cac2385c35
107 changed files with 36610 additions and 267320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Client/Scripts/Menus/Sub/ServersMenu.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Net;
using System.Net.Http;
using System.Threading;
using GTA.UI;
using LemonUI.Menus;
@ -41,8 +42,7 @@ namespace RageCoop.Client.Menus
Menu.Add(ResultItem = new NativeItem("Loading..."));
// Prevent freezing
GetServersThread = new Thread(() => GetAllServers());
GetServersThread.Start();
GetServersThread = ThreadManager.CreateThread(() => GetAllServers(),"GetServers");
};
Menu.Closing += (object sender, CancelEventArgs e) => { CleanUpList(); };
}
@ -57,7 +57,9 @@ namespace RageCoop.Client.Menus
{
List<ServerInfo> serverList = null;
var realUrl = Main.Settings.MasterServer;
serverList = JsonConvert.DeserializeObject<List<ServerInfo>>(DownloadString(realUrl));
serverList = null;
try { serverList = JsonConvert.DeserializeObject<List<ServerInfo>>(DownloadString(realUrl)); }
catch (Exception ex) { Main.Logger.Error(ex); }
// Need to be processed in main thread
API.QueueAction(() =>
@ -81,7 +83,7 @@ namespace RageCoop.Client.Menus
NativeItem tmpItem =
new NativeItem($"[{server.country}] {server.name}",
$"~b~{address}~s~~n~~g~Version {server.version}.x~s~")
{ AltTitle = $"[{server.players}/{server.maxPlayers}]" };
{ AltTitle = $"[{server.players}/{server.maxPlayers}]" };
tmpItem.Activated += (object sender, EventArgs e) =>
{
try
@ -130,8 +132,8 @@ namespace RageCoop.Client.Menus
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls13 | SecurityProtocolType.Tls12;
ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
WebClient client = new WebClient();
return client.DownloadString(url);
var client = new HttpClient();
return client.GetStringAsync(url).GetAwaiter().GetResult();
}
catch (Exception ex)
{