Skip to content

Commit

Permalink
lots of improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
ohhsodead committed Feb 2, 2021
1 parent 70d727e commit cf3fe57
Show file tree
Hide file tree
Showing 42 changed files with 1,643 additions and 1,648 deletions.
Binary file removed lib/xdrpc.dll
Binary file not shown.
13 changes: 0 additions & 13 deletions src/AtomicX.sln
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 16.0.30011.22
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AtomicX", "AtomicX\AtomicX.csproj", "{471A20D8-E259-4002-9FC8-79252BDBA6A8}"
ProjectSection(ProjectDependencies) = postProject
{F19472F5-8C44-4C51-A8A0-B9DE5F555255} = {F19472F5-8C44-4C51-A8A0-B9DE5F555255}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DarkUI", "..\..\..\Plugins\DarkUI-master\DarkUI\DarkUI.csproj", "{F19472F5-8C44-4C51-A8A0-B9DE5F555255}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -26,14 +21,6 @@ Global
{471A20D8-E259-4002-9FC8-79252BDBA6A8}.Release|Any CPU.Build.0 = Release|Any CPU
{471A20D8-E259-4002-9FC8-79252BDBA6A8}.Release|x86.ActiveCfg = Release|Any CPU
{471A20D8-E259-4002-9FC8-79252BDBA6A8}.Release|x86.Build.0 = Release|Any CPU
{F19472F5-8C44-4C51-A8A0-B9DE5F555255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F19472F5-8C44-4C51-A8A0-B9DE5F555255}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F19472F5-8C44-4C51-A8A0-B9DE5F555255}.Debug|x86.ActiveCfg = Debug|Any CPU
{F19472F5-8C44-4C51-A8A0-B9DE5F555255}.Debug|x86.Build.0 = Debug|Any CPU
{F19472F5-8C44-4C51-A8A0-B9DE5F555255}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F19472F5-8C44-4C51-A8A0-B9DE5F555255}.Release|Any CPU.Build.0 = Release|Any CPU
{F19472F5-8C44-4C51-A8A0-B9DE5F555255}.Release|x86.ActiveCfg = Release|Any CPU
{F19472F5-8C44-4C51-A8A0-B9DE5F555255}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
101 changes: 72 additions & 29 deletions src/AtomicX/App.config
Original file line number Diff line number Diff line change
@@ -1,43 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,Log4net"/>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="AtomicToolGSC.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
</startup>
<userSettings>
<AtomicToolGSC.Properties.Settings>
<setting name="Key" serializeAs="String">
<value/>
</setting>
</AtomicToolGSC.Properties.Settings>
</userSettings>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,Log4net" />
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="AtomicToolGSC.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
<section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
<applicationSettings>
<DevExpress.LookAndFeel.Design.AppSettings>
<setting name="DefaultAppSkin" serializeAs="String">
<value>Skin/Office 2019 Black</value>
</setting>
<setting name="DefaultPalette" serializeAs="String">
<value></value>
</setting>
<setting name="TouchUI" serializeAs="String">
<value></value>
</setting>
<setting name="CompactUI" serializeAs="String">
<value></value>
</setting>
<setting name="TouchScaleFactor" serializeAs="String">
<value></value>
</setting>
<setting name="DirectX" serializeAs="String">
<value></value>
</setting>
<setting name="RegisterUserSkins" serializeAs="String">
<value></value>
</setting>
<setting name="RegisterBonusSkins" serializeAs="String">
<value>True</value>
</setting>
<setting name="FontBehavior" serializeAs="String">
<value>UseSegoeUI</value>
</setting>
<setting name="DefaultAppFont" serializeAs="String">
<value></value>
</setting>
<setting name="DPIAwarenessMode" serializeAs="String">
<value></value>
</setting>
<setting name="CustomPaletteCollection" serializeAs="Xml">
<value />
</setting>
</DevExpress.LookAndFeel.Design.AppSettings>
</applicationSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<userSettings>
<AtomicToolGSC.Properties.Settings>
<setting name="Key" serializeAs="String">
<value />
</setting>
</AtomicToolGSC.Properties.Settings>
</userSettings>
<log4net>
<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="log.log"/>
<appendToFile value="true"/>
<rollingStyle value="Size"/>
<maxSizeRollBackups value="1"/>
<maximumFileSize value="5MB"/>
<staticLogFileName value="true"/>
<file value="log.log" />
<appendToFile value="true" />
<rollingStyle value="Size" />
<maxSizeRollBackups value="1" />
<maximumFileSize value="5MB" />
<staticLogFileName value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%newline%date [%thread] %-5level %logger - %message%newline%exception"/>
<conversionPattern value="%newline%date [%thread] %-5level %logger - %message%newline%exception" />
</layout>
</appender>
<appender name="DebugAppender" type="log4net.Appender.DebugAppender">
<immediateFlush value="true"/>
<immediateFlush value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%newline%date [%thread] %property{detailContext} %-5level %logger - %message%newline%exception"/>
<conversionPattern value="%newline%date [%thread] %property{detailContext} %-5level %logger - %message%newline%exception" />
</layout>
</appender>
<root>
<level value="ALL"/>
<appender-ref ref="DebugAppender"/>
<appender-ref ref="RollingFileAppender"/>
<level value="ALL" />
<appender-ref ref="DebugAppender" />
<appender-ref ref="RollingFileAppender" />
</root>
</log4net>
</configuration>
</configuration>
102 changes: 61 additions & 41 deletions src/AtomicX/AtomicX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AtomicX</RootNamespace>
<AssemblyName>AtomicX</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<IsWebBootstrapper>false</IsWebBootstrapper>
Expand Down Expand Up @@ -53,25 +53,53 @@
<StartupObject>AtomicX.Program</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Prestige Master Icon.ico</ApplicationIcon>
<ApplicationIcon>Resources\app-icon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup />
<ItemGroup>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
<Reference Include="DarkUI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Plugins\DarkUI-master\DarkUI\bin\Release\DarkUI.dll</HintPath>
</Reference>
<Reference Include="DevExpress.BonusSkins.v20.2, Version=20.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Data.Desktop.v20.2, Version=20.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="DevExpress.Data.v20.2, Version=20.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="DevExpress.Utils.v20.2, Version=20.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="DevExpress.XtraBars.v20.2, Version=20.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="DevExpress.XtraEditors.v20.2, Version=20.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="JRPC">
<HintPath>..\References\JRPC.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PS3Lib">
<HintPath>..\..\lib\PS3Lib.dll</HintPath>
<Reference Include="PS3Lib, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\References\PS3Lib.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand All @@ -82,46 +110,45 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="xdevkit, Version=2.0.21076.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>True</EmbedInteropTypes>
<HintPath>..\..\lib\xdevkit.dll</HintPath>
</Reference>
<Reference Include="xdrpc, Version=2.0.21256.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\xdrpc.dll</HintPath>
<HintPath>..\References\xdevkit.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Database\GscData.cs" />
<Compile Include="Database\ModsData.cs" />
<Compile Include="Database\AppData.cs" />
<Compile Include="Constants\Urls.cs" />
<Compile Include="Database\DropboxData.cs" />
<Compile Include="Extensions\StringExtensions.cs" />
<Compile Include="Io\Archives.cs" />
<Compile Include="Io\UserFolders.cs" />
<Compile Include="Models\GscData.cs" />
<Compile Include="Models\ModsData.cs" />
<Compile Include="Database\SettingsData.cs" />
<Compile Include="Extensions\HttpExtensions.cs" />
<Compile Include="Extensions\ImageExtensions.cs" />
<Compile Include="Extensions\KnownFolders.cs" />
<Compile Include="Extensions\Utilities.cs" />
<Compile Include="Extensions\Worker.cs" />
<Compile Include="Extensions\XDRPCExtension.cs" />
<Compile Include="Forms\CustomInjector.cs">
<Compile Include="Io\KnownFolders.cs" />
<Compile Include="Extensions\UpdateExtensions.cs" />
<Compile Include="Extensions\WorkerExtensions.cs" />
<Compile Include="Forms\FileInjector.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\CustomInjector.Designer.cs">
<DependentUpon>CustomInjector.cs</DependentUpon>
<Compile Include="Forms\FileInjector.Designer.cs">
<DependentUpon>FileInjector.cs</DependentUpon>
</Compile>
<Compile Include="Forms\MainForm.cs">
<Compile Include="Forms\MainWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
<Compile Include="Forms\MainWindow.Designer.cs">
<DependentUpon>MainWindow.cs</DependentUpon>
</Compile>
<Compile Include="Models\Release Data\GitHubData.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Forms\CustomInjector.resx">
<DependentUpon>CustomInjector.cs</DependentUpon>
<EmbeddedResource Include="Forms\FileInjector.resx">
<DependentUpon>FileInjector.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
<EmbeddedResource Include="Forms\MainWindow.resx">
<DependentUpon>MainWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
Expand Down Expand Up @@ -159,17 +186,10 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Content Include="Prestige Master Icon.ico" />
<None Include="Resources\icons8-uninstall-programs-22.png" />
<None Include="Resources\icons8-software-installer-22.png" />
<None Include="Resources\icons8-heart-outline-22.png" />
<None Include="Resources\icons8-download-from-the-cloud-22.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Plugins\DarkUI-master\DarkUI\DarkUI.csproj">
<Project>{f19472f5-8c44-4c51-a8a0-b9de5f555255}</Project>
<Name>DarkUI</Name>
</ProjectReference>
<Content Include="Resources\app-icon.ico" />
<None Include="Resources\Icons\uninstall.png" />
<None Include="Resources\Icons\install.png" />
<None Include="Resources\Icons\download_from_the_cloud.png" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
46 changes: 46 additions & 0 deletions src/AtomicX/Constants/Urls.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace AtomicX.Constants
{
public class Urls
{
/// <summary>
/// Web URL for the project repository on hosted GitHub.
/// </summary>
internal const string GitHubRepo = "https://github.com/ohhsodead/AtomicX/";

/// <summary>
/// Direct web API on GitHub with the latest release information.
/// </summary>
internal const string GitHubLatestRelease = "https://api.github.com/repos/ohhsodead/AtomicX/releases/latest";

/// <summary>
/// Direct download for the categories database file hosted on Dropbox. (Maybe move to GitHub soon)
/// </summary>
internal const string GSC_MODS = "https://dl.dropbox.com/s/y71y5z2g9if89rw/gsc-mods.json?raw=true";

/// <summary>
/// Direct download for the categories database file hosted on Dropbox. (Maybe move to GitHub soon)
/// </summary>
internal const string PS3_GSC_MP = "https://dl.dropbox.com/s/kepaclyfif9t6qr/ps3-gsc-dump-mp.json?raw=true";

/// <summary>
/// Direct download for the mods database file hosted on Dropbox. (Maybe move to GitHub soon)
/// </summary>
internal const string PS3_GSC_ZM = "https://dl.dropbox.com/s/1bpjh455amuphq7/ps3-gsc-dump-zm.json?raw=true";

/// <summary>
/// Direct download for the categories database file hosted on Dropbox. (Maybe move to GitHub soon)
/// </summary>
internal const string XBOX_GSC_MP = "https://dl.dropbox.com/s/oz3r3db5h51rrlm/xbox-gsc-dump-mp.json?aw=true";

/// <summary>
/// Direct download for the mods database file hosted on Dropbox. (Maybe move to GitHub soon)
/// </summary>
internal const string XBOX_GSC_ZM = "https://dl.dropbox.com/s/wech3c18ss667zd/xbox-gsc-dump-zm.json?raw=true";
}
}
18 changes: 0 additions & 18 deletions src/AtomicX/Database/AppData.cs

This file was deleted.

Loading

0 comments on commit cf3fe57

Please sign in to comment.