Skip to content

Commit

Permalink
Add SteamUID autodetect
Browse files Browse the repository at this point in the history
  • Loading branch information
leohubert committed Feb 18, 2018
1 parent 025bcbc commit 95344aa
Show file tree
Hide file tree
Showing 38 changed files with 10,882 additions and 10,828 deletions.
6 changes: 3 additions & 3 deletions Debug/LauncherArma3.application
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<description asmv2:publisher="LauncherArma3" asmv2:product="LauncherArma3" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.5.2" profile="Full" supportedRuntime="4.0.30319" />
<framework targetVersion="4.6.1" profile="Full" supportedRuntime="4.0.30319" />
</compatibleFrameworks>
<dependency>
<dependentAssembly dependencyType="install" codebase="LauncherArma3.exe.manifest" size="13238">
<dependentAssembly dependencyType="install" codebase="LauncherArma3.exe.manifest" size="13887">
<assemblyIdentity name="LauncherArma3.exe" version="1.0.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>Y1Zzuw5xB38SlX3Eb8w0Vc6nRJba7+1WbxuQqzvA/IU=</dsig:DigestValue>
<dsig:DigestValue>jOOA+xeJrpHnEAsJ8uV3v1x28dfoan5J3PVNUgNQKU0=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion Debug/LauncherArma3.exe.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Expand Down
18 changes: 15 additions & 3 deletions Debug/LauncherArma3.exe.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="LauncherArma3.exe" size="4797440">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="LauncherArma3.exe" size="4798464">
<assemblyIdentity name="LauncherArma3" version="5.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>W3Xfb3bi7EEZWDmrsrHXYjEqa3Oc0jkG6Vg6es2Sr1w=</dsig:DigestValue>
<dsig:DigestValue>Tvgrm7BxelELLLVdiHt9uLPkreKZV60esvZrICpw2Ic=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down Expand Up @@ -150,6 +150,18 @@
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Steamworks.NET.dll" size="277504">
<assemblyIdentity name="Steamworks.NET" version="11.0.0.0" language="neutral" processorArchitecture="amd64" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>N1bOkga6lHu5006Z6rLIYZbd4Mk/rYgNYeiN+Ecl3sI=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="System.Net.Http.Extensions.dll" size="22256">
<assemblyIdentity name="System.Net.Http.Extensions" version="2.2.18.0" publicKeyToken="B03F5F7F11D50A3A" language="neutral" processorArchitecture="msil" />
Expand Down Expand Up @@ -189,7 +201,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>ubWtL2phfpClUvo9uPNc1rcPMGyc+Oo9RcfGlO2WA1M=</dsig:DigestValue>
<dsig:DigestValue>9rLlN3ZA5Ve8XrLFGiK4uaqtKq38RJj80EQrWkzRKJM=</dsig:DigestValue>
</hash>
</file>
<file name="logo_regalian.ico" size="370070">
Expand Down
Binary file modified Debug/LauncherArma3.pdb
Binary file not shown.
Binary file added Debug/Steamworks.NET.dll
Binary file not shown.
Binary file added Debug/steam_api64.dll
Binary file not shown.
1 change: 1 addition & 0 deletions Debug/steam_appid.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
480
Binary file added LauncherArma3/.vs/LauncherArma3/v15/.suo
Binary file not shown.
Empty file.
Binary file not shown.
14 changes: 7 additions & 7 deletions LauncherArma3/LauncherArma3/App.config
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="MetroFramework" publicKeyToken="5f91a84759bf584a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.3.5.0" newVersion="1.3.5.0" />
<assemblyIdentity name="MetroFramework" publicKeyToken="5f91a84759bf584a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.3.5.0" newVersion="1.3.5.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>
7 changes: 6 additions & 1 deletion LauncherArma3/LauncherArma3/LauncherArma3.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LauncherArma3</RootNamespace>
<AssemblyName>LauncherArma3</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<PublishUrl>publier\</PublishUrl>
Expand All @@ -27,6 +27,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -113,6 +114,10 @@
<Reference Include="RestSharp">
<HintPath>..\..\..\..\..\Desktop\RestSharp.dll</HintPath>
</Reference>
<Reference Include="Steamworks.NET, Version=11.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Steamworks.NET.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.DirectoryServices" />
Expand Down
4 changes: 2 additions & 2 deletions LauncherArma3/LauncherArma3/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ static void Main()
/* GENERAL OPTIONS */

string communityName = "Emodyz"; /* Your serverName */
string apiUrl = "http://51.255.171.192:8080/"; /* Link to API launcher Arma 3 */
string apiUrl = "http://ezgames.eu/"; /* Link to API launcher Arma 3 */

/* FTP NO FUNCTIONAL */

Expand Down Expand Up @@ -66,4 +66,4 @@ static void Main()
}
}
}
}
}
6 changes: 6 additions & 0 deletions LauncherArma3/LauncherArma3/loginForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Xml;
using Steamworks;

