2.0.0 release

.gitignore

@@ -1,2 +1,3 @@
 bin/
-obj/
+obj/
+Binaries/

CUE4Parse/FileProvider/Vfs/AbstractVfsFileProvider.cs

@@ -23,17 +23,17 @@ public abstract class AbstractVfsFileProvider : AbstractFileProvider, IVfsFilePr
         public override IReadOnlyDictionary<string, GameFile> Files => _files;
         public override IReadOnlyDictionary<FPackageId, GameFile> FilesById => _files.byId;
 
-        protected readonly ConcurrentDictionary<IAesVfsReader, object?> _unloadedVfs = new ();
-        public IReadOnlyCollection<IAesVfsReader> UnloadedVfs => (IReadOnlyCollection<IAesVfsReader>) _unloadedVfs.Keys;
+        protected readonly ConcurrentDictionary<IAesVfsReader, object?> _unloadedVfs = new();
+        public IReadOnlyCollection<IAesVfsReader> UnloadedVfs => (IReadOnlyCollection<IAesVfsReader>)_unloadedVfs.Keys;
 
-        private readonly ConcurrentDictionary<IAesVfsReader, object?> _mountedVfs = new ();
-        public IReadOnlyCollection<IAesVfsReader> MountedVfs => (IReadOnlyCollection<IAesVfsReader>) _mountedVfs.Keys;
+        private readonly ConcurrentDictionary<IAesVfsReader, object?> _mountedVfs = new();
+        public IReadOnlyCollection<IAesVfsReader> MountedVfs => (IReadOnlyCollection<IAesVfsReader>)_mountedVfs.Keys;
 
-        private readonly ConcurrentDictionary<FGuid, FAesKey> _keys = new ();
+        private readonly ConcurrentDictionary<FGuid, FAesKey> _keys = new();
         public IReadOnlyDictionary<FGuid, FAesKey> Keys => _keys;
 
-        protected readonly ConcurrentDictionary<FGuid, object?> _requiredKeys = new ();
-        public IReadOnlyCollection<FGuid> RequiredKeys => (IReadOnlyCollection<FGuid>) _requiredKeys.Keys;
+        protected readonly ConcurrentDictionary<FGuid, object?> _requiredKeys = new();
+        public IReadOnlyCollection<FGuid> RequiredKeys => (IReadOnlyCollection<FGuid>)_requiredKeys.Keys;
 
         public IoGlobalData? GlobalData { get; private set; }
 
@@ -109,14 +109,14 @@ public async Task<int> MountAsync()
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int SubmitKey(FGuid guid, FAesKey key) => SubmitKeys(new Dictionary<FGuid, FAesKey> {{ guid, key }});
+        public int SubmitKey(FGuid guid, FAesKey key) => SubmitKeys(new Dictionary<FGuid, FAesKey> { { guid, key } });
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public int SubmitKeys(IEnumerable<KeyValuePair<FGuid, FAesKey>> keys) => SubmitKeysAsync(keys).Result;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public async Task<int> SubmitKeyAsync(FGuid guid, FAesKey key) =>
-            await SubmitKeysAsync(new Dictionary<FGuid, FAesKey> {{ guid, key }}).ConfigureAwait(false);
+            await SubmitKeysAsync(new Dictionary<FGuid, FAesKey> { { guid, key } }).ConfigureAwait(false);
 
         public async Task<int> SubmitKeysAsync(IEnumerable<KeyValuePair<FGuid, FAesKey>> keys)
         {

Data/API.cs

@@ -5,7 +5,10 @@ public class API
         public class Rootobject
         {
             public bool Disable { get; set; }
+            public string DisableMessage { get; set; }
             public long DiscordID { get; set; }
+            public int KeyLifetime { get; set; }
         }
+
     }
 }

LobbyAPI.json

@@ -1,4 +1,6 @@
 {
   "Disable": false,
-  "DiscordID": 703033424541384784
+  "DisableMessage": "Hello World",
+  "DiscordID": 703033424541384784,
+  "KeyLifetime": 172800
 }

Pages/Index.razor

@@ -11,46 +11,3 @@ Select one of the tabs to start swapping!
 
 <br />
 <iframe src="https://discord.com/[email protected]&theme=dark" width="350" height="500" allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe>
