jeddunk/GoldbergGUI
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 5 Wiki Activity

Compare commits

base: jeddunk:master
Branches Tags
jeddunk:master
jeddunk:dev
jeddunk:achievement-support
jeddunk:fix-dlc-issue-steamstorefrontapi
jeddunk:0.3.0
jeddunk:0.2.0
jeddunk:0.1.2
jeddunk:0.1.1
jeddunk:0.1.0
..
compare: jeddunk:0be8f4ad8cc7dfdf6f9d1b4af79ce4ca1330d6d3
Branches Tags
jeddunk:master
jeddunk:dev
jeddunk:achievement-support
jeddunk:fix-dlc-issue-steamstorefrontapi
jeddunk:0.3.0
jeddunk:0.2.0
jeddunk:0.1.2
jeddunk:0.1.1
jeddunk:0.1.0

No commits in common. "master" and "0be8f4ad8cc7dfdf6f9d1b4af79ce4ca1330d6d3" have entirely different histories.
master ... 0be8f4ad8c

17 changed files with 150 additions and 390 deletions
Show Stats Expand all files Collapse all files

3
.gitmodules vendored
View File

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

43
GoldbergGUI.Core/GoldbergGUI.Core.csproj
View File

@ -1,28 +1,27 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<FileVersion>0.3.0</FileVersion> <FileVersion>0.2.0</FileVersion>
<Company>Jeddunk</Company> <Company>Jeddunk</Company>
<Platforms>AnyCPU;x86;x64</Platforms> </PropertyGroup>
</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.35.0" /> <PackageReference Include="SharpCompress" Version="0.26.0" />
<PackageReference Include="sqlite-net-pcl" Version="1.7.335" /> <PackageReference Include="sqlite-net-pcl" Version="1.7.335" />
<PackageReference Include="SteamStorefrontAPI" Version="2.0.1.421" /> <PackageReference Include="SteamStorefrontAPI.NETStandard" Version="1.0.0" />
</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> </Project>

46
GoldbergGUI.Core/Models/GoldbergModel.cs
View File

