From 7cce7a45d1b297210236a6c7a1f07690c67110f0 Mon Sep 17 00:00:00 2001 From: WGzeyu <20312621+WGzeyu@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:24:02 +0800 Subject: [PATCH 01/16] Change URL BeatModsTranslation_beatmods --- ModAssistant/Classes/Utils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModAssistant/Classes/Utils.cs b/ModAssistant/Classes/Utils.cs index 27ffafa7..f0fa6602 100644 --- a/ModAssistant/Classes/Utils.cs +++ b/ModAssistant/Classes/Utils.cs @@ -32,7 +32,7 @@ public class Constants public const string BeatModsVersions_beatmods = "https://versions.beatmods.com/versions.json"; public const string BeatModsAlias_beatmods = "https://alias.beatmods.com/aliases.json"; public const string WeebCDNAPIURL_beatmods = "https://pat.assistant.moe/api/v1.0/"; - public const string BeatModsTranslation_beatmods = "https://beatmodstranslation.wgzeyu.vip/zh-Hans.json"; + public const string BeatModsTranslation_beatmods = "https://wgzeyu.github.io/BeatSaberModListTranslationRepo/zh-Hans.json"; public const string BeatModsAPIUrl_wgzeyu = "https://beatmods.wgzeyu.com/api/v1/"; public const string TeknikAPIUrl_wgzeyu = "https://beatmods.wgzeyu.com/teknik/v1/"; From 048daaa746aa4767be68a54f870c6e8f69d0ccda Mon Sep 17 00:00:00 2001 From: megalon Date: Sat, 9 Mar 2024 15:02:30 -0800 Subject: [PATCH 02/16] Host README images on github (#529) --- README.md | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 182ab166..75881a8f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Mod Assistant](https://cdn.assistant.moe/images/ModAssistant/Icons/Banner.svg?v=5)](https://github.com/Assistant/ModAssistant/releases/latest) -[![Download here!](https://cdn.assistant.moe/images/ModAssistant/Icons/Download.svg)](https://github.com/Assistant/ModAssistant/releases/latest) +![Mod Assistant](https://github.com/bsmg/ModAssistant/assets/27714637/e4c206b2-a890-4c52-aacf-5c96aebadbc2) +![Download here!](https://github.com/bsmg/ModAssistant/assets/27714637/aa836eb6-abaf-4d29-8add-eb021fa30bf3) Mod Assistant is a PC mod installer for Beat Saber. It uses mods from [BeatMods](https://beatmods.com/). @@ -37,50 +37,50 @@ Download the newest installer from the release section and run it. This applicat
Light
-

-

-

-

+

Intro

+

Mods

+

About

+

Options

Dark
-

-

-

-

+

Intro

+

Mods

+

About

+

Options

BSMG
-

-

-

-

+

Intro

+

Mods

+

About

+

Options

Light Pink
-

-

-

-

+

Intro

+

Mods

+

About

+

Options

Your own!
-

-

-

-

+

Intro

+

Mods

+

About

+

Options

From 9130c9ddd968b87b42a300eaeb99cc486e1753ef Mon Sep 17 00:00:00 2001 From: megalon Date: Sat, 9 Mar 2024 15:04:48 -0800 Subject: [PATCH 03/16] Update ModAssistant repo for bsmg account (#530) * Update API URL to bsmg * Fix repo links in README * Fix wording in About page * Find / replace old Patreon link. This was already getting redirected --- ModAssistant/Classes/Updater.cs | 2 +- ModAssistant/Localisation/cs.xaml | 2 +- ModAssistant/Localisation/de.xaml | 2 +- ModAssistant/Localisation/en.xaml | 6 +++--- ModAssistant/Localisation/es.xaml | 2 +- ModAssistant/Localisation/fr.xaml | 2 +- ModAssistant/Localisation/it.xaml | 2 +- ModAssistant/Localisation/ja.xaml | 2 +- ModAssistant/Localisation/ko.xaml | 2 +- ModAssistant/Localisation/nb.xaml | 2 +- ModAssistant/Localisation/nl.xaml | 2 +- ModAssistant/Localisation/pl.xaml | 2 +- ModAssistant/Localisation/pt.xaml | 2 +- ModAssistant/Localisation/ru.xaml | 2 +- ModAssistant/Localisation/sv.xaml | 2 +- ModAssistant/Localisation/th.xaml | 2 +- ModAssistant/Localisation/zh.xaml | 2 +- README.md | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ModAssistant/Classes/Updater.cs b/ModAssistant/Classes/Updater.cs index 4282826a..9e6d65dd 100644 --- a/ModAssistant/Classes/Updater.cs +++ b/ModAssistant/Classes/Updater.cs @@ -9,7 +9,7 @@ namespace ModAssistant { class Updater { - private static readonly string APILatestURL = "https://api.github.com/repos/Assistant/ModAssistant/releases/latest"; + private static readonly string APILatestURL = "https://api.github.com/repos/bsmg/ModAssistant/releases/latest"; private static Update LatestUpdate; private static Version CurrentVersion; diff --git a/ModAssistant/Localisation/cs.xaml b/ModAssistant/Localisation/cs.xaml index 37836a83..05539fab 100644 --- a/ModAssistant/Localisation/cs.xaml +++ b/ModAssistant/Localisation/cs.xaml @@ -121,7 +121,7 @@ stránku pro příspěvky nebo můj - + Patreon diff --git a/ModAssistant/Localisation/de.xaml b/ModAssistant/Localisation/de.xaml index 48c1ad10..f48b6739 100644 --- a/ModAssistant/Localisation/de.xaml +++ b/ModAssistant/Localisation/de.xaml @@ -121,7 +121,7 @@ Spendenseite oder mein - + Patreon diff --git a/ModAssistant/Localisation/en.xaml b/ModAssistant/Localisation/en.xaml index 60898af1..1065fa37 100644 --- a/ModAssistant/Localisation/en.xaml +++ b/ModAssistant/Localisation/en.xaml @@ -120,9 +120,9 @@ donation page - or my - - Patreon + or the + + BSMG Patreon Special Thanks ♥ diff --git a/ModAssistant/Localisation/es.xaml b/ModAssistant/Localisation/es.xaml index 89fd688b..5f8f124e 100644 --- a/ModAssistant/Localisation/es.xaml +++ b/ModAssistant/Localisation/es.xaml @@ -120,7 +120,7 @@ página de donación o mi - + Patreon diff --git a/ModAssistant/Localisation/fr.xaml b/ModAssistant/Localisation/fr.xaml index 53e46405..daa2401d 100644 --- a/ModAssistant/Localisation/fr.xaml +++ b/ModAssistant/Localisation/fr.xaml @@ -126,7 +126,7 @@ page de don ou mon - + Patreon diff --git a/ModAssistant/Localisation/it.xaml b/ModAssistant/Localisation/it.xaml index ae26a0b3..063f1bda 100644 --- a/ModAssistant/Localisation/it.xaml +++ b/ModAssistant/Localisation/it.xaml @@ -121,7 +121,7 @@ pagina delle donazioni oppure il mio - + Patreon diff --git a/ModAssistant/Localisation/ja.xaml b/ModAssistant/Localisation/ja.xaml index 5a924982..1c0aec64 100644 --- a/ModAssistant/Localisation/ja.xaml +++ b/ModAssistant/Localisation/ja.xaml @@ -120,7 +120,7 @@ 寄付ページ または私の - + Patreon を訪れてください。 diff --git a/ModAssistant/Localisation/ko.xaml b/ModAssistant/Localisation/ko.xaml index 997acab5..7df229e9 100644 --- a/ModAssistant/Localisation/ko.xaml +++ b/ModAssistant/Localisation/ko.xaml @@ -120,7 +120,7 @@ donation page or my - + Patreon diff --git a/ModAssistant/Localisation/nb.xaml b/ModAssistant/Localisation/nb.xaml index 3bc6f428..eb4f2a73 100644 --- a/ModAssistant/Localisation/nb.xaml +++ b/ModAssistant/Localisation/nb.xaml @@ -124,7 +124,7 @@ donasjonsside eller min - + Patreon diff --git a/ModAssistant/Localisation/nl.xaml b/ModAssistant/Localisation/nl.xaml index b0998dff..48cac5cb 100644 --- a/ModAssistant/Localisation/nl.xaml +++ b/ModAssistant/Localisation/nl.xaml @@ -119,7 +119,7 @@ donatie pagina of mijn - + Patreon diff --git a/ModAssistant/Localisation/pl.xaml b/ModAssistant/Localisation/pl.xaml index f7e6adc6..b5b45e9e 100644 --- a/ModAssistant/Localisation/pl.xaml +++ b/ModAssistant/Localisation/pl.xaml @@ -121,7 +121,7 @@ stronę dotacji lub mojego - + Patreon'a diff --git a/ModAssistant/Localisation/pt.xaml b/ModAssistant/Localisation/pt.xaml index 79044131..675dc2db 100644 --- a/ModAssistant/Localisation/pt.xaml +++ b/ModAssistant/Localisation/pt.xaml @@ -121,7 +121,7 @@ página de doação ou meu - + Patreon diff --git a/ModAssistant/Localisation/ru.xaml b/ModAssistant/Localisation/ru.xaml index 698fbe6c..fddf12c9 100644 --- a/ModAssistant/Localisation/ru.xaml +++ b/ModAssistant/Localisation/ru.xaml @@ -121,7 +121,7 @@ страницу для пожертвований или мой - + Patreon diff --git a/ModAssistant/Localisation/sv.xaml b/ModAssistant/Localisation/sv.xaml index d9be00f3..34c0edff 100644 --- a/ModAssistant/Localisation/sv.xaml +++ b/ModAssistant/Localisation/sv.xaml @@ -121,7 +121,7 @@ donationssida eller min - + Patreon diff --git a/ModAssistant/Localisation/th.xaml b/ModAssistant/Localisation/th.xaml index 5a001a06..9f691703 100644 --- a/ModAssistant/Localisation/th.xaml +++ b/ModAssistant/Localisation/th.xaml @@ -121,7 +121,7 @@ หน้าบริจาคของฉัน หรือ - + หน้า Patreon ของฉัน diff --git a/ModAssistant/Localisation/zh.xaml b/ModAssistant/Localisation/zh.xaml index 41f75372..d1571bee 100644 --- a/ModAssistant/Localisation/zh.xaml +++ b/ModAssistant/Localisation/zh.xaml @@ -120,7 +120,7 @@ 捐助页面 或我的 - + Patreon diff --git a/README.md b/README.md index 75881a8f..24a98ae4 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Custom themes are located in a folder called `Themes` in the same folder as `Mod ### Built In These come with the program and you can't change them, however you can overwrite them by creating one of the other two theme types with the same name. -If you have a particularly popular theme, you can submit a [Pull Request](https://github.com/Assistant/ModAssistant/pulls) to add your theme as a built-in theme. +If you have a particularly popular theme, you can submit a [Pull Request](https://github.com/bsmg/ModAssistant/pulls) to add your theme as a built-in theme. ### Packaged `.mat` Files These are pre-packaged theme files. Under the hood they are renamed`.zip` files, and the file structure is the same as that of `Folders` themes. These will be overwritten by `Folders` themes with the same name. From e4982ba853165d6f7eb8d084f9967ac0a43c215d Mon Sep 17 00:00:00 2001 From: Jack Baron Date: Sun, 10 Mar 2024 19:06:05 +0000 Subject: [PATCH 04/16] change my name/links --- ModAssistant/App.xaml | 2 +- ModAssistant/Pages/About.xaml | 4 ++-- ModAssistant/Themes/Dark.xaml | 2 +- ModAssistant/Themes/Light.xaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ModAssistant/App.xaml b/ModAssistant/App.xaml index 2b4ab8a6..06d4c88c 100644 --- a/ModAssistant/App.xaml +++ b/ModAssistant/App.xaml @@ -18,7 +18,7 @@ - + diff --git a/ModAssistant/Pages/About.xaml b/ModAssistant/Pages/About.xaml index 0d0361bc..4fbed1f8 100644 --- a/ModAssistant/Pages/About.xaml +++ b/ModAssistant/Pages/About.xaml @@ -128,8 +128,8 @@ VerticalAlignment="Center" FontSize="20" FontWeight="Bold"> - - lolPants + + Lulu - + #E0E0E0 diff --git a/ModAssistant/Themes/Light.xaml b/ModAssistant/Themes/Light.xaml index e7aed690..ee4bf525 100644 --- a/ModAssistant/Themes/Light.xaml +++ b/ModAssistant/Themes/Light.xaml @@ -1,6 +1,6 @@ - + #101010 From 5c4b3c74042b4c1522b4041ae932176fac2b6af9 Mon Sep 17 00:00:00 2001 From: Jack Baron Date: Sun, 10 Mar 2024 19:06:46 +0000 Subject: [PATCH 05/16] Updated version to 1.1.33.0 --- ModAssistant/Properties/AssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ModAssistant/Properties/AssemblyInfo.cs b/ModAssistant/Properties/AssemblyInfo.cs index fe928d0a..a2a6189d 100644 --- a/ModAssistant/Properties/AssemblyInfo.cs +++ b/ModAssistant/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.32.0")] -[assembly: AssemblyFileVersion("1.1.32.0")] +[assembly: AssemblyVersion("1.1.33.0")] +[assembly: AssemblyFileVersion("1.1.33.0")] From 2eae530926f6f373805fdfcb665d2ed9e8aa45eb Mon Sep 17 00:00:00 2001 From: Lulu Date: Sun, 10 Mar 2024 19:09:48 +0000 Subject: [PATCH 06/16] fix links in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 24a98ae4..ea324894 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -![Mod Assistant](https://github.com/bsmg/ModAssistant/assets/27714637/e4c206b2-a890-4c52-aacf-5c96aebadbc2) -![Download here!](https://github.com/bsmg/ModAssistant/assets/27714637/aa836eb6-abaf-4d29-8add-eb021fa30bf3) +[![Mod Assistant](https://github.com/bsmg/ModAssistant/assets/27714637/e4c206b2-a890-4c52-aacf-5c96aebadbc2)](https://github.com/Assistant/ModAssistant/releases/latest) +[![Download here!](https://github.com/bsmg/ModAssistant/assets/27714637/aa836eb6-abaf-4d29-8add-eb021fa30bf3)](https://github.com/Assistant/ModAssistant/releases/latest) Mod Assistant is a PC mod installer for Beat Saber. It uses mods from [BeatMods](https://beatmods.com/). From be0a1152e372933a572c7a4926a6389625f764d4 Mon Sep 17 00:00:00 2001 From: DeadlyKitten Date: Wed, 23 Oct 2024 17:58:45 -0700 Subject: [PATCH 07/16] Added utility function to fetch the versions list from BeatMods. --- ModAssistant/Classes/Utils.cs | 12 +++++++----- ModAssistant/MainWindow.xaml.cs | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ModAssistant/Classes/Utils.cs b/ModAssistant/Classes/Utils.cs index 567a2a92..686c17f9 100644 --- a/ModAssistant/Classes/Utils.cs +++ b/ModAssistant/Classes/Utils.cs @@ -275,12 +275,14 @@ public static string GetVersion() var strlen = reader.ReadInt32(); var strbytes = reader.ReadBytes(strlen); - var version = Encoding.UTF8.GetString(strbytes); + // TODO: should cache this + public static async Task> GetVersionsList() + { + var resp = await HttpClient.GetAsync(Utils.Constants.BeatModsVersions); + var body = await resp.Content.ReadAsStringAsync(); + List versions = JsonSerializer.Deserialize(body).ToList(); - //There is one version ending in "p1" on BeatMods - var filteredVersionMatch = Regex.Match(version, @"[\d]+.[\d]+.[\d]+(p1)?"); - return filteredVersionMatch.Success ? filteredVersionMatch.Value : version; - } + return versions; } public static string GetOculusDir() diff --git a/ModAssistant/MainWindow.xaml.cs b/ModAssistant/MainWindow.xaml.cs index 1a6c2ec9..a2a5a40b 100644 --- a/ModAssistant/MainWindow.xaml.cs +++ b/ModAssistant/MainWindow.xaml.cs @@ -114,7 +114,9 @@ private async void LoadVersionsAsync() { try { - var resp = await HttpClient.GetAsync(Utils.Constants.BeatModsVersions); + var versions = await Utils.GetVersionsList(); + + var resp = await HttpClient.GetAsync(Utils.Constants.BeatModsAlias); var body = await resp.Content.ReadAsStringAsync(); List versions = JsonSerializer.Deserialize(body).ToList(); From eb4bd423f71b872412251c305f15114b4fd6307b Mon Sep 17 00:00:00 2001 From: DeadlyKitten Date: Wed, 23 Oct 2024 17:59:01 -0700 Subject: [PATCH 08/16] Fixed version detection. --- ModAssistant/Classes/Utils.cs | 45 +++++++++++++++++---------------- ModAssistant/MainWindow.xaml.cs | 6 +---- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/ModAssistant/Classes/Utils.cs b/ModAssistant/Classes/Utils.cs index 686c17f9..6e0bceee 100644 --- a/ModAssistant/Classes/Utils.cs +++ b/ModAssistant/Classes/Utils.cs @@ -244,36 +244,37 @@ public static string GetSteamDir() return null; } - public static string GetVersion() + public static async Task GetVersion() { + string result = string.Empty; + + var versions = await GetVersionsList(); + string filename = Path.Combine(App.BeatSaberInstallDirectory, "Beat Saber_Data", "globalgamemanagers"); using (var stream = File.OpenRead(filename)) - using (var reader = new BinaryReader(stream, Encoding.UTF8)) + using (var reader = new StreamReader(stream, Encoding.UTF8)) { - const string key = "public.app-category.games"; - int pos = 0; + var line = reader.ReadLine(); - while (stream.Position < stream.Length && pos < key.Length) + while (line != null) { - if (reader.ReadByte() == key[pos]) pos++; - else pos = 0; - } - - if (stream.Position == stream.Length) // we went through the entire stream without finding the key - return null; - - while (stream.Position < stream.Length) - { - var current = (char)reader.ReadByte(); - if (char.IsDigit(current)) - break; + foreach (var version in versions) + { + if (line.Contains(version)) + { + result = version; + break; + } + } + if (!string.IsNullOrEmpty(result)) break; + line = reader.ReadLine(); } - var rewind = -sizeof(int) - sizeof(byte); - stream.Seek(rewind, SeekOrigin.Current); // rewind to the string length - - var strlen = reader.ReadInt32(); - var strbytes = reader.ReadBytes(strlen); + ////There is one version ending in "p1" on BeatMods + var filteredVersionMatch = Regex.Match(result, @"[\d]+.[\d]+.[\d]+(p1)?"); + return filteredVersionMatch.Success ? filteredVersionMatch.Value : result; + } + } // TODO: should cache this public static async Task> GetVersionsList() diff --git a/ModAssistant/MainWindow.xaml.cs b/ModAssistant/MainWindow.xaml.cs index a2a5a40b..346cc182 100644 --- a/ModAssistant/MainWindow.xaml.cs +++ b/ModAssistant/MainWindow.xaml.cs @@ -118,13 +118,9 @@ private async void LoadVersionsAsync() var resp = await HttpClient.GetAsync(Utils.Constants.BeatModsAlias); var body = await resp.Content.ReadAsStringAsync(); - List versions = JsonSerializer.Deserialize(body).ToList(); - - resp = await HttpClient.GetAsync(Utils.Constants.BeatModsAlias); - body = await resp.Content.ReadAsStringAsync(); Dictionary aliases = JsonSerializer.Deserialize>(body); - string version = Utils.GetVersion(); + string version = await Utils.GetVersion(); if (!versions.Contains(version) && CheckAliases(versions, aliases, version) == string.Empty) { versions.Insert(0, version); From cc81ae00c267cae2780718b8aa7224884b430933 Mon Sep 17 00:00:00 2001 From: DeadlyKitten Date: Sun, 27 Oct 2024 14:11:57 -0700 Subject: [PATCH 09/16] Add method to fetch alias dictionary from BeatMods. --- ModAssistant/Classes/Utils.cs | 9 +++++++++ ModAssistant/MainWindow.xaml.cs | 5 +---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ModAssistant/Classes/Utils.cs b/ModAssistant/Classes/Utils.cs index 6e0bceee..e8afda7f 100644 --- a/ModAssistant/Classes/Utils.cs +++ b/ModAssistant/Classes/Utils.cs @@ -286,6 +286,15 @@ public static async Task> GetVersionsList() return versions; } + // TODO: should cache this + public static async Task> GetAliasDictionary() + { + var resp = await HttpClient.GetAsync(Constants.BeatModsAlias); + var body = await resp.Content.ReadAsStringAsync(); + var aliases = JsonSerializer.Deserialize>(body); + + return aliases; + } public static string GetOculusDir() { string OculusInstall = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64)?.OpenSubKey("SOFTWARE")?.OpenSubKey("Wow6432Node")?.OpenSubKey("Oculus VR, LLC")?.OpenSubKey("Oculus")?.OpenSubKey("Config")?.GetValue("InitialAppLibrary").ToString(); diff --git a/ModAssistant/MainWindow.xaml.cs b/ModAssistant/MainWindow.xaml.cs index 346cc182..0af7de24 100644 --- a/ModAssistant/MainWindow.xaml.cs +++ b/ModAssistant/MainWindow.xaml.cs @@ -115,10 +115,7 @@ private async void LoadVersionsAsync() try { var versions = await Utils.GetVersionsList(); - - var resp = await HttpClient.GetAsync(Utils.Constants.BeatModsAlias); - var body = await resp.Content.ReadAsStringAsync(); - Dictionary aliases = JsonSerializer.Deserialize>(body); + var aliases = await Utils.GetAliasDictionary(); string version = await Utils.GetVersion(); if (!versions.Contains(version) && CheckAliases(versions, aliases, version) == string.Empty) From e64be910ca8838ea646c3eaba27f4d81ae753b5a Mon Sep 17 00:00:00 2001 From: DeadlyKitten Date: Sun, 27 Oct 2024 14:12:30 -0700 Subject: [PATCH 10/16] Add utility method to fetch all possible version numbers. --- ModAssistant/Classes/Utils.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ModAssistant/Classes/Utils.cs b/ModAssistant/Classes/Utils.cs index e8afda7f..165f1f97 100644 --- a/ModAssistant/Classes/Utils.cs +++ b/ModAssistant/Classes/Utils.cs @@ -295,6 +295,15 @@ public static async Task> GetAliasDictionary() return aliases; } + + public static async Task> GetAllPossibleVersions() + { + var versions = await GetVersionsList(); + var aliases = await GetAliasDictionary(); + + return versions.Concat(aliases.SelectMany(x => x.Value)).ToList(); + } + public static string GetOculusDir() { string OculusInstall = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64)?.OpenSubKey("SOFTWARE")?.OpenSubKey("Wow6432Node")?.OpenSubKey("Oculus VR, LLC")?.OpenSubKey("Oculus")?.OpenSubKey("Config")?.GetValue("InitialAppLibrary").ToString(); From 7b8caa36326f3240152641823974a32f5fc31eb3 Mon Sep 17 00:00:00 2001 From: DeadlyKitten Date: Sun, 27 Oct 2024 14:13:15 -0700 Subject: [PATCH 11/16] Small simplification. --- ModAssistant/Classes/Utils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModAssistant/Classes/Utils.cs b/ModAssistant/Classes/Utils.cs index 165f1f97..df42caca 100644 --- a/ModAssistant/Classes/Utils.cs +++ b/ModAssistant/Classes/Utils.cs @@ -279,7 +279,7 @@ public static async Task GetVersion() // TODO: should cache this public static async Task> GetVersionsList() { - var resp = await HttpClient.GetAsync(Utils.Constants.BeatModsVersions); + var resp = await HttpClient.GetAsync(Constants.BeatModsVersions); var body = await resp.Content.ReadAsStringAsync(); List versions = JsonSerializer.Deserialize(body).ToList(); From 022eff9c25e36e2cd042fc54a08fce63980b5d13 Mon Sep 17 00:00:00 2001 From: DeadlyKitten <9684760+DeadlyKitten@users.noreply.github.com> Date: Sun, 27 Oct 2024 18:21:37 -0700 Subject: [PATCH 12/16] Whoops! Forgot to actually use the new method. --- ModAssistant/Classes/Utils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModAssistant/Classes/Utils.cs b/ModAssistant/Classes/Utils.cs index df42caca..7d8bab2f 100644 --- a/ModAssistant/Classes/Utils.cs +++ b/ModAssistant/Classes/Utils.cs @@ -248,7 +248,7 @@ public static async Task GetVersion() { string result = string.Empty; - var versions = await GetVersionsList(); + var versions = await GetAllPossibleVersions(); string filename = Path.Combine(App.BeatSaberInstallDirectory, "Beat Saber_Data", "globalgamemanagers"); using (var stream = File.OpenRead(filename)) From 1ba81ccd43a05b7ff3ea5b36b09e82624580b989 Mon Sep 17 00:00:00 2001 From: Vojtak42 Date: Mon, 28 Oct 2024 18:47:07 +0100 Subject: [PATCH 13/16] translation correction cs.xaml (#534) --- ModAssistant/Localisation/cs.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ModAssistant/Localisation/cs.xaml b/ModAssistant/Localisation/cs.xaml index 05539fab..ec3de5ba 100644 --- a/ModAssistant/Localisation/cs.xaml +++ b/ModAssistant/Localisation/cs.xaml @@ -43,9 +43,9 @@ nepodporuje nativně mody. To znamená: - Módy - rozbijí každou aktualizaci. To je normální a - ne chyba Beat Games. + Módy se + rozbijí s každou aktualizací. To je normální a + není to chyba Beat Games. Módy From 784f21d44f6d79b7b2bdd47bb86f33c525628b34 Mon Sep 17 00:00:00 2001 From: Nicolas Gnyra <1349975+nicoco007@users.noreply.github.com> Date: Mon, 28 Oct 2024 13:47:39 -0400 Subject: [PATCH 14/16] Add `Libs/Native` to search folders (#514) --- ModAssistant/Pages/Mods.xaml.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ModAssistant/Pages/Mods.xaml.cs b/ModAssistant/Pages/Mods.xaml.cs index 29d6c96d..188f1e6a 100644 --- a/ModAssistant/Pages/Mods.xaml.cs +++ b/ModAssistant/Pages/Mods.xaml.cs @@ -186,8 +186,10 @@ public async Task CheckInstalledMods() GetBSIPAVersion(); CheckInstallDir("IPA/Pending/Plugins"); CheckInstallDir("IPA/Pending/Libs"); + CheckInstallDir("IPA/Pending/Libs/Native"); CheckInstallDir("Plugins"); CheckInstallDir("Libs"); + CheckInstallDir("Libs/Native"); } public async Task GetAllMods() From be6fa5117c0c7a7e8f3802f83fca1bce4b0d66a1 Mon Sep 17 00:00:00 2001 From: Thomas Cheyney Date: Mon, 28 Oct 2024 19:48:46 +0200 Subject: [PATCH 15/16] Include query params in oneclick playlist requests (#492) --- ModAssistant/Classes/External Interfaces/Playlists.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModAssistant/Classes/External Interfaces/Playlists.cs b/ModAssistant/Classes/External Interfaces/Playlists.cs index 6442c700..171065bc 100644 --- a/ModAssistant/Classes/External Interfaces/Playlists.cs +++ b/ModAssistant/Classes/External Interfaces/Playlists.cs @@ -24,7 +24,7 @@ public static async Task DownloadAll(Uri uri) switch (uri.Host) { case "playlist": - Uri url = new Uri($"{uri.LocalPath.Trim('/')}"); + Uri url = new Uri($"{uri.PathAndQuery.Trim('/')}"); string filename = await Get(url); await DownloadFrom(filename); break; From b36e61449ee9878ba31f1563d82c0855bc90a578 Mon Sep 17 00:00:00 2001 From: Steven <9684760+DeadlyKitten@users.noreply.github.com> Date: Mon, 28 Oct 2024 12:04:07 -0700 Subject: [PATCH 16/16] Updated version to 1.1.34.0 (#548) --- ModAssistant/Properties/AssemblyInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ModAssistant/Properties/AssemblyInfo.cs b/ModAssistant/Properties/AssemblyInfo.cs index a2a6189d..04580429 100644 --- a/ModAssistant/Properties/AssemblyInfo.cs +++ b/ModAssistant/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.33.0")] -[assembly: AssemblyFileVersion("1.1.33.0")] +[assembly: AssemblyVersion("1.1.34.0")] +[assembly: AssemblyFileVersion("1.1.34.0")]