Test

LICENSE

@@ -1,5 +1,28 @@
 MIT License
 
+Copyright (c) 2022-present diamond3500
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+------------------------------------------------------------------------------------------
+MIT License
+
 Copyright (c) 2021-present Malte0621
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

ProjectSrc/App.config

@@ -1,11 +1,63 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="RobloxPlayerModManager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
-    </startup>
+  <configSections>
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="RobloxPlayerModManager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Resources.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

ProjectSrc/Bootstrapper/FileManifest.cs

@@ -5,6 +5,8 @@
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
 
+using RobloxDeployHistory;
+
 namespace RobloxPlayerModManager
 {
     [Serializable]
@@ -14,7 +16,7 @@ internal class FileManifest : Dictionary<string, string>
 
         protected FileManifest(SerializationInfo info, StreamingContext context)
             : base(info, context) { }
-        
+
         private FileManifest(string data, bool remapExtraContent = false)
         {
             using (var reader = new StringReader(data))
@@ -41,16 +43,31 @@ private FileManifest(string data, bool remapExtraContent = false)
                     else if (remapExtraContent && path.StartsWith("ExtraContent", Program.StringFormat))
                         path = path.Replace("ExtraContent", "content");
 
+                    // ~~ AWFUL TEMPORARY HACK. ~~
+                    //
+                    // This is necessary because SourceSansPro gets incorrectly listed in the root directory,
+                    // but also MUST be extracted to both 'PlayerFonts/' and 'content/fonts/', so I need to
+                    // make sure it unambiguously extracts to the correct locations.
+
+                    if (path.EndsWith(".ttf") && !path.Contains("\\"))
+                        path = "PlayerFonts\\" + path;
+
+                    if (remapExtraContent && ContainsKey(path))
+                        continue;
+
                     Add(path, signature);
                 }
             }
-            
+
             RawData = data;
         }
 
-        public static async Task<FileManifest> Get(string branch, string versionGuid, bool remapExtraContent = false)
+        public static async Task<FileManifest> Get(ClientVersionInfo info, bool remapExtraContent = false)
         {
-            string fileManifestUrl = $"https://s3.amazonaws.com/setup.{branch}.com/{versionGuid}-rbxManifest.txt";
+            Channel channel = info.Channel;
+            string versionGuid = info.VersionGuid;
+
+            string fileManifestUrl = $"{channel.BaseUrl}/{versionGuid}-rbxManifest.txt";
             string fileManifestData;
 
             using (WebClient http = new WebClient())
@@ -61,7 +78,5 @@ public static async Task<FileManifest> Get(string branch, string versionGuid, bo
 
             return new FileManifest(fileManifestData, remapExtraContent);
         }
-
-
     }
 }

ProjectSrc/Bootstrapper/PackageManifest.cs

@@ -4,6 +4,8 @@
 using System.Net;
 using System.Threading.Tasks;
 
+using RobloxDeployHistory;
+
 namespace RobloxPlayerModManager
 {
     internal class PackageManifest : List<Package>
@@ -64,19 +66,37 @@ private PackageManifest(string data)
                     Add(package);
                 }
             }
-            
+
             RawData = data;
         }
 
-        public static async Task<PackageManifest> Get(string branch, string versionGuid)
+        public static async Task<PackageManifest> Get(ClientVersionInfo info)
         {
-            string pkgManifestUrl = $"https://s3.amazonaws.com/setup.{branch}.com/{versionGuid}-rbxPkgManifest.txt";
+            Channel channel = info.Channel;
+            string versionGuid = info.VersionGuid;
+
+            string pkgManifestUrl = $"{channel.BaseUrl}/{versionGuid}-rbxPkgManifest.txt";
             string pkgManifestData;
 
             using (WebClient http = new WebClient())
             {
                 var getData = http.DownloadStringTaskAsync(pkgManifestUrl);
                 pkgManifestData = await getData.ConfigureAwait(false);
+                int pkgManifestIndex = pkgManifestData.IndexOf("RobloxPlayerLauncher.exe");
+                int pkgManifestIndexNew = pkgManifestData.IndexOf("RobloxPlayerInstaller.exe");
+                if (pkgManifestIndex != pkgManifestIndex + 3)
+                {
+                    //TODO: Maybe make this better in the future.
+                    try
+                    {
+                        pkgManifestData = pkgManifestData.Remove(pkgManifestIndex);
+                    }
+                    catch (ArgumentOutOfRangeException)
+                    {
+                        pkgManifestData = pkgManifestData.Remove(pkgManifestIndexNew);
+                    }
+                }
+
             }
 
             return new PackageManifest(pkgManifestData);