-
-
-@code {
-
-
-    protected override void OnInitialized()
-    {
-        base.OnInitialized();
-
-        using (WebClient wc = new())
-        {
-            string data = wc.DownloadString("https://pro-swapper.github.io/api/LobbyAPI.json");
-
-            var apiresp = JsonConvert.DeserializeObject<Data.API.Rootobject>(data);
-
-            if (apiresp.Disable == true)
-            {
-                Process.GetCurrentProcess().Kill();
-            }
-
-            apiresp.DiscordID = 703033424541384784;
-
-            Services.MainService.DiscordWidgetAPI = JsonConvert.DeserializeObject<Data.DiscordWidgetAPI.Root>(wc.DownloadString($"https://discord.com/api/guilds/{apiresp.DiscordID}/widget.json"));
-        }
-
-        ProSwapperLobby.DiscordRPC.InitializeRPC();
-
-        Directory.CreateDirectory(Services.MainService.ProSwapperFolder + "\\.Config");
-        MainService.InitConfig();
-
-        Console.Clear();
-        Console.Title = "Pro Swapper Lobby | Made by Kye#5000";
-        Console.ForegroundColor = ConsoleColor.Red;
-        Console.WriteLine("Please do not close this window when using Pro Swapper or the website will not work");
-        Console.WriteLine(string.Empty);
-        Console.WriteLine(string.Empty);
-        Console.ForegroundColor = ConsoleColor.Blue;
-        Console.WriteLine($"Pro Swapper Lobby is currently running on http://localhost:6969, if you need any help please ask for help on the Pro Swapper Discord server: {Services.MainService.DiscordWidgetAPI.instant_invite}");
-        Console.WriteLine(string.Empty);
-        Console.WriteLine(string.Empty);
-        Console.WriteLine($"If you have paid for this software, you have been scammed. It is free to download at {Services.MainService.DiscordWidgetAPI.instant_invite} and is also available on GitHub: https://github.com/Pro-Swapper");
-    }
-}

Pages/About.razor → Pages/Settings.razor

@@ -1,18 +1,23 @@
-@using static Services.MainService
+@page "/settings"
+@namespace ProSwapperLobby
+@using System.Diagnostics
+@using static Services.MainService
 
-@page "/about"
 
-<h3>About</h3>
+<h3>Settings</h3>
 
-<ul class="list-group">
-  <li class="list-group-item">Current AES Key: @CurrentConfig.aesKey</li>
+
+
+<ul class="list-group ">
+  <li class="list-group-item">Current AES Key: <span style="font-family:Consolas">@CurrentConfig.aesKey</span></li>
   <li class="list-group-item">Current Installed Fortnite Version: @CurrentConfig.CurrentInstalledFortniteVersion</li>
   <li class="list-group-item">Current Live Fortnite Version: @CurrentConfig.CurrentLiveFortniteVersion</li>
   <li class="list-group-item">Fortnite Up To Date: @FnUpdated</li>
 </ul>
 
-
-
+<br />
+<button class="btn btn-primary" @onclick=LaunchFortnite>Launch Fortnite</button>
+<br />
 <br />
 <h4>Developer(s)</h4>
 <div class="our-team" style="width:25vw">
@@ -137,6 +142,12 @@
 </style>
 
 @code {
-    private bool FnUpdated = CurrentConfig.CurrentLiveFortniteVersion == CurrentConfig.CurrentInstalledFortniteVersion;
-
+    private bool FnUpdated => CurrentConfig.CurrentLiveFortniteVersion.Contains(CurrentConfig.CurrentInstalledFortniteVersion);
+
+    private void LaunchFortnite()
+    {
+        Process webProcess = new Process();
+        webProcess.StartInfo = new ProcessStartInfo() { UseShellExecute = true, FileName = "com.epicgames.launcher://apps/fn:4fe75bbc5a674f4f9b356b5c90567da5:Fortnite?action=launch&silent=false" };
+        webProcess.Start();
+    }
 }

ProSwapperLobby.csproj

@@ -1,26 +1,33 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
 		<TargetFramework>net6.0-windows</TargetFramework>
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 		<PlatformTarget>x64</PlatformTarget>
-		<AssemblyVersion>1.0.1.0</AssemblyVersion>
-		<FileVersion>1.0.1.0</FileVersion>
+		<AssemblyVersion>2.0.0.0</AssemblyVersion>
+		<FileVersion>2.0.0.0</FileVersion>
 		<Description>The BEST Fortnite lobby swapper</Description>
 		<Copyright>Pro Swapper 2022</Copyright>
 		<PackageProjectUrl>http://proswapper.xyz</PackageProjectUrl>
 		<OutputType>Exe</OutputType>
-		<ApplicationIcon>ProSwapperLobby.ico</ApplicationIcon>
+		<BaseOutputPath>bin\</BaseOutputPath>
 	</PropertyGroup>
 
+	<ItemGroup>
+		<Compile Remove="bin\**" />
+		<Content Remove="bin\**" />
+		<EmbeddedResource Remove="bin\**" />
+		<None Remove="bin\**" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<Content Remove="LobbyAPI.json" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Content Include="ProSwapperLobby.ico" />
+		<Content Include="ProSwapperLobby.ico" />
 	</ItemGroup>
 
 	<ItemGroup>

ProSwapperLobby.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProSwapperLobby", "ProSwapperLobby.csproj", "{11824F3D-DAAF-4FB9-8276-67077661C328}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProSwapperLobby.Client", "..\ProSwapperLobby.Client\ProSwapperLobby.Client.csproj", "{551EBD94-FFDD-4A13-81C0-82A919AA0F82}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{11824F3D-DAAF-4FB9-8276-67077661C328}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11824F3D-DAAF-4FB9-8276-67077661C328}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11824F3D-DAAF-4FB9-8276-67077661C328}.Release|Any CPU.Build.0 = Release|Any CPU
+		{551EBD94-FFDD-4A13-81C0-82A919AA0F82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{551EBD94-FFDD-4A13-81C0-82A919AA0F82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{551EBD94-FFDD-4A13-81C0-82A919AA0F82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{551EBD94-FFDD-4A13-81C0-82A919AA0F82}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE