Update to latest SteamStorefrontAPI

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "SteamStorefrontAPI"]
+	path = SteamStorefrontAPI
+	url = https://git.jeddunk.xyz/jeddunk/SteamStorefrontAPI.git

GoldbergGUI.Core/GoldbergGUI.Core.csproj

@@ -1,27 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+	<PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
-    <FileVersion>0.2.0</FileVersion>
+		<FileVersion>0.3.0</FileVersion>
-    <Company>Jeddunk</Company>
+		<Company>Jeddunk</Company>
-  </PropertyGroup>
+		<Platforms>AnyCPU;x86;x64</Platforms>
+	</PropertyGroup>
 
-  <ItemGroup>
+	<ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.14.0" />
+		<PackageReference Include="AngleSharp" Version="0.14.0" />
-    <PackageReference Include="MvvmCross" Version="7.1.2" />
+		<PackageReference Include="MvvmCross" Version="7.1.2" />
-    <PackageReference Include="NinjaNye.SearchExtensions" Version="3.0.1" />
+		<PackageReference Include="NinjaNye.SearchExtensions" Version="3.0.1" />
-    <PackageReference Include="SharpCompress" Version="0.26.0" />
+		<PackageReference Include="SharpCompress" Version="0.35.0" />
-    <PackageReference Include="sqlite-net-pcl" Version="1.7.335" />
+		<PackageReference Include="sqlite-net-pcl" Version="1.7.335" />
-    <PackageReference Include="SteamStorefrontAPI.NETStandard" Version="1.0.0" />
+		<PackageReference Include="SteamStorefrontAPI" Version="2.0.1.421" />
-  </ItemGroup>
+	</ItemGroup>
 
-  <ItemGroup>
+	<ItemGroup>
-    <Reference Include="PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+		<Reference Include="PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
-      <HintPath>..\..\..\..\..\..\Windows\Microsoft.NET\assembly\GAC_32\PresentationCore\v4.0_4.0.0.0__31bf3856ad364e35\PresentationCore.dll</HintPath>
+			<HintPath>..\..\..\..\..\..\Windows\Microsoft.NET\assembly\GAC_32\PresentationCore\v4.0_4.0.0.0__31bf3856ad364e35\PresentationCore.dll</HintPath>
-    </Reference>
+		</Reference>
-    <Reference Include="PresentationFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+		<Reference Include="PresentationFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
-      <HintPath>..\..\..\..\..\..\Windows\Microsoft.NET\assembly\GAC_MSIL\PresentationFramework\v4.0_4.0.0.0__31bf3856ad364e35\PresentationFramework.dll</HintPath>
+			<HintPath>..\..\..\..\..\..\Windows\Microsoft.NET\assembly\GAC_MSIL\PresentationFramework\v4.0_4.0.0.0__31bf3856ad364e35\PresentationFramework.dll</HintPath>
-    </Reference>
+		</Reference>
-  </ItemGroup>
+	</ItemGroup>
 
 </Project>

GoldbergGUI.Core/Models/GoldbergModel.cs

@@ -69,6 +69,18 @@ namespace GoldbergGUI.Core.Models
 
     public class DlcApp : SteamApp
     {
+        public DlcApp() { }
+
+        public DlcApp(SteamApp steamApp)
+        {
+            AppId = steamApp.AppId;
+            Name = steamApp.Name;
+            ComparableName = steamApp.ComparableName;
+            AppType = steamApp.AppType;
+            LastModified = steamApp.LastModified;
+            PriceChangeNumber = steamApp.PriceChangeNumber;
+        }
+
         /// <summary>
         /// Path to DLC (relative to Steam API DLL) (optional)
         /// </summary>

GoldbergGUI.Core/Models/SteamAppModel.cs

@@ -1,6 +1,6 @@
+using SQLite;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using SQLite;
 
 // ReSharper disable UnusedMember.Global
 // ReSharper disable ClassNeverInstantiated.Global
@@ -32,7 +32,7 @@ namespace GoldbergGUI.Core.Models
         /// App type (Game, DLC, ...)
         /// </summary>
         [Column("type")]
-        public string type { get; set; }
+        public string AppType { get; set; }
 
         public override string ToString()
         {

GoldbergGUI.Core/Services/GoldbergService.cs

@@ -1,3 +1,6 @@
+using GoldbergGUI.Core.Models;
+using GoldbergGUI.Core.Utils;
+using MvvmCross.Logging;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -7,9 +10,6 @@ using System.Net.Http;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
-using GoldbergGUI.Core.Models;
-using GoldbergGUI.Core.Utils;
-using MvvmCross.Logging;
 
 namespace GoldbergGUI.Core.Services
 {
@@ -208,6 +208,7 @@ namespace GoldbergGUI.Core.Services
         {
             _log.Info("Reading configuration...");
             var appId = -1;
+            var achievementList = new List<Achievement>();
             var dlcList = new List<DlcApp>();
             var steamAppidTxt = Path.Combine(path, "steam_appid.txt");
             if (File.Exists(steamAppidTxt))
@@ -221,6 +222,19 @@ namespace GoldbergGUI.Core.Services
                 _log.Info(@"""steam_appid.txt"" missing! Skipping...");
             }
 
+            var achievementJson = Path.Combine(path, "steam_settings", "achievements.json");
+            if (File.Exists(achievementJson))
+            {
+                _log.Info("Getting achievements...");
+                var json = await File.ReadAllTextAsync(achievementJson)
+                    .ConfigureAwait(false);
+                achievementList = System.Text.Json.JsonSerializer.Deserialize<List<Achievement>>(json);
+            }
+            else
+            {
+                _log.Info(@"""steam_settings/achievements.json"" missing! Skipping...");
+            }
+
             var dlcTxt = Path.Combine(path, "steam_settings", "DLC.txt");
             var appPathTxt = Path.Combine(path, "steam_settings", "app_paths.txt");
             if (File.Exists(dlcTxt))
@@ -263,6 +277,7 @@ namespace GoldbergGUI.Core.Services
             return new GoldbergConfiguration
             {
                 AppId = appId,
+                Achievements = achievementList,
                 DlcList = dlcList,
                 Offline = File.Exists(Path.Combine(path, "steam_settings", "offline.txt")),
                 DisableNetworking = File.Exists(Path.Combine(path, "steam_settings", "disable_networking.txt")),
@@ -303,6 +318,53 @@ namespace GoldbergGUI.Core.Services
             await File.WriteAllTextAsync(Path.Combine(path, "steam_appid.txt"), c.AppId.ToString())
                 .ConfigureAwait(false);
 
+            // Achievements + Images
+            if (c.Achievements.Count > 0)
+            {
+                _log.Info("Downloading images...");
+                var imagePath = Path.Combine(path, "steam_settings", "images");
+                Directory.CreateDirectory(imagePath);
+
+                foreach (var achievement in c.Achievements)
+                {
+                    await DownloadImageAsync(imagePath, achievement.Icon);
+                    await DownloadImageAsync(imagePath, achievement.IconGray);
+
+                    // Update achievement list to point to local images instead
+                    achievement.Icon = $"images/{Path.GetFileName(achievement.Icon)}";
+                    achievement.IconGray = $"images/{Path.GetFileName(achievement.IconGray)}";
+                }
+
+                _log.Info("Saving achievements...");
+
+                var achievementJson = System.Text.Json.JsonSerializer.Serialize(
+                    c.Achievements,
+                    new System.Text.Json.JsonSerializerOptions
+                    {
+                        Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+                        WriteIndented = true
+                    });
+                await File.WriteAllTextAsync(Path.Combine(path, "steam_settings", "achievements.json"), achievementJson)
+                    .ConfigureAwait(false);
+
+                _log.Info("Finished saving achievements.");
+            }
+            else
+            {
+                _log.Info("No achievements set! Removing achievement files...");
+                var imagePath = Path.Combine(path, "steam_settings", "images");
+                if (Directory.Exists(imagePath))
+                {
+                    Directory.Delete(imagePath);
+                }
+                var achievementPath = Path.Combine(path, "steam_settings", "achievements");
+                if (File.Exists(achievementPath))
+                {
+                    File.Delete(achievementPath);
+                }
+                _log.Info("Removed achievement files.");
+            }
+
             // DLC + App path
             if (c.DlcList.Count > 0)
             {
@@ -621,5 +683,22 @@ namespace GoldbergGUI.Core.Services
 
             return success;
         }
+
+        private async Task DownloadImageAsync(string imageFolder, string imageUrl)
+        {
+            var fileName = Path.GetFileName(imageUrl);
+            var targetPath = Path.Combine(imageFolder, fileName);
+            if (File.Exists(targetPath))
+            {
+                return;
+            }
+            else if (imageUrl.StartsWith("images/"))
+            {
+                _log.Warn($"Previously downloaded image '{imageUrl}' is now missing!");
+            }
+
+            var wc = new System.Net.WebClient();
+            await wc.DownloadFileTaskAsync(new Uri(imageUrl, UriKind.Absolute), targetPath);
+        }
     }
 }

GoldbergGUI.Core/Services/SteamService.cs

@@ -1,10 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net.Http;
-using System.Text.Json;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
 using GoldbergGUI.Core.Models;
@@ -13,6 +6,13 @@ using MvvmCross.Logging;
 using NinjaNye.SearchExtensions;
 using SQLite;
 using SteamStorefrontAPI;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 
 namespace GoldbergGUI.Core.Services
 {
@@ -23,6 +23,7 @@ namespace GoldbergGUI.Core.Services
         public Task<IEnumerable<SteamApp>> GetListOfAppsByName(string name);
         public Task<SteamApp> GetAppByName(string name);
         public Task<SteamApp> GetAppById(int appid);
+        public Task<List<Achievement>> GetListOfAchievements(SteamApp steamApp);
         public Task<List<DlcApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb);
     }
 
@@ -81,6 +82,7 @@ namespace GoldbergGUI.Core.Services
         private const string AppTypeGame = "game";
         private const string AppTypeDlc = "dlc";
         private const string Database = "steamapps.cache";
+        private const string GameSchemaUrl = "https://api.steampowered.com/ISteamUserStats/GetSchemaForGame/v2/";
 
         private IMvxLog _log;
 
@@ -91,7 +93,7 @@ namespace GoldbergGUI.Core.Services
             static SteamApps DeserializeSteamApps(Type type, string cacheString)
             {
                 return type == typeof(SteamAppsV2)
-                    ? (SteamApps) JsonSerializer.Deserialize<SteamAppsV2>(cacheString)
+                    ? (SteamApps)JsonSerializer.Deserialize<SteamAppsV2>(cacheString)
                     : JsonSerializer.Deserialize<SteamAppsV1>(cacheString);
             }
 
@@ -128,7 +130,7 @@ namespace GoldbergGUI.Core.Services
                     var cache = new HashSet<SteamApp>();
                     foreach (var steamApp in cacheRaw)
                     {
-                        steamApp.type = steamCache.SteamAppType;
+                        steamApp.AppType = steamCache.SteamAppType;
                         steamApp.ComparableName = PrepareStringToCompare(steamApp.Name);
                         cache.Add(steamApp);
                     }
@@ -141,7 +143,7 @@ namespace GoldbergGUI.Core.Services
         public async Task<IEnumerable<SteamApp>> GetListOfAppsByName(string name)
         {
             var query = await _db.Table<SteamApp>()
-                .Where(x => x.type == AppTypeGame).ToListAsync().ConfigureAwait(false);
+                .Where(x => x.AppType == AppTypeGame).ToListAsync().ConfigureAwait(false);
             var listOfAppsByName = query.Search(x => x.Name)
                 .SetCulture(StringComparison.OrdinalIgnoreCase)
                 .ContainingAll(name.Split(' '));
@@ -153,7 +155,7 @@ namespace GoldbergGUI.Core.Services
             _log.Info($"Trying to get app {name}");
             var comparableName = PrepareStringToCompare(name);
             var app = await _db.Table<SteamApp>()
-                .FirstOrDefaultAsync(x => x.type == AppTypeGame && x.ComparableName.Equals(comparableName))
+                .FirstOrDefaultAsync(x => x.AppType == AppTypeGame && x.ComparableName.Equals(comparableName))
                 .ConfigureAwait(false);
             if (app != null) _log.Info($"Successfully got app {app}");
             return app;
@@ -162,12 +164,38 @@ namespace GoldbergGUI.Core.Services
         public async Task<SteamApp> GetAppById(int appid)
         {
             _log.Info($"Trying to get app with ID {appid}");
-            var app = await _db.Table<SteamApp>().Where(x => x.type == AppTypeGame)
+            var app = await _db.Table<SteamApp>().Where(x => x.AppType == AppTypeGame)
                 .FirstOrDefaultAsync(x => x.AppId.Equals(appid)).ConfigureAwait(false);
             if (app != null) _log.Info($"Successfully got app {app}");
             return app;
         }
 
+        public async Task<List<Achievement>> GetListOfAchievements(SteamApp steamApp)
+        {
+            var achievementList = new List<Achievement>();
+            if (steamApp == null)
+            {
+                return achievementList;
+            }
+
+            _log.Info($"Getting achievements for App {steamApp}");
+
+            var client = new HttpClient();
+            client.DefaultRequestHeaders.UserAgent.ParseAdd(UserAgent);
+            var apiUrl = $"{GameSchemaUrl}?key={Secrets.SteamWebApiKey()}&appid={steamApp.AppId}&l=en";
+
+            var response = await client.GetAsync(apiUrl);
+            var responseBody = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            var jsonResponse = JsonDocument.Parse(responseBody);
+            var achievementData = jsonResponse.RootElement.GetProperty("game")
+                .GetProperty("availableGameStats")
+                .GetProperty("achievements");
+
+            achievementList = JsonSerializer.Deserialize<List<Achievement>>(achievementData.GetRawText());
+            return achievementList;
+        }
+
         public async Task<List<DlcApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb)
         {
             var dlcList = new List<DlcApp>();
@@ -180,10 +208,10 @@ namespace GoldbergGUI.Core.Services
                 {
                     steamAppDetails.DLC.ForEach(async x =>
                     {
-                        var result = await _db.Table<DlcApp>().Where(z => z.type == AppTypeDlc)
+                        var result = await _db.Table<SteamApp>().Where(z => z.AppType == AppTypeDlc)
                                          .FirstOrDefaultAsync(y => y.AppId.Equals(x)).ConfigureAwait(true)
-                                     ?? new DlcApp() {AppId = x, Name = $"Unknown DLC {x}"};
+                                     ?? new SteamApp() { AppId = x, Name = $"Unknown DLC {x}", ComparableName = $"unknownDlc{x}", AppType = AppTypeDlc };
-                        dlcList.Add(result);
+                        dlcList.Add(new DlcApp(result));
                         _log.Debug($"{result.AppId}={result.Name}");
                     });
 
@@ -229,7 +257,7 @@ namespace GoldbergGUI.Core.Services
                                 var dlcName = query3 != null
                                     ? query3[1].Text().Replace("\n", "").Trim()
                                     : $"Unknown DLC {dlcId}";
-                                var dlcApp = new DlcApp {AppId = Convert.ToInt32(dlcId), Name = dlcName};
+                                var dlcApp = new DlcApp { AppId = Convert.ToInt32(dlcId), Name = dlcName };
                                 var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId));
                                 if (i > -1)
                                 {

GoldbergGUI.Core/Utils/CustomMvxAppStart.cs

@@ -1,8 +1,7 @@
-using System;
-using System.Threading.Tasks;
 using MvvmCross.Exceptions;
 using MvvmCross.Navigation;
 using MvvmCross.ViewModels;
+using System.Threading.Tasks;
 
 namespace GoldbergGUI.Core.Utils
 {

GoldbergGUI.Core/ViewModels/MainViewModel.cs

@@ -1,4 +1,12 @@
-using System;
+using GoldbergGUI.Core.Models;
+using GoldbergGUI.Core.Services;
+using GoldbergGUI.Core.Utils;
+using Microsoft.Win32;
+using MvvmCross.Commands;
+using MvvmCross.Logging;
+using MvvmCross.Navigation;
+using MvvmCross.ViewModels;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
@@ -9,14 +17,6 @@ using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
-using GoldbergGUI.Core.Models;
-using GoldbergGUI.Core.Services;
-using GoldbergGUI.Core.Utils;
-using Microsoft.Win32;
-using MvvmCross.Commands;
-using MvvmCross.Logging;
-using MvvmCross.Navigation;
-using MvvmCross.ViewModels;
 
 namespace GoldbergGUI.Core.ViewModels
 {
@@ -30,6 +30,7 @@ namespace GoldbergGUI.Core.ViewModels
         private int _appId;
 
         //private SteamApp _currentGame;
+        private ObservableCollection<Achievement> _achievements;
         private ObservableCollection<DlcApp> _dlcs;
         private string _accountName;
         private long _steamId;
@@ -142,6 +143,16 @@ namespace GoldbergGUI.Core.ViewModels
             }
         }
 
+        public ObservableCollection<Achievement> Achievements
+        {
+            get => _achievements;
+            set
+            {
+                _achievements = value;
+                RaisePropertyChanged(() => Achievements);
+            }
+        }
+
         public string AccountName
         {
             get => _accountName;
@@ -368,6 +379,33 @@ namespace GoldbergGUI.Core.ViewModels
             if (steamApp != null) GameName = steamApp.Name;
         }
 
+        public IMvxCommand GetListOfAchievementsCommand => new MvxAsyncCommand(GetListOfAchievements);
+
+        private async Task GetListOfAchievements()
+        {
+            if (AppId <= 0)
+            {
+                _log.Error("Invalid Steam App!");
+                return;
+            }
+
+            MainWindowEnabled = false;
+            StatusText = "Trying to get list of achievements...";
+            var listOfAchievements = await _steam.GetListOfAchievements(new SteamApp { AppId = AppId, Name = GameName });
+            Achievements = new MvxObservableCollection<Achievement>(listOfAchievements);
+            MainWindowEnabled = true;
+
+            if (Achievements.Count > 0)
+            {
+                var empty = Achievements.Count == 1 ? "" : "s";
+                StatusText = $"Successfully got {Achievements.Count} achievement{empty}! Ready.";
+            }
+            else
+            {
+                StatusText = "No achievements found! Ready.";
+            }
+        }
+
         public IMvxCommand GetListOfDlcCommand => new MvxAsyncCommand(GetListOfDlc);
 
         private async Task GetListOfDlc()
@@ -380,7 +418,7 @@ namespace GoldbergGUI.Core.ViewModels
 
             MainWindowEnabled = false;
             StatusText = "Trying to get list of DLCs...";
-            var listOfDlc = await _steam.GetListOfDlc(new SteamApp {AppId = AppId, Name = GameName}, true)
+            var listOfDlc = await _steam.GetListOfDlc(new SteamApp { AppId = AppId, Name = GameName }, true)
                 .ConfigureAwait(false);
             DLCs = new MvxObservableCollection<DlcApp>(listOfDlc);
             MainWindowEnabled = true;
@@ -414,13 +452,14 @@ namespace GoldbergGUI.Core.ViewModels
             MainWindowEnabled = false;
             StatusText = "Saving...";
             await _goldberg.Save(dirPath, new GoldbergConfiguration
-                {
+            {
-                    AppId = AppId,
+                AppId = AppId,
-                    DlcList = DLCs.ToList(),
+                Achievements = Achievements.ToList(),
-                    Offline = Offline,
+                DlcList = DLCs.ToList(),
-                    DisableNetworking = DisableNetworking,
+                Offline = Offline,
-                    DisableOverlay = DisableOverlay
+                DisableNetworking = DisableNetworking,
-                }
+                DisableOverlay = DisableOverlay
+            }
             ).ConfigureAwait(false);
             GoldbergApplied = _goldberg.GoldbergApplied(dirPath);
             MainWindowEnabled = true;
@@ -478,13 +517,15 @@ namespace GoldbergGUI.Core.ViewModels
             {
                 var result = Clipboard.GetText();
                 var expression = new Regex(@"(?<id>.*) *= *(?<name>.*)");
-                var pastedDlc = (from line in result.Split(new[] {"\n", "\r\n"},
+                var pastedDlc = (from line in result.Split(new[] { "\n", "\r\n" },
-                    StringSplitOptions.RemoveEmptyEntries) select expression.Match(line) into match
+                    StringSplitOptions.RemoveEmptyEntries)
-                    where match.Success select new DlcApp
+                                 select expression.Match(line) into match
-                    {
+                                 where match.Success
-                        AppId = Convert.ToInt32(match.Groups["id"].Value), 
+                                 select new DlcApp
-                        Name = match.Groups["name"].Value
+                                 {
-                    }).ToList();
+                                     AppId = Convert.ToInt32(match.Groups["id"].Value),
+                                     Name = match.Groups["name"].Value
+                                 }).ToList();
                 if (pastedDlc.Count > 0)
                 {
                     DLCs.Clear();
@@ -524,6 +565,7 @@ namespace GoldbergGUI.Core.ViewModels
             DllPath = "Path to game's steam_api(64).dll...";
             GameName = "Game name...";
             AppId = -1;
+            Achievements = new ObservableCollection<Achievement>();
             DLCs = new ObservableCollection<DlcApp>();
             AccountName = "Account name...";
             SteamId = -1;
@@ -544,6 +586,7 @@ namespace GoldbergGUI.Core.ViewModels
         private void SetFormFromConfig(GoldbergConfiguration config)
         {
             AppId = config.AppId;
+            Achievements = new ObservableCollection<Achievement>(config.Achievements);
             DLCs = new ObservableCollection<DlcApp>(config.DlcList);
             Offline = config.Offline;
             DisableNetworking = config.DisableNetworking;

GoldbergGUI.Core/ViewModels/SearchResultViewModel.cs

@@ -1,10 +1,10 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using GoldbergGUI.Core.Models;
 using MvvmCross.Commands;
 using MvvmCross.Logging;
 using MvvmCross.Navigation;
 using MvvmCross.ViewModels;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace GoldbergGUI.Core.ViewModels
 {

GoldbergGUI.WPF/App.xaml.cs

@@ -1,5 +1,4 @@
 using MvvmCross.Core;
-using MvvmCross.Platforms.Wpf.Core;
 using MvvmCross.Platforms.Wpf.Views;
 
 namespace GoldbergGUI.WPF

GoldbergGUI.WPF/AssemblyInfo.cs

@@ -2,9 +2,9 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page,
+                                     //(used if a resource is not found in the page,
-    // or application resource dictionaries)
+                                     // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page,
+                                              //(used if a resource is not found in the page,
-    // app, or any theme specific resource dictionaries)
+                                              // app, or any theme specific resource dictionaries)
 )]

GoldbergGUI.WPF/GoldbergGUI.WPF.csproj

@@ -2,10 +2,11 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
-    <FileVersion>0.2.0</FileVersion>
+    <FileVersion>0.3.0</FileVersion>
     <Company>Jeddunk</Company>
+    <Platforms>AnyCPU;x86;x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>

GoldbergGUI.WPF/Setup.cs

@@ -1,10 +1,7 @@
-using System;
-using System.IO;
-using System.Windows.Controls;
-using System.Windows.Threading;
 using MvvmCross.Logging;
 using MvvmCross.Platforms.Wpf.Core;
 using Serilog;
+using System.IO;
 
 namespace GoldbergGUI.WPF
 {
@@ -14,7 +11,7 @@ namespace GoldbergGUI.WPF
 
         protected override IMvxLogProvider CreateLogProvider()
         {
-            var logPath = Path.Combine(Directory.GetCurrentDirectory(),"goldberg_.log");
+            var logPath = Path.Combine(Directory.GetCurrentDirectory(), "goldberg_.log");
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
                 .WriteTo.Console()

GoldbergGUI.WPF/Views/MainView.xaml

@@ -32,7 +32,7 @@
                     <Grid Margin="10,20,10,10">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto" MaxHeight="0"/>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition/>
                         </Grid.RowDefinitions>
@@ -42,33 +42,71 @@
                         <TextBox Text="{Binding GameName, Mode=TwoWay}" TextWrapping="Wrap" VerticalAlignment="Center" Padding="1,0,0,0" Grid.Row="2" Margin="0,5,215,5" Height="20"/>
                         <Button Content="_Find ID..." Command="{Binding FindIdCommand}" Width="80" Grid.Row="2" Margin="0,5,130,5" HorizontalAlignment="Right" Height="20"/>
                         <TextBox Text="{Binding AppId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" HorizontalAlignment="Right" VerticalAlignment="Center" Padding="1,0,0,0" Grid.Row="2" Width="125" Margin="0,5,0,5" Height="20"/>
-                        <GroupBox Header="DLC" Grid.Row="3" Padding="0,0,0,0" Margin="0,5,0,0">
+                        <TabControl Grid.Row="3" Margin="0,5,0,0" Padding="0,0,0,0">
-                            <GroupBox.InputBindings>
+                            <TabItem Header="DLC">
-                                <KeyBinding Key="V" Modifiers="Control" 
+                                <TabItem.InputBindings>
-                                    Command="{Binding PasteDlcCommand}"/>
+                                    <KeyBinding Key="V" Modifiers="Control" Command="{Binding PasteDlcCommand}"/>
-                            </GroupBox.InputBindings>
+                                </TabItem.InputBindings>
-                            <Grid Margin="10,10,10,10">
+                                <Grid Margin="10,10,10,10">
-                                <Grid.RowDefinitions>
+                                    <Grid.RowDefinitions>
-                                    <RowDefinition/>
+                                        <RowDefinition/>
-                                    <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
+                                    </Grid.RowDefinitions>
-                                <DataGrid Margin="0,0,0,5" ItemsSource="{Binding DLCs, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" SelectionMode="Extended" SelectionUnit="FullRow" HeadersVisibility="Column" AutoGenerateColumns="False" CanUserResizeColumns="False">
+                                    <DataGrid Margin="0,0,0,5" ItemsSource="{Binding DLCs, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" SelectionMode="Extended" SelectionUnit="FullRow" HeadersVisibility="Column" AutoGenerateColumns="False" CanUserResizeColumns="False">
-                                    <DataGrid.Columns>
+                                        <DataGrid.Columns>
-                                        <DataGridTextColumn Header="App ID" Binding="{Binding AppId}" Width="80" />
+                                            <DataGridTextColumn Header="App ID" Binding="{Binding AppId}" Width="80" />
-                                        <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="*" />
+                                            <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="*" />
-                                        <!--<DataGridTextColumn Header="Depot ID" Binding="{Binding DepotId}" Width="80" Visibility="{Binding Source={x:Reference ShowOptionalDlcSettings}, Path=IsChecked, Converter={StaticResource B2V}}"/>
+                                            <!--<DataGridTextColumn Header="Depot ID" Binding="{Binding DepotId}" Width="80" Visibility="{Binding Source={x:Reference ShowOptionalDlcSettings}, Path=IsChecked, Converter={StaticResource B2V}}"/>
-                                        <DataGridTextColumn Header="Depot Name" Binding="{Binding DepotName}" Width="*" Visibility="{Binding Source={x:Reference ShowOptionalDlcSettings}, Path=IsChecked, Converter={StaticResource B2V}}" />-->
+                                            <DataGridTextColumn Header="Depot Name" Binding="{Binding DepotName}" Width="*" Visibility="{Binding Source={x:Reference ShowOptionalDlcSettings}, Path=IsChecked, Converter={StaticResource B2V}}" />-->
-                                        <DataGridTextColumn Header="App Path" Binding="{Binding AppPath}" Width="*" Visibility="{Binding Source={x:Reference ShowOptionalDlcSettings}, Path=IsChecked, Converter={StaticResource B2V}}" />
+                                            <DataGridTextColumn Header="App Path" Binding="{Binding AppPath}" Width="*" Visibility="{Binding Source={x:Reference ShowOptionalDlcSettings}, Path=IsChecked, Converter={StaticResource B2V}}" />
-                                    </DataGrid.Columns>
+                                        </DataGrid.Columns>
-                                </DataGrid>
+                                    </DataGrid>
-                                <CheckBox Grid.Row="1" x:Name="ShowOptionalDlcSettings" Margin="0,5,0,0" Content="Show optional settings"/>
+                                    <Grid Grid.Row="1">
-                                <Button Content="Get _DLCs for AppID" Command="{Binding GetListOfDlcCommand}" Grid.Row="1" Width="120" HorizontalAlignment="Right" Margin="0,5,0,0" Height="20"/>
+                                        <Grid.ColumnDefinitions>
-                            </Grid>
+                                            <ColumnDefinition Width="*" />
-                        </GroupBox>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <CheckBox x:Name="ShowOptionalDlcSettings" Margin="0,5,0,0" Content="Show optional settings"/>
+                                        <Button Grid.Column="2" Content="Get _DLCs for AppID" Command="{Binding GetListOfDlcCommand}" HorizontalAlignment="Right" Margin="0,5,0,0" Height="20" Width="117"/>
+                                    </Grid>
+                                </Grid>
+                            </TabItem>
+                            <TabItem Header="Achievements" IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}">
+                                <Grid Margin="10,10,10,10">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <DataGrid Margin="0,0,0,5" ItemsSource="{Binding Achievements, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" SelectionMode="Extended" SelectionUnit="FullRow" HeadersVisibility="Column" AutoGenerateColumns="False" CanUserResizeColumns="True" IsReadOnly="True">
+                                        <DataGrid.Columns>
+                                            <DataGridTextColumn Header="Name" Binding="{Binding DisplayName}" Width="*"/>
+                                            <DataGridTextColumn Header="Description" Binding="{Binding Description}" Width="*"/>
+                                            <DataGridCheckBoxColumn Header="Hidden" Binding="{Binding Hidden}" Width="60" CanUserResize="False"/>
+                                        </DataGrid.Columns>
+                                    </DataGrid>
+                                    <Grid Grid.Row="1">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <Button Grid.Row="1" Grid.Column="1" Content="Get _Achievements for AppID" Command="{Binding GetListOfAchievementsCommand}" Margin="0,5,0,0" HorizontalAlignment="Right" Width="165" />
+                                    </Grid>
+                                </Grid>
+                            </TabItem>
+                            <TabItem Header="Misc" IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}">
+                                <StackPanel Margin="10,10,10,10">
+                                    <Button Content="_Generate steam__interfaces.txt" IsEnabled="{Binding SteamInterfacesTxtExists, UpdateSourceTrigger=PropertyChanged}" Command="{Binding GenerateSteamInterfacesCommand}" Height="20" Margin="0,0,0,5" />
+                                    <CheckBox Content="Offline" IsChecked="{Binding Offline, Mode=TwoWay}" Height="20" VerticalAlignment="Stretch" VerticalContentAlignment="Center"/>
+                                    <CheckBox Content="Disable Networking" IsChecked="{Binding DisableNetworking, Mode=TwoWay}" Height="20" VerticalContentAlignment="Center"/>
+                                    <CheckBox Content="Disable Overlay" IsChecked="{Binding DisableOverlay, Mode=TwoWay}" Height="20" VerticalContentAlignment="Center" IsEnabled="False"/>
+                                </StackPanel>
+                            </TabItem>
+                        </TabControl>
                     </Grid>
                 </TabItem>
                 <!-- Advanced -->
-                <TabItem Header="Advanced" IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}">
+                <!--<TabItem Header="Advanced" IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}">
                     <Grid HorizontalAlignment="Stretch" Margin="10,20,10,10" >
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
@@ -94,7 +132,7 @@
                             </StackPanel>
                         </GroupBox>
                     </Grid>
-                </TabItem>
+                </TabItem>-->
                 <!-- Settings -->
                 <TabItem Header="Global Settings">
                     <StackPanel Margin="10,20,10,10">
@@ -117,7 +155,7 @@
                             <CheckBox Content="Global" Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right" 
                                       Margin="10,0,5,0" VerticalAlignment="Center" IsChecked="True" 
                                       IsEnabled="False"/>
-                                      <!--
+                            <!--
                                       IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}"/>
                                       -->
                             <Label Content="Steam64ID" HorizontalAlignment="Left" Grid.Row="1"
@@ -126,7 +164,7 @@
                             <CheckBox Content="Global" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Right" 
                                       Margin="10,0,5,0" VerticalAlignment="Center" IsChecked="True" 
                                       IsEnabled="False"/>
-                                      <!--
+                            <!--
                                       IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}"/>
                                       -->
                             <Label Content="Language" HorizontalAlignment="Left" Grid.Row="2"
@@ -135,7 +173,7 @@
                             <CheckBox Content="Global" Grid.Row="2" Grid.Column="2" HorizontalAlignment="Right" 
                                       Margin="10,0,5,0" VerticalAlignment="Center" IsChecked="True" 
                                       IsEnabled="False"/>
-                                      <!--
+                            <!--
                                       IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}"/>
                                       -->
                             <Label Content="Custom Broadcast Addresses:" HorizontalAlignment="Left"
