beatmods-top · baoziii · Nov 13, 2024 · Feb 19, 2024 · Mar 9, 2024 · Mar 9, 2024
diff --git a/ModAssistant/App.xaml b/ModAssistant/App.xaml
@@ -18,7 +18,7 @@
                 <!-- Load theme to be modified via the Theme engine. -->
                 <ResourceDictionary x:Name="LoadedTheme" Source="Themes/Dark.xaml" />
 
-                <!-- Load SVG icons, courtesy of lolPants. -->
+                <!-- Load SVG icons, courtesy of Lulu. -->
                 <ResourceDictionary x:Name="Icons" Source="Resources/Icons.xaml" />
 
                 <!-- Load Styles needed for the Theme engine to work. -->

diff --git 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;

diff --git 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/";
@@ -321,43 +321,64 @@ public static string GetSteamDir()
             return null;
         }
 
-        public static string GetVersion()
+        public static async Task<string> GetVersion()
         {
+            string result = string.Empty;
+
+            var versions = await GetAllPossibleVersions();
+
             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;
+                    foreach (var version in versions)
+                    {
+                        if (line.Contains(version))
+                        {
+                            result = version;
+                            break;
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(result)) break;
+                    line = reader.ReadLine();
                 }
 
-                if (stream.Position == stream.Length) // we went through the entire stream without finding the key
-                    return null;
+                ////There is one version ending in "p1" on BeatMods
+                var filteredVersionMatch = Regex.Match(result, @"[\d]+.[\d]+.[\d]+(p1)?");
+                return filteredVersionMatch.Success ? filteredVersionMatch.Value : result;
+            }
+        }
 
-                while (stream.Position < stream.Length)
-                {
-                    var current = (char)reader.ReadByte();
-                    if (char.IsDigit(current))
-                        break;
-                }
+        // TODO: should cache this
+        public static async Task<List<string>> GetVersionsList()
+        {
+            var resp = await HttpClient.GetAsync(Constants.BeatModsVersions);
+            var body = await resp.Content.ReadAsStringAsync();
+            List<string> versions = JsonSerializer.Deserialize<string[]>(body).ToList();
+
+            return versions;
+        }
 
-                var rewind = -sizeof(int) - sizeof(byte);
-                stream.Seek(rewind, SeekOrigin.Current); // rewind to the string length
+        // TODO: should cache this
+        public static async Task<Dictionary<string, string[]>> GetAliasDictionary()
+        {
+            var resp = await HttpClient.GetAsync(Constants.BeatModsAlias);
+            var body = await resp.Content.ReadAsStringAsync();
+            var aliases = JsonSerializer.Deserialize<Dictionary<string, string[]>>(body);
 
-                var strlen = reader.ReadInt32();
-                var strbytes = reader.ReadBytes(strlen);
+            return aliases;
+        }
 
-                var version = Encoding.UTF8.GetString(strbytes);
+        public static async Task<List<string>> GetAllPossibleVersions()
+        {
+            var versions = await GetVersionsList();
+            var aliases = await GetAliasDictionary();
 
-                //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.Concat(aliases.SelectMany(x => x.Value)).ToList();
         }
 
         public static string GetOculusDir()

diff --git a/ModAssistant/Localisation/cs.xaml b/ModAssistant/Localisation/cs.xaml
@@ -43,9 +43,9 @@
          <Bold>nepodporuje</Bold> nativně mody. To znamená:
      </Span>
      <Span x:Key="Intro:Terms:Term1">
-         Módy
-         <Bold>rozbijí</Bold> každou aktualizaci. To je normální a
-         <Bold>ne</Bold> chyba Beat Games.
+         Módy se
+         <Bold>rozbijí</Bold> s každou aktualizací. To je normální a
+         <Bold>není</Bold> to chyba Beat Games.
      </Span>
     <Span x:Key="Intro:Terms:Term2">
          Módy
