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

Undo "Changed IP in Address". This will be version 1.0.0

Browse Source
This commit is contained in:
EntenKoeniq
2021-12-11 14:40:34 +01:00
parent 64e089ce58
commit 02cc3f2fb5
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/Main.cs
View File

@ -21,7 +21,7 @@ namespace CoopClient
private bool GameLoaded = false; private bool GameLoaded = false;
internal static readonly string CurrentVersion = "V0_9_0"; internal static readonly string CurrentVersion = "V1_0_0";
internal static bool ShareNpcsWithPlayers = false; internal static bool ShareNpcsWithPlayers = false;
internal static bool DisableTraffic = false; internal static bool DisableTraffic = false;

12
Client/Menus/Sub/Servers.cs
View File

@ -10,8 +10,8 @@ namespace CoopClient.Menus.Sub
{ {
internal class ServerListClass internal class ServerListClass
{ {
[JsonProperty("address")] [JsonProperty("ip")]
public string Address { get; set; } public string IP { get; set; }
[JsonProperty("name")] [JsonProperty("name")]
public string Name { get; set; } public string Name { get; set; }
[JsonProperty("version")] [JsonProperty("version")]
@ -89,20 +89,20 @@ namespace CoopClient.Menus.Sub
foreach (ServerListClass server in serverList) foreach (ServerListClass server in serverList)
{ {
NativeItem tmpItem = null; NativeItem tmpItem = null;
MainMenu.Add(tmpItem = new NativeItem($"[{server.Country}] {server.Name}", $"~b~{server.Address}~s~~n~~g~Version {server.Version}.x~s~~n~Mods = {server.Mods}~n~NPCs = {server.NPCs}") { AltTitle = $"[{server.Players}/{server.MaxPlayers}][{(server.AllowList ? "~r~X~s~" : "~g~O~s~")}]"}); MainMenu.Add(tmpItem = new NativeItem($"[{server.Country}] {server.Name}", $"~b~{server.IP}~s~~n~~g~Version {server.Version}.x~s~~n~Mods = {server.Mods}~n~NPCs = {server.NPCs}") { AltTitle = $"[{server.Players}/{server.MaxPlayers}][{(server.AllowList ? "~r~X~s~" : "~g~O~s~")}]"});
tmpItem.Activated += (object sender, EventArgs e) => tmpItem.Activated += (object sender, EventArgs e) =>
{ {
try try
{ {
MainMenu.Visible = false; MainMenu.Visible = false;
Main.MainNetworking.DisConnectFromServer(server.Address); Main.MainNetworking.DisConnectFromServer(server.IP);
Main.MainMenu.ServerIpItem.AltTitle = server.Address; Main.MainMenu.ServerIpItem.AltTitle = server.IP;
Main.MainMenu.MainMenu.Visible = true; Main.MainMenu.MainMenu.Visible = true;
Main.MainSettings.LastServerAddress = server.Address; Main.MainSettings.LastServerAddress = server.IP;
Util.SaveSettings(); Util.SaveSettings();
} }
catch (Exception ex) catch (Exception ex)

2
Server/CoopServer.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<AssemblyVersion>1.11.0.0001</AssemblyVersion> <AssemblyVersion>1.0.0.0001</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion> <FileVersion>1.0.0.0</FileVersion>
<RepositoryUrl>https://github.com/GTACOOP-R/GTACoop-R</RepositoryUrl> <RepositoryUrl>https://github.com/GTACOOP-R/GTACoop-R</RepositoryUrl>
</PropertyGroup> </PropertyGroup>

2
Server/Server.cs
View File

@ -21,7 +21,7 @@ namespace CoopServer
internal class Server internal class Server
{ {
private static readonly string CompatibleVersion = "V0_9"; private static readonly string CompatibleVersion = "V1_0";
public static readonly Settings MainSettings = Util.Read<Settings>("CoopSettings.xml"); public static readonly Settings MainSettings = Util.Read<Settings>("CoopSettings.xml");
private readonly Blocklist MainBlocklist = Util.Read<Blocklist>("Blocklist.xml"); private readonly Blocklist MainBlocklist = Util.Read<Blocklist>("Blocklist.xml");