Skip to content
This repository was archived by the owner on Feb 21, 2025. It is now read-only.

Commit 52d97b0

Browse files
KyeOnDiscordKyeOnDiscord
committed
Release 0.9.0
1 parent 561814c commit 52d97b0

39 files changed

Lines changed: 15422 additions & 11534 deletions

‎ProSwapperNetCore.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PropertyGroup>
1515
<OutputType>WinExe</OutputType>
1616
<TargetFramework>net5.0-windows</TargetFramework>
17-
<Version>0.0.8.9</Version>
17+
<Version>0.0.9.0</Version>
1818
<Company>Pro Swapper</Company>
1919
<Authors>Pro Swapper</Authors>
2020
<Product>Pro Swapper</Product>
@@ -113,6 +113,9 @@ https://proswapper.xyz</Description>
113113
<Compile Update="src\Other\Lobby\CID Selector\GridItem.cs">
114114
<SubType>UserControl</SubType>
115115
</Compile>
116+
<Compile Update="src\Other\Map\Map.cs">
117+
<SubType>Form</SubType>
118+
</Compile>
116119
<Compile Update="src\UI\ZlibSwap.cs">
117120
<SubType>Form</SubType>
118121
</Compile>

‎ProSwapperNetCore.csproj.user‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<ShowAllFiles>false</ShowAllFiles>
5-
<_LastSelectedProfileId>D:\GitHub\.Pro_Swapper\.Pro_Swapper\ProSwapper\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
5+
<_LastSelectedProfileId>C:\Users\ProMa\Documents\GitHub\ProSwapper\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
66
</PropertyGroup>
77
<ItemGroup>
88
<Compile Update="src\Other\FOV\FOV.cs">
@@ -44,6 +44,9 @@
4444
<Compile Update="src\Other\SplashScreen\SplashUI.cs">
4545
<SubType>Form</SubType>
4646
</Compile>
47+
<Compile Update="src\UI\Splash.cs">
48+
<SubType>Form</SubType>
49+
</Compile>
4750
<Compile Update="src\UI\ThemeCreator.cs">
4851
<SubType>Form</SubType>
4952
</Compile>