@@ -170,6 +208,8 @@
                                         <TextBlock Text="Developed by Jeddunk" />
                                         <TextBlock Text="Licensed under GNU GPLv3" />
                                         <TextBlock Text="Goldberg Emulator is owned by Mr. Goldberg and licensed under GNU LGPLv3" Margin="0,10,0,0"/>
+                                        <TextBlock Text="Contributors:" Margin="0,10,0,0" FontWeight="Bold"/>
+                                        <TextBlock Text="UrbanCMC" Margin="0,5,0,0"/>
                                     </StackPanel>
                                 </DataTemplate>
                             </Label.ContentTemplate>

GoldbergGUI.sln

@@ -1,26 +1,52 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 17
-VisualStudioVersion = 16.0.30717.126
+VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoldbergGUI.Core", "GoldbergGUI.Core\GoldbergGUI.Core.csproj", "{FB205F05-83DE-4D87-8CE2-F7DA320944FD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GoldbergGUI.Core", "GoldbergGUI.Core\GoldbergGUI.Core.csproj", "{FB205F05-83DE-4D87-8CE2-F7DA320944FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoldbergGUI.WPF", "GoldbergGUI.WPF\GoldbergGUI.WPF.csproj", "{84ED15D3-725C-43B1-B8C7-51759CAABBAA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GoldbergGUI.WPF", "GoldbergGUI.WPF\GoldbergGUI.WPF.csproj", "{84ED15D3-725C-43B1-B8C7-51759CAABBAA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E7DA860-D7FD-4090-B7EC-6DA3974DC845}"
+	ProjectSection(SolutionItems) = preProject
+		COPYING = COPYING
+		README.md = README.md
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|x64.ActiveCfg = Debug|x64
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|x64.Build.0 = Debug|x64
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|x86.ActiveCfg = Debug|x86
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|x86.Build.0 = Debug|x86
 		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|x64.ActiveCfg = Release|x64
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|x64.Build.0 = Release|x64
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|x86.ActiveCfg = Release|x86
+		{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|x86.Build.0 = Release|x86
 		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|x64.Build.0 = Debug|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|x86.ActiveCfg = Debug|x86
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|x86.Build.0 = Debug|x86
 		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|x64.ActiveCfg = Release|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|x64.Build.0 = Release|Any CPU
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|x86.ActiveCfg = Release|x86
+		{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

README.md

@@ -30,7 +30,7 @@ While the most used options are available right now, I am planning to support al
 * Subscribed Groups
 * Mods (Steam Workshop)
 * Inventory and Items
-* Achievements
+* ~~Achievements~~
 * Stats, Leaderboards
 * Controller (Steam Input)
 
@@ -40,8 +40,20 @@ Apart from those, I'm also always looking into improving the user experience of
 
 Goldberg Emulator is owned by Mr. Goldberg and licensed under the GNU Lesser General Public License v3.0.
 
+### Contributors
+
+* [UrbanCMC](https://github.com/UrbanCMC/) - Implementation of achievements
+
+### Dependencies
+
+* AngleSharp
+* MvvmCross
+* NinjaNye
+* Serilog
+* SharpCompress
+* sqlite-net-pcl
+* My fork of SteamStorefrontAPI
+
 ## License
 
 GoldbergGUI is licensed under the GNU General Public License v3.0.
-
-Dependencies will be listed ASAP.