@@ -121,7 +121,7 @@
             stránku pro příspěvky
         </Hyperlink>
         nebo můj
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/de.xaml b/ModAssistant/Localisation/de.xaml
@@ -122,7 +122,7 @@
             Spendenseite
         </Hyperlink>
          oder mein 
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/en.xaml b/ModAssistant/Localisation/en.xaml
@@ -136,9 +136,9 @@ Do you want to continue?</sys:String>
         <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://bs.assistant.moe/Donate/">
             donation page
         </Hyperlink>
-        or my
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
-            Patreon
+        or the 
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
+            BSMG Patreon
         </Hyperlink>
     </Span>
     <sys:String x:Key="About:SpecialThanks">Special Thanks ♥</sys:String>

diff --git a/ModAssistant/Localisation/es.xaml b/ModAssistant/Localisation/es.xaml
@@ -120,7 +120,7 @@
             página de donación
         </Hyperlink>
         o mi
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/fr.xaml b/ModAssistant/Localisation/fr.xaml
@@ -127,7 +127,7 @@
             page de don
         </Hyperlink>
         ou mon
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/it.xaml b/ModAssistant/Localisation/it.xaml
@@ -122,7 +122,7 @@
             pagina delle donazioni
         </Hyperlink>
         oppure il mio 
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/ja.xaml b/ModAssistant/Localisation/ja.xaml
@@ -120,7 +120,7 @@
             寄付ページ
         </Hyperlink>
         または私の
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink> を訪れてください。
     </Span>

diff --git a/ModAssistant/Localisation/ko.xaml b/ModAssistant/Localisation/ko.xaml
@@ -121,7 +121,7 @@
             donation page
         </Hyperlink>
         or my
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/nb.xaml b/ModAssistant/Localisation/nb.xaml
@@ -124,7 +124,7 @@
             donasjonsside
         </Hyperlink>
         eller min
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/nl.xaml b/ModAssistant/Localisation/nl.xaml
@@ -120,7 +120,7 @@
             donatie pagina
         </Hyperlink>
         of mijn
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/pl.xaml b/ModAssistant/Localisation/pl.xaml
@@ -121,7 +121,7 @@
             stronę dotacji
         </Hyperlink>
         lub mojego
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon'a
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/pt.xaml b/ModAssistant/Localisation/pt.xaml
@@ -121,7 +121,7 @@
            página de doação
         </Hyperlink>
         ou meu
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/ru.xaml b/ModAssistant/Localisation/ru.xaml
@@ -122,7 +122,7 @@
             страницу для пожертвований 
         </Hyperlink>
         или мой
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/sv.xaml b/ModAssistant/Localisation/sv.xaml
@@ -122,7 +122,7 @@
             donationssida
         </Hyperlink>
         eller min
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/th.xaml b/ModAssistant/Localisation/th.xaml
@@ -121,7 +121,7 @@
             หน้าบริจาคของฉัน
         </Hyperlink>
         หรือ
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             หน้า Patreon ของฉัน
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/Localisation/zh.xaml b/ModAssistant/Localisation/zh.xaml
@@ -99,8 +99,6 @@ OneClick源</sys:String>
         <LineBreak/>
         国际源是BeatMods源站，默认源是BeatSaver/ModelSaber源站，无限额；
         <LineBreak/>
-        国内源是以上国际源/默认源的国内中转，是由WGzeyu提供的<Bold>香港服务器</Bold>，推荐国内用户使用；
-        <LineBreak/>
         包子源为BeatTop管理，服务器使用<Bold>美国机房(多节点)</Bold>，同步国际源并添加了部分第三方插件。
         <LineBreak/>
         光剑中文社区源为社区管理，是默认源的中转，服务器使用<Bold>美国机房(多节点)</Bold>，无限额。
@@ -155,7 +153,7 @@ OneClick源</sys:String>
             捐助页面
         </Hyperlink>
         或我的
-        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/AssistantMoe">
+        <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.patreon.com/beatsabermods">
             Patreon
         </Hyperlink>
     </Span>