‎ProSwapperNetCore.sln‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProSwapperNetCore", "ProSwa
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|Any CPU = Debug|Any CPU
1110
Debug|x64 = Debug|x64
12-
Release|Any CPU = Release|Any CPU
1311
Release|x64 = Release|x64
1412
EndGlobalSection
1513
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{273D190C-0D32-45A2-BDAC-3A5FBD20A89A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{273D190C-0D32-45A2-BDAC-3A5FBD20A89A}.Debug|Any CPU.Build.0 = Debug|Any CPU
1814
{273D190C-0D32-45A2-BDAC-3A5FBD20A89A}.Debug|x64.ActiveCfg = Debug|x64
1915
{273D190C-0D32-45A2-BDAC-3A5FBD20A89A}.Debug|x64.Build.0 = Debug|x64
20-
{273D190C-0D32-45A2-BDAC-3A5FBD20A89A}.Release|Any CPU.ActiveCfg = Release|Any CPU
21-
{273D190C-0D32-45A2-BDAC-3A5FBD20A89A}.Release|Any CPU.Build.0 = Release|Any CPU
2216
{273D190C-0D32-45A2-BDAC-3A5FBD20A89A}.Release|x64.ActiveCfg = Release|x64
2317
{273D190C-0D32-45A2-BDAC-3A5FBD20A89A}.Release|x64.Build.0 = Release|x64
2418
EndGlobalSection

‎Properties/PublishProfiles/FolderProfile.pubxml.user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
44
-->
55
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
66
<PropertyGroup>
7-
<History>True|2021-07-31T07:39:15.0131315Z;True|2021-07-31T17:38:01.2404138+10:00;True|2021-07-31T17:37:12.7546145+10:00;True|2021-07-31T17:30:14.3945147+10:00;True|2021-07-31T17:28:58.7763627+10:00;True|2021-07-31T17:28:43.3400502+10:00;True|2021-07-31T17:27:34.4886752+10:00;True|2021-06-10T21:09:38.6172669+10:00;True|2021-06-10T21:04:46.0146872+10:00;True|2021-06-05T15:01:43.2548593+10:00;True|2021-06-05T15:01:08.4990500+10:00;True|2021-06-05T12:20:39.8038624+10:00;True|2021-06-05T12:19:39.7875578+10:00;True|2021-06-05T12:18:35.0782623+10:00;True|2021-06-05T12:16:23.4178977+10:00;True|2021-06-03T20:44:36.3268966+10:00;False|2021-06-03T20:43:47.6172066+10:00;True|2021-06-03T20:31:57.2891741+10:00;True|2021-06-03T20:24:17.5271595+10:00;False|2021-06-03T20:23:32.1551067+10:00;True|2021-06-01T21:41:54.6469940+10:00;True|2021-06-01T21:41:32.8203704+10:00;True|2021-05-30T21:16:40.1619720+10:00;True|2021-05-30T21:16:18.7262187+10:00;True|2021-05-30T20:42:08.5125841+10:00;True|2021-05-30T17:35:42.1810331+10:00;True|2021-05-30T17:35:27.2108782+10:00;True|2021-05-30T17:33:28.8056733+10:00;False|2021-05-30T17:33:09.5307735+10:00;True|2021-05-30T17:31:04.4951019+10:00;True|2021-05-30T17:28:38.6215363+10:00;True|2021-05-28T17:50:27.1703401+10:00;True|2021-05-28T17:37:47.4101889+10:00;True|2021-05-28T17:28:05.6606064+10:00;True|2021-05-28T17:03:18.5821095+10:00;True|2021-05-28T17:01:27.3058220+10:00;True|2021-05-28T17:00:27.5529666+10:00;False|2021-05-28T17:00:08.2271926+10:00;True|2021-05-28T16:59:26.5886036+10:00;True|2021-05-28T16:58:25.4183696+10:00;True|2021-05-28T16:56:35.9734469+10:00;True|2021-05-28T16:54:07.1450090+10:00;True|2021-05-28T16:52:35.4711236+10:00;True|2021-05-28T16:49:11.5403560+10:00;True|2021-05-28T16:47:32.4477854+10:00;True|2021-05-28T16:46:56.7882804+10:00;True|2021-05-28T16:04:33.9049718+10:00;True|2021-05-28T16:02:08.1681666+10:00;True|2021-05-28T16:00:55.2009610+10:00;True|2021-05-28T16:00:16.9727002+10:00;True|2021-05-28T15:58:50.6379862+10:00;True|2021-05-28T15:58:21.6271707+10:00;True|2021-05-28T15:54:43.2793506+10:00;True|2021-05-28T15:51:01.3486874+10:00;True|2021-05-28T15:49:31.3383634+10:00;True|2021-05-28T15:44:46.4377814+10:00;True|2021-05-28T15:38:50.5161577+10:00;True|2021-05-28T15:35:49.3728609+10:00;False|2021-05-28T15:35:02.3338385+10:00;True|2021-05-28T15:32:40.4040946+10:00;True|2021-05-26T20:43:07.5378923+10:00;True|2021-05-26T20:42:21.0274720+10:00;True|2021-05-26T20:37:54.0221996+10:00;True|2021-05-26T20:16:46.9782325+10:00;</History>
7+
<History>True|2021-08-06T23:47:42.2380479Z;True|2021-08-07T09:44:15.7556843+10:00;True|2021-08-07T09:43:24.8791601+10:00;True|2021-08-07T09:42:40.0153901+10:00;True|2021-08-07T08:37:52.6588995+10:00;True|2021-08-07T08:33:04.4418657+10:00;True|2021-08-07T07:21:32.4617544+10:00;True|2021-07-31T17:39:15.0131315+10:00;True|2021-07-31T17:38:01.2404138+10:00;True|2021-07-31T17:37:12.7546145+10:00;True|2021-07-31T17:30:14.3945147+10:00;True|2021-07-31T17:28:58.7763627+10:00;True|2021-07-31T17:28:43.3400502+10:00;True|2021-07-31T17:27:34.4886752+10:00;True|2021-06-10T21:09:38.6172669+10:00;True|2021-06-10T21:04:46.0146872+10:00;True|2021-06-05T15:01:43.2548593+10:00;True|2021-06-05T15:01:08.4990500+10:00;True|2021-06-05T12:20:39.8038624+10:00;True|2021-06-05T12:19:39.7875578+10:00;True|2021-06-05T12:18:35.0782623+10:00;True|2021-06-05T12:16:23.4178977+10:00;True|2021-06-03T20:44:36.3268966+10:00;False|2021-06-03T20:43:47.6172066+10:00;True|2021-06-03T20:31:57.2891741+10:00;True|2021-06-03T20:24:17.5271595+10:00;False|2021-06-03T20:23:32.1551067+10:00;True|2021-06-01T21:41:54.6469940+10:00;True|2021-06-01T21:41:32.8203704+10:00;True|2021-05-30T21:16:40.1619720+10:00;True|2021-05-30T21:16:18.7262187+10:00;True|2021-05-30T20:42:08.5125841+10:00;True|2021-05-30T17:35:42.1810331+10:00;True|2021-05-30T17:35:27.2108782+10:00;True|2021-05-30T17:33:28.8056733+10:00;False|2021-05-30T17:33:09.5307735+10:00;True|2021-05-30T17:31:04.4951019+10:00;True|2021-05-30T17:28:38.6215363+10:00;True|2021-05-28T17:50:27.1703401+10:00;True|2021-05-28T17:37:47.4101889+10:00;True|2021-05-28T17:28:05.6606064+10:00;True|2021-05-28T17:03:18.5821095+10:00;True|2021-05-28T17:01:27.3058220+10:00;True|2021-05-28T17:00:27.5529666+10:00;False|2021-05-28T17:00:08.2271926+10:00;True|2021-05-28T16:59:26.5886036+10:00;True|2021-05-28T16:58:25.4183696+10:00;True|2021-05-28T16:56:35.9734469+10:00;True|2021-05-28T16:54:07.1450090+10:00;True|2021-05-28T16:52:35.4711236+10:00;True|2021-05-28T16:49:11.5403560+10:00;True|2021-05-28T16:47:32.4477854+10:00;True|2021-05-28T16:46:56.7882804+10:00;True|2021-05-28T16:04:33.9049718+10:00;True|2021-05-28T16:02:08.1681666+10:00;True|2021-05-28T16:00:55.2009610+10:00;True|2021-05-28T16:00:16.9727002+10:00;True|2021-05-28T15:58:50.6379862+10:00;True|2021-05-28T15:58:21.6271707+10:00;True|2021-05-28T15:54:43.2793506+10:00;True|2021-05-28T15:51:01.3486874+10:00;True|2021-05-28T15:49:31.3383634+10:00;True|2021-05-28T15:44:46.4377814+10:00;True|2021-05-28T15:38:50.5161577+10:00;True|2021-05-28T15:35:49.3728609+10:00;False|2021-05-28T15:35:02.3338385+10:00;True|2021-05-28T15:32:40.4040946+10:00;True|2021-05-26T20:43:07.5378923+10:00;True|2021-05-26T20:42:21.0274720+10:00;True|2021-05-26T20:37:54.0221996+10:00;True|2021-05-26T20:16:46.9782325+10:00;</History>
88
</PropertyGroup>
99
</Project>

‎Properties/Resources.Designer.cs‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Properties/Resources.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,15 @@
124124
<data name="bottom_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
125125
<value>..\Resources\bottom-right.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126126
</data>
127+
<data name="Eclipse_0_7s_104px__1_" type="System.Resources.ResXFileRef, System.Windows.Forms">
128+
<value>..\Resources\Eclipse-0.7s-104px (1).gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
129+
</data>
127130
<data name="oo2core_5_win64" type="System.Resources.ResXFileRef, System.Windows.Forms">
128131
<value>..\Resources\oo2core_5_win64.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
129132
</data>
133+
<data name="pro_swapper_splash" type="System.Resources.ResXFileRef, System.Windows.Forms">
134+
<value>..\Resources\pro swapper splash.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
135+
</data>
130136
<data name="top_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
131137
<value>..\Resources\top-left.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
132138
</data>

‎Resources/Eclipse-0.7s-104px (1).gif‎

30.3 KB
Loading

‎Resources/pro swapper splash.jpg‎

463 KB
Loading

‎src/Classes/RPC.cs‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,17 @@ public class RPC
66
{
77
public static DiscordRpcClient client;
88
public static Timestamps rpctimestamp { get; set; }
9+
private static RichPresence presence;
910
public static void InitializeRPC()
1011
{
1112
client = new DiscordRpcClient("697579712653819985");
1213
client.Initialize();
13-
SetState("Idle", false);
14-
}
15-
public static void SetState(string state, bool watching)
16-
{
17-
string discordurl = Convert.ToString(API.api.apidata.discordurl);
18-
Button[] buttons = new Button[] { new Button() { Label = "Discord", Url = discordurl } };
19-
if (watching) state = "Watching " + state;
20-
client.SetPresence(new RichPresence()
14+
Button[] buttons = { new Button() { Label = "Discord", Url = API.api.apidata.discordurl }, new Button() { Label = "YouTube", Url = "https://youtube.com/proswapperofficial"} };
15+
16+
presence = new RichPresence()
2117
{
2218
Details = "Pro Swapper | " + global.version,
23-
State = state,
19+
State = "Idle",
2420
Timestamps = rpctimestamp,
2521
Buttons = buttons,
2622

@@ -31,7 +27,16 @@ public static void SetState(string state, bool watching)
3127
SmallImageKey = "proswapperman",
3228
SmallImageText = "Made by Kye#5000"
3329
}
34-
});
30+
};
31+
SetState("Idle");
32+
}
33+
public static void SetState(string state, bool watching = false)
34+
{
35+
if (watching)
36+
state = "Watching " + state;
37+
38+
presence.State = state;
39+
client.SetPresence(presence);
3540
}
3641
}
3742
}

