v.2.8.1.5 release fixes

returnrqt · Nov 15, 2024 · 7a9c2cd · 7a9c2cd
1 parent ba91ee1
commit 7a9c2cd
Show file tree

Hide file tree

Showing 6 changed files with 143 additions and 34 deletions.
diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx
@@ -1364,6 +1364,9 @@ Please close any applications that may be using Roblox's files, and relaunch.</v
   <data name="Menu.FastFlags.Presets.Chromeui.Title" xml:space="preserve">
     <value>Chrome UI</value>
   </data>
+  <data name="Menu.FastFlags.Presets.Chromeui.Description" xml:space="preserve">
+    <value>When disabled Roblox will use old top bar.</value>
+  </data>
   <data name="Menu.FlagProfiles.ClearFlags" xml:space="preserve">
     <value>Clear FFlags</value>
   </data>
@@ -1403,7 +1406,31 @@ Please close any applications that may be using Roblox's files, and relaunch.</v
 	<data name="Menu.FastFlags.Presets.IngameMenu.ChatTranslation.Title" xml:space="preserve">
     <value>Chat translation</value>
   </data>
-  <data name="Common.Studio" xml:space="preserve">
+	<data name="Menu.FastFlags.Presets.IngameMenu.VRToggle.Description" xml:space="preserve">
+    <value>Allows to disable VR mode toggle.</value>
+</data>
+	<data name="Menu.FastFlags.Presets.IngameMenu.SoothsayerCheck.Description" xml:space="preserve">
+    <value>Hides the button for submitting feedback on translation quality.</value>
+</data>
+	<data name="Menu.FastFlags.Presets.IngameMenu.Haptics.Description" xml:space="preserve">
+    <value>Disables haptic feedback features, such as vibrations for controllers.</value>
+</data>
+	<data name="Menu.FastFlags.Presets.IngameMenu.Framerate.Description" xml:space="preserve">
+    <value>Removes FPS presets from the menu.</value>
+</data>
+	<data name="Menu.FastFlags.Presets.IngameMenu.LanguageSelector.Description" xml:space="preserve">
+    <value>Allows players to disable interface translation.</value>
+</data>
+	<data name="Menu.FastFlags.Presets.IngameMenu.ChatTranslation.Description" xml:space="preserve">
+    <value>Disables automatic translation of chat messages.</value>
+</data>
+	<data name="Menu.FastFlags.Presets.FlagState.Title" xml:space="preserve">
+    <value>Flag state</value>
+</data>
+	<data name="Menu.FastFlags.Presets.FlagState.Description" xml:space="preserve">
+    <value>Show values of specified flags during runtime. Each flag is comma separated.</value>
+</data>
+	<data name="Common.Studio" xml:space="preserve">
     <value>Studio</value>
   </data>
   <data name="Common.RobloxStudio" xml:space="preserve">
@@ -1430,4 +1457,10 @@ Please close any applications that may be using Roblox's files, and relaunch.</v
 	<data name="Common.Time" xml:space="preserve">
     <value>Time</value>
   </data>
+  <data name="Menu.Channel.VersionHash.Title" xml:space="preserve">
+    <value>Version hash</value>
+  </data>
+	<data name="Menu.Channel.VersionHash.Desription" xml:space="preserve">
+    <value>Force Fishstrap to download version from specific hash. Please do not change if you have no idea what this does.</value>
+  </data>
 </root>
diff --git a/Bloxstrap/UI/Elements/Settings/Pages/ChannelPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/ChannelPage.xaml
@@ -56,6 +56,13 @@
             <ui:ToggleSwitch IsChecked="{Binding UpdateRoblox, Mode=TwoWay}" />
         </controls:OptionControl>
 
+        <controls:OptionControl 
+    x:Name="FlagStateOption"
+    Header="{x:Static resources:Strings.Menu_Channel_VersionHash_Title}" 
+    Description="{x:Static resources:Strings.Menu_Channel_VersionHash_Desription}">
+            <ui:TextBox Width="200" Padding="10,5,10,5" Text="{Binding FlagState, Mode=TwoWay}"  />
+        </controls:OptionControl>
+
         <ui:CardExpander Margin="0,8,0,0" IsExpanded="True">
             <ui:CardExpander.Header>
                 <Grid>
@@ -102,9 +109,6 @@
                     <TextBlock Grid.Row="1" Grid.Column="0" Margin="0,0,16,8" VerticalAlignment="Center" Text="{x:Static resources:Strings.Common_VersionGuid}" />
                     <TextBlock Grid.Row="1" Grid.Column="1" Foreground="{DynamicResource TextFillColorTertiaryBrush}" Text="{Binding ChannelDeployInfo.VersionGuid, Mode=OneWay}" />
 
-                    <TextBlock Grid.Row="2" Grid.Column="0" Margin="0,0,16,8" VerticalAlignment="Center" Text="Version Hash" />
-                    <ui:TextBox Grid.Row="2" Grid.Column="1" Margin="-380,0,0,0" Width="200" Text="{Binding ChannelHash, UpdateSourceTrigger=PropertyChanged, Delay=250}"/>
-
                     <StackPanel Grid.Row="3" Grid.ColumnSpan="2" Margin="0,16,0,0" Orientation="Horizontal">
                         <StackPanel.Style>
                             <Style TargetType="StackPanel">

diff --git a/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml
@@ -43,8 +43,8 @@
 
         <controls:OptionControl 
     x:Name="FlagStateOption"