diff --git a/ModAssistant/MainWindow.xaml.cs b/ModAssistant/MainWindow.xaml.cs
@@ -23,8 +23,8 @@ public partial class MainWindow : Window
         public static string GameVersionDetected;  // the real game version detected from the game
         public static string GameVersionOverride;
         public TaskCompletionSource<bool> VersionLoadStatus = new TaskCompletionSource<bool>();
-        public static string[] serverList = { "国际源@BeatMods", "国内源@WGzeyu", "包子源@BeatTop" };
-        public static string[] assetsServerList = { "默认@default", "国内源@WGzeyu", "光剑中文社区源@BeatSaberChina" };
+        public static string[] serverList = { "国际源@BeatMods", "包子源@BeatTop" };
+        public static string[] assetsServerList = { "默认@default", "光剑中文社区源@BeatSaberChina" };
 
         public string MainText
         {
@@ -121,16 +121,10 @@ private async void LoadVersionsAsync()
             try
             {
                 Utils.Constants.UpdateDownloadNode();
-                var resp = await HttpClient.GetAsync(Utils.Constants.BeatModsVersions);
-                var body = await resp.Content.ReadAsStringAsync();
-                List<string> versions = JsonSerializer.Deserialize<string[]>(body).ToList();
+                var versions = await Utils.GetVersionsList();
+                var aliases = await Utils.GetAliasDictionary();
 
-                resp = await HttpClient.GetAsync(Utils.Constants.BeatModsAlias);
-                body = await resp.Content.ReadAsStringAsync();
-                Dictionary<string, string[]> aliases = JsonSerializer.Deserialize<Dictionary<string, string[]>>(body);
-
-                string version = Utils.GetVersion();
-                GameVersionDetected = version;
+                string version = await Utils.GetVersion();
                 if (!versions.Contains(version) && CheckAliases(versions, aliases, version) == string.Empty)
                 {
                     versions.Insert(0, version);

diff --git a/ModAssistant/ModAssistant.csproj b/ModAssistant/ModAssistant.csproj
@@ -118,8 +118,8 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Management" />
-    <Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
+    <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
@@ -178,7 +178,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll</HintPath>
+      <HintPath>..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>

diff --git a/ModAssistant/Pages/About.xaml b/ModAssistant/Pages/About.xaml
@@ -128,8 +128,8 @@
                     VerticalAlignment="Center"
                     FontSize="20"
                     FontWeight="Bold">
-                    <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://www.jackbaron.com/">
-                        lolPants
+                    <Hyperlink local:HyperlinkExtensions.IsExternal="True" NavigateUri="https://lulu.dev/">
+                        Lulu
                     </Hyperlink>
                     </TextBlock>
                     <TextBlock

diff --git a/ModAssistant/Pages/Mods.xaml.cs b/ModAssistant/Pages/Mods.xaml.cs
@@ -197,8 +197,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()

diff --git 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.3207.0")]
-[assembly: AssemblyFileVersion("1.1.3207.0")]
+[assembly: AssemblyVersion("1.1.3400.0")]
+[assembly: AssemblyFileVersion("1.1.3400.0")]
diff --git a/ModAssistant/Themes/Dark.xaml b/ModAssistant/Themes/Dark.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <!-- Mod Assistant Dark Theme by Caeden117 and lolPants -->
+    <!-- Mod Assistant Dark Theme by Caeden117 and Lulu -->
 
     <!-- Standard Styles -->
     <Color x:Key="StandardContent">#E0E0E0</Color>

diff --git a/ModAssistant/Themes/Light.xaml b/ModAssistant/Themes/Light.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <!-- Mod Assistant Light Theme by Caeden117 and lolPants -->
+    <!-- Mod Assistant Light Theme by Caeden117 and Lulu -->
 
     <!-- Standard Styles -->
     <Color x:Key="StandardContent">#101010</Color>