‎src/Classes/api.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@ public static class api
1515
private const string BaseAESEndpoint = FNAPIEndpoint + "aes";
1616
// FAesKey aes = new FAesKey(api.apidata.aes);
1717

18-
public static FAesKey fAesKey;
19-
private static string AESKey
18+
public static FAesKey fAesKey = null;
19+
public static FAesKey AESKey
2020
{
2121
get
2222
{
2323
try
2424
{
2525
//Using msgpack_lz4 compression (faster)
2626
string aes = msgpack.MsgPacklz4($"{BaseAESEndpoint}?responseFormat=msgpack_lz4").data.mainKey;
27-
fAesKey = new FAesKey(aes);
28-
return aes;
27+
return new FAesKey(aes);
2928
}
3029
catch (Exception ex)
3130
{
32-
return "";
31+
return null;
3332
throw new Exception($"Could not connect to {FNAPIEndpoint}: {ex.Message}");
3433
}
3534

@@ -68,7 +67,6 @@ public static void UpdateAPI()
6867
if (exception != null)
6968
Main.ThrowError($"Pro Swapper needs an internet connection to run, if you are already connected to the internet Pro Swapper's API may be blocked in your country, please use a VPN or try disabling your firewall, if you are already doing this please refer to this error: \n\n{exception.Message}");
7069
#endif
71-
apidata.aes = AESKey;
7270
}
7371

7472
public class Asset
@@ -114,7 +112,6 @@ public class APIRoot
114112
public string version { get; set; }
115113
public string discordurl { get; set; }
116114
public double timestamp { get; set; }
117-
public string aes { get; set; }
118115
public Item[] items { get; set; }
119116
public Status[] status { get; set; }
120117
public OptionMenu[] OptionMenu { get; set; }

0 commit comments

Comments
 (0)