-    Header="Flag state" 
-    Description="Shows you value of a fflag. To show multiple fflags use ',' between.">
+    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_FlagState_Title}" 
+    Description="{x:Static resources:Strings.Menu_FastFlags_Presets_FlagState_Description}">
             <ui:TextBox Width="200" Padding="10,5,10,5" Text="{Binding FlagState, Mode=TwoWay}"  />
         </controls:OptionControl>
 
@@ -162,8 +162,8 @@
                 </controls:OptionControl>
 
                 <controls:OptionControl
-    Header="Chrome UI" 
-    Description="When disabled Roblox will use old top bar."
+    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_Chromeui_Title}" 
+    Description="{x:Static resources:Strings.Menu_FastFlags_Presets_Chromeui_Description}"
     HelpLink="https://devforum.roblox.com/t/updated-experience-controls-now-live/3215981">
                     <ui:ToggleSwitch IsChecked="{Binding ChromeUI, Mode=TwoWay}" />
                 </controls:OptionControl>
@@ -200,27 +200,33 @@
 
             <StackPanel>
                 <controls:OptionControl 
-    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_VRToggle_Title}">
+    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_VRToggle_Title}"
+    Description="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_VRToggle_Description}">
                     <ui:ToggleSwitch IsChecked="{Binding VRToggle, Mode=TwoWay}" />
                 </controls:OptionControl>
                 <controls:OptionControl 
-    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_SoothsayerCheck_Title}">
+    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_SoothsayerCheck_Title}"
+    Description="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_SoothsayerCheck_Description}">
                     <ui:ToggleSwitch IsChecked="{Binding SoothsayerCheck, Mode=TwoWay}" />
                 </controls:OptionControl>
                 <controls:OptionControl 
-    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_LanguageSelector_Title}">
+    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_LanguageSelector_Title}"
+    Description="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_LanguageSelector_Description}">
                     <ui:ToggleSwitch IsChecked="{Binding LanguageSelector, Mode=TwoWay}" />
                 </controls:OptionControl>
                 <controls:OptionControl 
-    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_Haptics_Title}">
+    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_Haptics_Title}"
+    Description="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_Haptics_Description}">
                     <ui:ToggleSwitch IsChecked="{Binding Haptics, Mode=TwoWay}" />
                 </controls:OptionControl>
                 <controls:OptionControl 
-    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_Framerate_Title}">
+    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_Framerate_Title}"
+    Description="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_Framerate_Description}">
                     <ui:ToggleSwitch IsChecked="{Binding Framerate, Mode=TwoWay}" />
                 </controls:OptionControl>
                 <controls:OptionControl 
-    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_ChatTranslation_Title}">
+    Header="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_ChatTranslation_Title}"
+    Description="{x:Static resources:Strings.Menu_FastFlags_Presets_IngameMenu_ChatTranslation_Description}">
                     <ui:ToggleSwitch IsChecked="{Binding ChatTranslation, Mode=TwoWay}" />
                 </controls:OptionControl>
             </StackPanel>

diff --git a/Bloxstrap/UI/ViewModels/Settings/ChannelViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/ChannelViewModel.cs
@@ -21,8 +21,6 @@ public bool UpdateCheckingEnabled
 
         private async Task LoadChannelDeployInfo(string channel)
         {
-            const string LOG_IDENT = "ChannelViewModel::LoadChannelDeployInfo";
-
             ShowLoadingError = false;
             OnPropertyChanged(nameof(ShowLoadingError));
 
@@ -49,27 +47,12 @@ private async Task LoadChannelDeployInfo(string channel)
 
                 OnPropertyChanged(nameof(ChannelDeployInfo));
             }
-            catch (HttpResponseException ex)
-            {
-                ShowLoadingError = true;
-                OnPropertyChanged(nameof(ShowLoadingError));
-
-                ChannelInfoLoadingText = ex.ResponseMessage.StatusCode switch
-                {
-                    HttpStatusCode.NotFound => "The specified channel name does not exist.",
-                    _ => $"Failed to fetch information! (HTTP {(int)ex.ResponseMessage.StatusCode} - {ex.ResponseMessage.ReasonPhrase})",
-                };
-                OnPropertyChanged(nameof(ChannelInfoLoadingText));
-            }
             catch (Exception ex)
             {
-                App.Logger.WriteLine(LOG_IDENT, "An exception occurred while fetching channel information");
-                App.Logger.WriteException(LOG_IDENT, ex);
-
                 ShowLoadingError = true;
                 OnPropertyChanged(nameof(ShowLoadingError));
 
-                ChannelInfoLoadingText = $"Failed to fetch information! ({ex.Message})";
+                ChannelInfoLoadingText = "The channel is likely privated. Use version hash or change channel or try again later.\n"+ex.Message;
                 OnPropertyChanged(nameof(ChannelInfoLoadingText));
             }
         }

diff --git a/Bloxstrap/Utilities.cs b/Bloxstrap/Utilities.cs
@@ -64,7 +64,9 @@ public static VersionComparison CompareVersions(string versionStr1, string versi
 
         public static string GetRobloxVersion(bool studio)
         {
-            string fileName = studio ? "Studio/RobloxStudioBeta.exe" : "Player/eurotrucks2.exe";
+            string clientName = App.Settings.Prop.RenameClientToEuroTrucks2 ? "eurotrucks2.exe" : "RobloxPlayerBeta.exe";
+
+            string fileName = studio ? "Studio/RobloxStudioBeta.exe" : $"Player/{clientName}";
 
             string playerLocation = Path.Combine(Paths.Roblox, fileName);