@ -35,21 +35,21 @@ namespace GoldbergGUI.Core.Models
/// List of DLC /// List of DLC
/// </summary> /// </summary>
public List<DlcApp> DlcList { get; set; } public List<DlcApp> DlcList { get; set; }
public List<int> Depots { get; set; } public List<int> Depots { get; set; }
public List<Group> SubscribedGroups { get; set; } public List<Group> SubscribedGroups { get; set; }
//public List<AppPath> AppPaths { get; set; } //public List<AppPath> AppPaths { get; set; }
public List<Achievement> Achievements { get; set; } public List<Achievement> Achievements { get; set; }
public List<Item> Items { get; set; } public List<Item> Items { get; set; }
public List<Leaderboard> Leaderboards { get; set; } public List<Leaderboard> Leaderboards { get; set; }
public List<Stat> Stats { get; set; } public List<Stat> Stats { get; set; }
// Add controller setting here! // Add controller setting here!
/// <summary> /// <summary>
/// Set offline mode. /// Set offline mode.
@ -63,24 +63,12 @@ namespace GoldbergGUI.Core.Models
/// Disable overlay (experimental only). /// Disable overlay (experimental only).
/// </summary> /// </summary>
public bool DisableOverlay { get; set; } public bool DisableOverlay { get; set; }
public GoldbergGlobalConfiguration OverwrittenGlobalConfiguration { get; set; } public GoldbergGlobalConfiguration OverwrittenGlobalConfiguration { get; set; }
} }
public class DlcApp : SteamApp 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> /// <summary>
/// Path to DLC (relative to Steam API DLL) (optional) /// Path to DLC (relative to Steam API DLL) (optional)
/// </summary> /// </summary>
@ -109,40 +97,40 @@ namespace GoldbergGUI.Core.Models
/// Achievement description. /// Achievement description.
/// </summary> /// </summary>
[JsonPropertyName("description")] [JsonPropertyName("description")]
public string Description { get; set; } public string Description { get; set; }
/// <summary> /// <summary>
/// Human readable name, as shown on webpage, game library, overlay, etc. /// Human readable name, as shown on webpage, game library, overlay, etc.
/// </summary> /// </summary>
[JsonPropertyName("displayName")] [JsonPropertyName("displayName")]
public string DisplayName { get; set; } public string DisplayName { get; set; }
/// <summary> /// <summary>
/// Is achievement hidden? 0 = false, else true. /// Is achievement hidden? 0 = false, else true.
/// </summary> /// </summary>
[JsonPropertyName("hidden")] [JsonPropertyName("hidden")]
public int Hidden { get; set; } public int Hidden { get; set; }
/// <summary> /// <summary>
/// Path to icon when unlocked (colored). /// Path to icon when unlocked (colored).
/// </summary> /// </summary>
[JsonPropertyName("icon")] [JsonPropertyName("icon")]
public string Icon { get; set; } public string Icon { get; set; }
/// <summary> /// <summary>
/// Path to icon when locked (grayed out). /// Path to icon when locked (grayed out).
/// </summary> /// </summary>
// ReSharper disable once StringLiteralTypo // ReSharper disable once StringLiteralTypo
[JsonPropertyName("icongray")] [JsonPropertyName("icongray")]
public string IconGray { get; set; } public string IconGray { get; set; }
/// <summary> /// <summary>
/// Internal name. /// Internal name.
/// </summary> /// </summary>
[JsonPropertyName("name")] [JsonPropertyName("name")]
public string Name { get; set; } public string Name { get; set; }
} }
public class Item public class Item
{ {
[JsonPropertyName("Timestamp")] [JsonPropertyName("Timestamp")]

4
GoldbergGUI.Core/Models/SteamAppModel.cs
View File

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

93
GoldbergGUI.Core/Services/GoldbergService.cs
View File

@ -1,6 +1,3 @@
using GoldbergGUI.Core.Models;
using GoldbergGUI.Core.Utils;
using MvvmCross.Logging;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@ -10,6 +7,9 @@ using System.Net.Http;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using GoldbergGUI.Core.Models;
using GoldbergGUI.Core.Utils;
using MvvmCross.Logging;
namespace GoldbergGUI.Core.Services namespace GoldbergGUI.Core.Services
{ {
@ -208,7 +208,6 @@ namespace GoldbergGUI.Core.Services
{ {
_log.Info("Reading configuration..."); _log.Info("Reading configuration...");
var appId = -1; var appId = -1;
var achievementList = new List<Achievement>();
var dlcList = new List<DlcApp>(); var dlcList = new List<DlcApp>();
var steamAppidTxt = Path.Combine(path, "steam_appid.txt"); var steamAppidTxt = Path.Combine(path, "steam_appid.txt");
if (File.Exists(steamAppidTxt)) if (File.Exists(steamAppidTxt))
@ -222,19 +221,6 @@ namespace GoldbergGUI.Core.Services
_log.Info(@"""steam_appid.txt"" missing! Skipping..."); _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 dlcTxt = Path.Combine(path, "steam_settings", "DLC.txt");
var appPathTxt = Path.Combine(path, "steam_settings", "app_paths.txt"); var appPathTxt = Path.Combine(path, "steam_settings", "app_paths.txt");
if (File.Exists(dlcTxt)) if (File.Exists(dlcTxt))
@ -263,7 +249,7 @@ namespace GoldbergGUI.Core.Services
{ {
var match = appPathExpression.Match(line); var match = appPathExpression.Match(line);
if (!match.Success) continue; if (!match.Success) continue;
var i = dlcList.FindIndex(x => var i = dlcList.FindIndex(x =>
x.AppId.Equals(Convert.ToInt32(match.Groups["id"].Value))); x.AppId.Equals(Convert.ToInt32(match.Groups["id"].Value)));
dlcList[i].AppPath = match.Groups["appPath"].Value; dlcList[i].AppPath = match.Groups["appPath"].Value;
} }
@ -277,7 +263,6 @@ namespace GoldbergGUI.Core.Services
return new GoldbergConfiguration return new GoldbergConfiguration
{ {
AppId = appId, AppId = appId,
Achievements = achievementList,
DlcList = dlcList, DlcList = dlcList,
Offline = File.Exists(Path.Combine(path, "steam_settings", "offline.txt")), Offline = File.Exists(Path.Combine(path, "steam_settings", "offline.txt")),
DisableNetworking = File.Exists(Path.Combine(path, "steam_settings", "disable_networking.txt")), DisableNetworking = File.Exists(Path.Combine(path, "steam_settings", "disable_networking.txt")),
@ -318,53 +303,6 @@ namespace GoldbergGUI.Core.Services
await File.WriteAllTextAsync(Path.Combine(path, "steam_appid.txt"), c.AppId.ToString()) await File.WriteAllTextAsync(Path.Combine(path, "steam_appid.txt"), c.AppId.ToString())
.ConfigureAwait(false); .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 // DLC + App path
if (c.DlcList.Count > 0) if (c.DlcList.Count > 0)
{ {
@ -381,14 +319,14 @@ namespace GoldbergGUI.Core.Services
}); });
await File.WriteAllTextAsync(Path.Combine(path, "steam_settings", "DLC.txt"), dlcContent) await File.WriteAllTextAsync(Path.Combine(path, "steam_settings", "DLC.txt"), dlcContent)
.ConfigureAwait(false); .ConfigureAwait(false);
/*if (!string.IsNullOrEmpty(depotContent)) /*if (!string.IsNullOrEmpty(depotContent))
{ {
await File.WriteAllTextAsync(Path.Combine(path, "steam_settings", "depots.txt"), depotContent) await File.WriteAllTextAsync(Path.Combine(path, "steam_settings", "depots.txt"), depotContent)
.ConfigureAwait(false); .ConfigureAwait(false);
}*/ }*/
if (!string.IsNullOrEmpty(appPathContent)) if (!string.IsNullOrEmpty(appPathContent))
{ {
await File.WriteAllTextAsync(Path.Combine(path, "steam_settings", "app_paths.txt"), appPathContent) await File.WriteAllTextAsync(Path.Combine(path, "steam_settings", "app_paths.txt"), appPathContent)
@ -683,22 +621,5 @@ namespace GoldbergGUI.Core.Services
return success; 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);
}
} }
} }

62
GoldbergGUI.Core/Services/SteamService.cs
View File

@ -1,3 +1,10 @@
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.Dom;
using AngleSharp.Html.Parser; using AngleSharp.Html.Parser;
using GoldbergGUI.Core.Models; using GoldbergGUI.Core.Models;
@ -6,13 +13,6 @@ using MvvmCross.Logging;
using NinjaNye.SearchExtensions; using NinjaNye.SearchExtensions;
using SQLite; using SQLite;
using SteamStorefrontAPI; 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 namespace GoldbergGUI.Core.Services
{ {
@ -23,7 +23,6 @@ namespace GoldbergGUI.Core.Services
public Task<IEnumerable<SteamApp>> GetListOfAppsByName(string name); public Task<IEnumerable<SteamApp>> GetListOfAppsByName(string name);
public Task<SteamApp> GetAppByName(string name); public Task<SteamApp> GetAppByName(string name);
public Task<SteamApp> GetAppById(int appid); public Task<SteamApp> GetAppById(int appid);
public Task<List<Achievement>> GetListOfAchievements(SteamApp steamApp);
public Task<List<DlcApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb); public Task<List<DlcApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb);
} }
@ -82,7 +81,6 @@ namespace GoldbergGUI.Core.Services
private const string AppTypeGame = "game"; private const string AppTypeGame = "game";
private const string AppTypeDlc = "dlc"; private const string AppTypeDlc = "dlc";
private const string Database = "steamapps.cache"; private const string Database = "steamapps.cache";
private const string GameSchemaUrl = "https://api.steampowered.com/ISteamUserStats/GetSchemaForGame/v2/";
private IMvxLog _log; private IMvxLog _log;
@ -93,7 +91,7 @@ namespace GoldbergGUI.Core.Services
static SteamApps DeserializeSteamApps(Type type, string cacheString) static SteamApps DeserializeSteamApps(Type type, string cacheString)
{ {
return type == typeof(SteamAppsV2) return type == typeof(SteamAppsV2)
? (SteamApps)JsonSerializer.Deserialize<SteamAppsV2>(cacheString) ? (SteamApps) JsonSerializer.Deserialize<SteamAppsV2>(cacheString)
: JsonSerializer.Deserialize<SteamAppsV1>(cacheString); : JsonSerializer.Deserialize<SteamAppsV1>(cacheString);
} }
@ -130,7 +128,7 @@ namespace GoldbergGUI.Core.Services
var cache = new HashSet<SteamApp>(); var cache = new HashSet<SteamApp>();
foreach (var steamApp in cacheRaw) foreach (var steamApp in cacheRaw)
{ {
steamApp.AppType = steamCache.SteamAppType; steamApp.type = steamCache.SteamAppType;
steamApp.ComparableName = PrepareStringToCompare(steamApp.Name); steamApp.ComparableName = PrepareStringToCompare(steamApp.Name);
cache.Add(steamApp); cache.Add(steamApp);
} }
@ -143,7 +141,7 @@ namespace GoldbergGUI.Core.Services
public async Task<IEnumerable<SteamApp>> GetListOfAppsByName(string name) public async Task<IEnumerable<SteamApp>> GetListOfAppsByName(string name)
{ {
var query = await _db.Table<SteamApp>() var query = await _db.Table<SteamApp>()
.Where(x => x.AppType == AppTypeGame).ToListAsync().ConfigureAwait(false); .Where(x => x.type == AppTypeGame).ToListAsync().ConfigureAwait(false);
var listOfAppsByName = query.Search(x => x.Name) var listOfAppsByName = query.Search(x => x.Name)
.SetCulture(StringComparison.OrdinalIgnoreCase) .SetCulture(StringComparison.OrdinalIgnoreCase)
.ContainingAll(name.Split(' ')); .ContainingAll(name.Split(' '));
@ -155,7 +153,7 @@ namespace GoldbergGUI.Core.Services
_log.Info($"Trying to get app {name}"); _log.Info($"Trying to get app {name}");
var comparableName = PrepareStringToCompare(name); var comparableName = PrepareStringToCompare(name);
var app = await _db.Table<SteamApp>() var app = await _db.Table<SteamApp>()
.FirstOrDefaultAsync(x => x.AppType == AppTypeGame && x.ComparableName.Equals(comparableName)) .FirstOrDefaultAsync(x => x.type == AppTypeGame && x.ComparableName.Equals(comparableName))
.ConfigureAwait(false); .ConfigureAwait(false);
if (app != null) _log.Info($"Successfully got app {app}"); if (app != null) _log.Info($"Successfully got app {app}");
return app; return app;
@ -164,38 +162,12 @@ namespace GoldbergGUI.Core.Services
public async Task<SteamApp> GetAppById(int appid) public async Task<SteamApp> GetAppById(int appid)
{ {
_log.Info($"Trying to get app with ID {appid}"); _log.Info($"Trying to get app with ID {appid}");
var app = await _db.Table<SteamApp>().Where(x => x.AppType == AppTypeGame) var app = await _db.Table<SteamApp>().Where(x => x.type == AppTypeGame)
.FirstOrDefaultAsync(x => x.AppId.Equals(appid)).ConfigureAwait(false); .FirstOrDefaultAsync(x => x.AppId.Equals(appid)).ConfigureAwait(false);
if (app != null) _log.Info($"Successfully got app {app}"); if (app != null) _log.Info($"Successfully got app {app}");
return 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) public async Task<List<DlcApp>> GetListOfDlc(SteamApp steamApp, bool useSteamDb)
{ {
var dlcList = new List<DlcApp>(); var dlcList = new List<DlcApp>();
@ -208,10 +180,10 @@ namespace GoldbergGUI.Core.Services
{ {
steamAppDetails.DLC.ForEach(async x => steamAppDetails.DLC.ForEach(async x =>
{ {
var result = await _db.Table<SteamApp>().Where(z => z.AppType == AppTypeDlc) var result = await _db.Table<DlcApp>().Where(z => z.type == AppTypeDlc)
.FirstOrDefaultAsync(y => y.AppId.Equals(x)).ConfigureAwait(true) .FirstOrDefaultAsync(y => y.AppId.Equals(x)).ConfigureAwait(true)
?? new SteamApp() { AppId = x, Name = $"Unknown DLC {x}", ComparableName = $"unknownDlc{x}", AppType = AppTypeDlc }; ?? new DlcApp() {AppId = x, Name = $"Unknown DLC {x}"};
dlcList.Add(new DlcApp(result)); dlcList.Add(result);
_log.Debug($"{result.AppId}={result.Name}"); _log.Debug($"{result.AppId}={result.Name}");
}); });
@ -224,7 +196,7 @@ namespace GoldbergGUI.Core.Services
// Return current list if we don't intend to use SteamDB // Return current list if we don't intend to use SteamDB
if (!useSteamDb) return dlcList; if (!useSteamDb) return dlcList;
try try
{ {
var steamDbUri = new Uri($"https://steamdb.info/app/{steamApp.AppId}/dlc/"); var steamDbUri = new Uri($"https://steamdb.info/app/{steamApp.AppId}/dlc/");
@ -257,7 +229,7 @@ namespace GoldbergGUI.Core.Services
var dlcName = query3 != null var dlcName = query3 != null
? query3[1].Text().Replace("\n", "").Trim() ? query3[1].Text().Replace("\n", "").Trim()
: $"Unknown DLC {dlcId}"; : $"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)); var i = dlcList.FindIndex(x => x.AppId.Equals(dlcApp.AppId));
if (i > -1) if (i > -1)
{ {

3
GoldbergGUI.Core/Utils/CustomMvxAppStart.cs
View File

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

6
GoldbergGUI.Core/Utils/Misc.cs
View File

@ -7,15 +7,15 @@ namespace GoldbergGUI.Core.Utils
public class GlobalHelp public class GlobalHelp
{ {
public static string Header => public static string Header =>
"Information\n"; "Information\n";
public static string TextPreLink => public static string TextPreLink =>
"Usually these settings are saved under"; "Usually these settings are saved under";
public static string Link => "%APPDATA%\\Goldberg SteamEmu Saves\\settings"; public static string Link => "%APPDATA%\\Goldberg SteamEmu Saves\\settings";
public static string TextPostLink => public static string TextPostLink =>
", which makes these " + ", which makes these " +
"available for every game that uses the Goldberg Emulator. However, if you want to set specific settings " + "available for every game that uses the Goldberg Emulator. However, if you want to set specific settings " +
"for certain games (e.g. different language), you can remove the \"Global\" checkmark next to the option " + "for certain games (e.g. different language), you can remove the \"Global\" checkmark next to the option " +

97
GoldbergGUI.Core/ViewModels/MainViewModel.cs
View File

@ -1,12 +1,4 @@
using GoldbergGUI.Core.Models; using System;
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.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Diagnostics; using System.Diagnostics;
@ -17,6 +9,14 @@ using System.Runtime.InteropServices;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; 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 namespace GoldbergGUI.Core.ViewModels
{ {
@ -30,7 +30,6 @@ namespace GoldbergGUI.Core.ViewModels
private int _appId; private int _appId;
//private SteamApp _currentGame; //private SteamApp _currentGame;
private ObservableCollection<Achievement> _achievements;
private ObservableCollection<DlcApp> _dlcs; private ObservableCollection<DlcApp> _dlcs;
private string _accountName; private string _accountName;
private long _steamId; private long _steamId;
@ -143,16 +142,6 @@ namespace GoldbergGUI.Core.ViewModels
} }
} }
public ObservableCollection<Achievement> Achievements
{
get => _achievements;
set
{
_achievements = value;
RaisePropertyChanged(() => Achievements);
}
}
public string AccountName public string AccountName
{ {
get => _accountName; get => _accountName;
@ -275,7 +264,7 @@ namespace GoldbergGUI.Core.ViewModels
public static string AboutVersionText => public static string AboutVersionText =>
FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion; FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion;
public static GlobalHelp G => new GlobalHelp(); public static GlobalHelp G => new GlobalHelp();
// COMMANDS // // COMMANDS //
@ -379,33 +368,6 @@ namespace GoldbergGUI.Core.ViewModels
if (steamApp != null) GameName = steamApp.Name; 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); public IMvxCommand GetListOfDlcCommand => new MvxAsyncCommand(GetListOfDlc);
private async Task GetListOfDlc() private async Task GetListOfDlc()
@ -418,7 +380,7 @@ namespace GoldbergGUI.Core.ViewModels
MainWindowEnabled = false; MainWindowEnabled = false;
StatusText = "Trying to get list of DLCs..."; 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); .ConfigureAwait(false);
DLCs = new MvxObservableCollection<DlcApp>(listOfDlc); DLCs = new MvxObservableCollection<DlcApp>(listOfDlc);
MainWindowEnabled = true; MainWindowEnabled = true;
@ -440,8 +402,8 @@ namespace GoldbergGUI.Core.ViewModels
_log.Info("Saving global settings..."); _log.Info("Saving global settings...");
var globalConfiguration = new GoldbergGlobalConfiguration var globalConfiguration = new GoldbergGlobalConfiguration
{ {
AccountName = AccountName, AccountName = AccountName,
UserSteamId = SteamId, UserSteamId = SteamId,
Language = SelectedLanguage Language = SelectedLanguage
}; };
await _goldberg.SetGlobalSettings(globalConfiguration).ConfigureAwait(false); await _goldberg.SetGlobalSettings(globalConfiguration).ConfigureAwait(false);
@ -452,14 +414,13 @@ namespace GoldbergGUI.Core.ViewModels
MainWindowEnabled = false; MainWindowEnabled = false;
StatusText = "Saving..."; StatusText = "Saving...";
await _goldberg.Save(dirPath, new GoldbergConfiguration await _goldberg.Save(dirPath, new GoldbergConfiguration
{ {
AppId = AppId, AppId = AppId,
Achievements = Achievements.ToList(), DlcList = DLCs.ToList(),
DlcList = DLCs.ToList(), Offline = Offline,
Offline = Offline, DisableNetworking = DisableNetworking,
DisableNetworking = DisableNetworking, DisableOverlay = DisableOverlay
DisableOverlay = DisableOverlay }
}
).ConfigureAwait(false); ).ConfigureAwait(false);
GoldbergApplied = _goldberg.GoldbergApplied(dirPath); GoldbergApplied = _goldberg.GoldbergApplied(dirPath);
MainWindowEnabled = true; MainWindowEnabled = true;
@ -517,15 +478,13 @@ namespace GoldbergGUI.Core.ViewModels
{ {
var result = Clipboard.GetText(); var result = Clipboard.GetText();
var expression = new Regex(@"(?<id>.*) *= *(?<name>.*)"); 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) StringSplitOptions.RemoveEmptyEntries) select expression.Match(line) into match
select expression.Match(line) into match where match.Success select new DlcApp
where match.Success {
select new DlcApp AppId = Convert.ToInt32(match.Groups["id"].Value),
{ Name = match.Groups["name"].Value
AppId = Convert.ToInt32(match.Groups["id"].Value), }).ToList();
Name = match.Groups["name"].Value
}).ToList();
if (pastedDlc.Count > 0) if (pastedDlc.Count > 0)
{ {
DLCs.Clear(); DLCs.Clear();
@ -565,7 +524,6 @@ namespace GoldbergGUI.Core.ViewModels
DllPath = "Path to game's steam_api(64).dll..."; DllPath = "Path to game's steam_api(64).dll...";
GameName = "Game name..."; GameName = "Game name...";
AppId = -1; AppId = -1;
Achievements = new ObservableCollection<Achievement>();
DLCs = new ObservableCollection<DlcApp>(); DLCs = new ObservableCollection<DlcApp>();
AccountName = "Account name..."; AccountName = "Account name...";
SteamId = -1; SteamId = -1;
@ -586,7 +544,6 @@ namespace GoldbergGUI.Core.ViewModels
private void SetFormFromConfig(GoldbergConfiguration config) private void SetFormFromConfig(GoldbergConfiguration config)
{ {
AppId = config.AppId; AppId = config.AppId;
Achievements = new ObservableCollection<Achievement>(config.Achievements);
DLCs = new ObservableCollection<DlcApp>(config.DlcList); DLCs = new ObservableCollection<DlcApp>(config.DlcList);
Offline = config.Offline; Offline = config.Offline;
DisableNetworking = config.DisableNetworking; DisableNetworking = config.DisableNetworking;

10
GoldbergGUI.Core/ViewModels/SearchResultViewModel.cs
View File

@ -1,10 +1,10 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using GoldbergGUI.Core.Models; using GoldbergGUI.Core.Models;
using MvvmCross.Commands; using MvvmCross.Commands;
using MvvmCross.Logging; using MvvmCross.Logging;
using MvvmCross.Navigation; using MvvmCross.Navigation;
using MvvmCross.ViewModels; using MvvmCross.ViewModels;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace GoldbergGUI.Core.ViewModels namespace GoldbergGUI.Core.ViewModels
{ {
@ -14,7 +14,7 @@ namespace GoldbergGUI.Core.ViewModels
private readonly IMvxLog _log; private readonly IMvxLog _log;
private IEnumerable<SteamApp> _apps; private IEnumerable<SteamApp> _apps;
public SearchResultViewModel(IMvxLogProvider logProvider, IMvxNavigationService navigationService) : public SearchResultViewModel(IMvxLogProvider logProvider, IMvxNavigationService navigationService) :
base(logProvider, navigationService) base(logProvider, navigationService)
{ {
_log = logProvider.GetLogFor(typeof(SearchResultViewModel)); _log = logProvider.GetLogFor(typeof(SearchResultViewModel));
@ -25,7 +25,7 @@ namespace GoldbergGUI.Core.ViewModels
{ {
Apps = parameter; Apps = parameter;
} }
public IEnumerable<SteamApp> Apps public IEnumerable<SteamApp> Apps
{ {
get => _apps; get => _apps;
@ -35,7 +35,7 @@ namespace GoldbergGUI.Core.ViewModels
RaisePropertyChanged(() => Apps); RaisePropertyChanged(() => Apps);
} }
} }
public SteamApp Selected public SteamApp Selected
{ {
get; get;

1
GoldbergGUI.WPF/App.xaml.cs
View File

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

8
GoldbergGUI.WPF/AssemblyInfo.cs
View File

@ -2,9 +2,9 @@ using System.Windows;
[assembly: ThemeInfo( [assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located 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 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)
)] )]

5
GoldbergGUI.WPF/GoldbergGUI.WPF.csproj
View File

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

9
GoldbergGUI.WPF/Setup.cs
View File

@ -1,17 +1,20 @@
using System;
using System.IO;
using System.Windows.Controls;
using System.Windows.Threading;
using MvvmCross.Logging; using MvvmCross.Logging;
using MvvmCross.Platforms.Wpf.Core; using MvvmCross.Platforms.Wpf.Core;
using Serilog; using Serilog;
using System.IO;
namespace GoldbergGUI.WPF namespace GoldbergGUI.WPF
{ {
public class Setup : MvxWpfSetup<Core.App> public class Setup : MvxWpfSetup<Core.App>
{ {
public override MvxLogProviderType GetDefaultLogProviderType() => MvxLogProviderType.Serilog; public override MvxLogProviderType GetDefaultLogProviderType() => MvxLogProviderType.Serilog;
protected override IMvxLogProvider CreateLogProvider() protected override IMvxLogProvider CreateLogProvider()
{ {
var logPath = Path.Combine(Directory.GetCurrentDirectory(), "goldberg_.log"); var logPath = Path.Combine(Directory.GetCurrentDirectory(),"goldberg_.log");
Log.Logger = new LoggerConfiguration() Log.Logger = new LoggerConfiguration()
.MinimumLevel.Debug() .MinimumLevel.Debug()
.WriteTo.Console() .WriteTo.Console()

98
GoldbergGUI.WPF/Views/MainView.xaml
View File

@ -32,7 +32,7 @@
<Grid Margin="10,20,10,10"> <Grid Margin="10,20,10,10">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="Auto" MaxHeight="0"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
@ -42,71 +42,33 @@
<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"/> <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"/> <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"/> <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"/>
<TabControl Grid.Row="3" Margin="0,5,0,0" Padding="0,0,0,0"> <GroupBox Header="DLC" Grid.Row="3" Padding="0,0,0,0" Margin="0,5,0,0">
<TabItem Header="DLC"> <GroupBox.InputBindings>
<TabItem.InputBindings> <KeyBinding Key="V" Modifiers="Control"
<KeyBinding Key="V" Modifiers="Control" Command="{Binding PasteDlcCommand}"/> Command="{Binding PasteDlcCommand}"/>
</TabItem.InputBindings> </GroupBox.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>
<Grid Grid.Row="1"> <CheckBox Grid.Row="1" x:Name="ShowOptionalDlcSettings" Margin="0,5,0,0" Content="Show optional settings"/>
<Grid.ColumnDefinitions> <Button Content="Get _DLCs for AppID" Command="{Binding GetListOfDlcCommand}" Grid.Row="1" Width="120" HorizontalAlignment="Right" Margin="0,5,0,0" Height="20"/>
<ColumnDefinition Width="*" /> </Grid>
<ColumnDefinition Width="Auto" /> </GroupBox>
<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> </Grid>
</TabItem> </TabItem>
<!-- Advanced --> <!-- 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 HorizontalAlignment="Stretch" Margin="10,20,10,10" >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
@ -132,7 +94,7 @@
</StackPanel> </StackPanel>
</GroupBox> </GroupBox>
</Grid> </Grid>
</TabItem>--> </TabItem>
<!-- Settings --> <!-- Settings -->
<TabItem Header="Global Settings"> <TabItem Header="Global Settings">
<StackPanel Margin="10,20,10,10"> <StackPanel Margin="10,20,10,10">
@ -155,7 +117,7 @@
<CheckBox Content="Global" Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right" <CheckBox Content="Global" Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right"
Margin="10,0,5,0" VerticalAlignment="Center" IsChecked="True" Margin="10,0,5,0" VerticalAlignment="Center" IsChecked="True"
IsEnabled="False"/> IsEnabled="False"/>
<!-- <!--
IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}"/> IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}"/>
--> -->
<Label Content="Steam64ID" HorizontalAlignment="Left" Grid.Row="1" <Label Content="Steam64ID" HorizontalAlignment="Left" Grid.Row="1"
@ -164,7 +126,7 @@
<CheckBox Content="Global" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Right" <CheckBox Content="Global" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Right"
Margin="10,0,5,0" VerticalAlignment="Center" IsChecked="True" Margin="10,0,5,0" VerticalAlignment="Center" IsChecked="True"
IsEnabled="False"/> IsEnabled="False"/>
<!-- <!--
IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}"/> IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}"/>
--> -->
<Label Content="Language" HorizontalAlignment="Left" Grid.Row="2" <Label Content="Language" HorizontalAlignment="Left" Grid.Row="2"
@ -173,7 +135,7 @@
<CheckBox Content="Global" Grid.Row="2" Grid.Column="2" HorizontalAlignment="Right" <CheckBox Content="Global" Grid.Row="2" Grid.Column="2" HorizontalAlignment="Right"
Margin="10,0,5,0" VerticalAlignment="Center" IsChecked="True" Margin="10,0,5,0" VerticalAlignment="Center" IsChecked="True"
IsEnabled="False"/> IsEnabled="False"/>
<!-- <!--
IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}"/> IsEnabled="{Binding DllSelected, UpdateSourceTrigger=PropertyChanged}"/>
--> -->
<Label Content="Custom Broadcast Addresses:" HorizontalAlignment="Left" <Label Content="Custom Broadcast Addresses:" HorizontalAlignment="Left"
@ -208,8 +170,6 @@
<TextBlock Text="Developed by Jeddunk" /> <TextBlock Text="Developed by Jeddunk" />
<TextBlock Text="Licensed under GNU GPLv3" /> <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="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> </StackPanel>
</DataTemplate> </DataTemplate>
</Label.ContentTemplate> </Label.ContentTemplate>

34
GoldbergGUI.sln
View File

@ -1,52 +1,26 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio Version 16
VisualStudioVersion = 17.0.32112.339 VisualStudioVersion = 16.0.30717.126
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GoldbergGUI.Core", "GoldbergGUI.Core\GoldbergGUI.Core.csproj", "{FB205F05-83DE-4D87-8CE2-F7DA320944FD}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoldbergGUI.Core", "GoldbergGUI.Core\GoldbergGUI.Core.csproj", "{FB205F05-83DE-4D87-8CE2-F7DA320944FD}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GoldbergGUI.WPF", "GoldbergGUI.WPF\GoldbergGUI.WPF.csproj", "{84ED15D3-725C-43B1-B8C7-51759CAABBAA}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {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|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.ActiveCfg = Release|Any CPU
{FB205F05-83DE-4D87-8CE2-F7DA320944FD}.Release|Any CPU.Build.0 = 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.ActiveCfg = Debug|Any CPU
{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Debug|Any CPU.Build.0 = 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.ActiveCfg = Release|Any CPU
{84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|Any CPU.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

18
README.md
View File

@ -30,7 +30,7 @@ While the most used options are available right now, I am planning to support al
* Subscribed Groups * Subscribed Groups
* Mods (Steam Workshop) * Mods (Steam Workshop)
* Inventory and Items * Inventory and Items
* ~~Achievements~~ * Achievements
* Stats, Leaderboards * Stats, Leaderboards
* Controller (Steam Input) * Controller (Steam Input)
@ -40,20 +40,8 @@ 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. 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 ## License
GoldbergGUI is licensed under the GNU General Public License v3.0. GoldbergGUI is licensed under the GNU General Public License v3.0.
Dependencies will be listed ASAP.