namespace LauncherArma3
{
Expand Down Expand Up @@ -72,6 +73,7 @@ public partial class loginForm : MetroFramework.Forms.MetroForm
bool maintenance;
bool loaded = false;
bool notif = false;
string uuid = "Not Found";
int taskforce;
string vtaskforce;
string defaultLanguage;
Expand All @@ -85,6 +87,7 @@ public partial class loginForm : MetroFramework.Forms.MetroForm
public loginForm(string _communityName, string api, string ftpUrl, string ftpUser, string ftpPass, bool mod, string _defaultLanguage)
{
InitializeComponent();
SteamAPI.Init();
materialSkinManager = MaterialSkinManager.Instance;
materialSkinManager.Theme = MaterialSkinManager.Themes.DARK;
materialSkinManager.ColorScheme = new ColorScheme(Primary.Cyan400, Primary.Indigo700, Primary.Indigo100, Accent.LightGreen200, TextShade.WHITE);
Expand All @@ -95,6 +98,7 @@ public loginForm(string _communityName, string api, string ftpUrl, string ftpUse
ftp_pass = ftpPass;
modDev = mod;
defaultLanguage = _defaultLanguage;
uuid = SteamUser.GetSteamID().ToString();
}

private void loginForm_Load(object sender, EventArgs e)
Expand Down Expand Up @@ -302,6 +306,7 @@ private async void loginButton_Click(object sender, EventArgs e)

var request = new RestRequest("api/login", Method.POST);

request.AddParameter("uuid", uuid);
request.AddParameter("login", loginUsername.Text);
request.AddParameter("password", loginPassword.Text);
request.AddParameter("launcher", 1);
Expand Down Expand Up @@ -465,6 +470,7 @@ void loginWithToken()

var request = new RestRequest("api/users/client/get", Method.POST);

request.AddParameter("uuid", uuid);
request.AddParameter("token", sessionToken);

IRestResponse response = client.Execute(request);
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<description asmv2:publisher="LauncherArma3" asmv2:product="LauncherArma3" xmlns="urn:schemas-microsoft-com:asm.v1" />
<deployment install="true" mapFileExtensions="true" />
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
<framework targetVersion="4.5.2" profile="Full" supportedRuntime="4.0.30319" />
<framework targetVersion="4.6.1" profile="Full" supportedRuntime="4.0.30319" />
</compatibleFrameworks>
<dependency>
<dependentAssembly dependencyType="install" codebase="LauncherArma3.exe.manifest" size="13238">
<dependentAssembly dependencyType="install" codebase="LauncherArma3.exe.manifest" size="13887">
<assemblyIdentity name="LauncherArma3.exe" version="1.0.0.0" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>Y1Zzuw5xB38SlX3Eb8w0Vc6nRJba7+1WbxuQqzvA/IU=</dsig:DigestValue>
<dsig:DigestValue>jOOA+xeJrpHnEAsJ8uV3v1x28dfoan5J3PVNUgNQKU0=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e89c0699fc3e9379b903d02e0408e6f6d111b400
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,26 @@ C:\Users\Hubert Léo\Documents\GitHub\Launcher_Arma3\LauncherArma3\LauncherArma3
C:\Users\Hubert Léo\Documents\GitHub\Launcher_Arma3\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.exe
C:\Users\Hubert Léo\Documents\GitHub\Launcher_Arma3\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.pdb
C:\Users\Hubert Léo\Documents\GitHub\Launcher_Arma3\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.csprojResolveAssemblyReference.cache
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.csproj.App.config
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.csprojResolveAssemblyReference.cache
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.Arma3.serverPassword.resources
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.languageChoice.resources
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.launcherMain.resources
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.loginForm.resources
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.Properties.Resources.resources
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.registerForm.resources
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.selectSteamProfile.resources
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.serverChoose.resources
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.settingsForm.resources
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.csproj.GenerateResource.Cache
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.csproj.CoreCompileInputs.cache
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\Debug\LauncherArma3.exe.config
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\Debug\LauncherArma3.exe.manifest
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\Debug\LauncherArma3.application
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\Debug\LauncherArma3.exe
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\Debug\LauncherArma3.pdb
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.TrustInfo.xml
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.exe.manifest
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.application
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.exe
C:\Users\Leo Hubert\Desktop\Launcher_Multigaming\LauncherArma3\LauncherArma3\obj\Debug\LauncherArma3.pdb
Binary file not shown.
Binary file not shown.
18 changes: 15 additions & 3 deletions LauncherArma3/LauncherArma3/obj/Debug/LauncherArma3.exe.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="LauncherArma3.exe" size="4797440">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="LauncherArma3.exe" size="4798464">
<assemblyIdentity name="LauncherArma3" version="5.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>W3Xfb3bi7EEZWDmrsrHXYjEqa3Oc0jkG6Vg6es2Sr1w=</dsig:DigestValue>
<dsig:DigestValue>Tvgrm7BxelELLLVdiHt9uLPkreKZV60esvZrICpw2Ic=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Expand Down Expand Up @@ -150,6 +150,18 @@
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Steamworks.NET.dll" size="277504">
<assemblyIdentity name="Steamworks.NET" version="11.0.0.0" language="neutral" processorArchitecture="amd64" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>N1bOkga6lHu5006Z6rLIYZbd4Mk/rYgNYeiN+Ecl3sI=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="System.Net.Http.Extensions.dll" size="22256">
<assemblyIdentity name="System.Net.Http.Extensions" version="2.2.18.0" publicKeyToken="B03F5F7F11D50A3A" language="neutral" processorArchitecture="msil" />
Expand Down Expand Up @@ -189,7 +201,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>ubWtL2phfpClUvo9uPNc1rcPMGyc+Oo9RcfGlO2WA1M=</dsig:DigestValue>
<dsig:DigestValue>9rLlN3ZA5Ve8XrLFGiK4uaqtKq38RJj80EQrWkzRKJM=</dsig:DigestValue>
</hash>
</file>
<file name="logo_regalian.ico" size="370070">
Expand Down
Binary file not shown.
Binary file modified LauncherArma3/LauncherArma3/obj/Debug/LauncherArma3.pdb
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 95344aa

Please sign in to comment.