(Chore) Update 3.2.0 v1

tsukiforge · tsukiforge · commit 8d918fbfeab3 · 2026-05-20T10:18:36.000+07:00
diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj
@@ -7,8 +7,8 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>True</UseWindowsForms>
     <ApplicationIcon>BoneFish.ico</ApplicationIcon>
-    <Version>3.1.0</Version>
-    <FileVersion>3.1.0</FileVersion>
+    <Version>3.2.0</Version>
+    <FileVersion>3.2.0</FileVersion>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs
@@ -663,6 +663,9 @@ private async Task<string> GetBetterMatchmakingServerID()
             if (datacenters == null || !datacenters.Any())
                 throw new HttpRequestException("No datacenters in response.");
 
+            if (string.IsNullOrEmpty(ipinfo.Loc) || !ipinfo.Loc.Contains(','))
+                throw new HttpRequestException("Location coordinate is blank or invalid.");
+
             string[] location = ipinfo.Loc.Split(",");
             double lat1 = double.Parse(location[0], CultureInfo.InvariantCulture);
             double lon1 = double.Parse(location[1], CultureInfo.InvariantCulture);
diff --git a/Bloxstrap/Installer.cs b/Bloxstrap/Installer.cs
@@ -1,4 +1,4 @@
-﻿using System.IO;
+using System.IO;
 using System.Windows;
 using System.Xml.Linq;
 using Bloxstrap.AppData;
@@ -450,8 +450,18 @@ public static void HandleUpgrade()
             {
                 if (!ipl.IsAcquired)
                 {
-                    App.Logger.WriteLine(LOG_IDENT, "Failed to update! (Could not obtain singleton mutex)");
-                    return;
+                    App.Logger.WriteLine(LOG_IDENT, "Failed to obtain AutoUpdater mutex, trying to kill locking processes...");
+                    Utilities.KillProcessesRunningFrom(Paths.Application);
+                    
+                    if (!ipl.RetryAcquire(TimeSpan.FromSeconds(3)))
+                    {
+                        App.Logger.WriteLine(LOG_IDENT, "Failed to update! (Could not obtain singleton mutex)");
+                        Frontend.ShowMessageBox(
+                            "BoneFish failed to update because another instance of the application is running and could not be closed. Please close any background BoneFish processes and try again.",
+                            MessageBoxImage.Error
+                        );
+                        return;
+                    }
                 }
             }
 
@@ -469,11 +479,17 @@ public static void HandleUpgrade()
                     if (i == 1)
                     {
                         App.Logger.WriteLine(LOG_IDENT, "Waiting for write permissions to update version");
+                        Utilities.KillProcessesRunningFrom(Paths.Application);
                     }
                     else if (i == 10)
                     {
                         App.Logger.WriteLine(LOG_IDENT, "Failed to update! (Could not get write permissions after 10 tries/5 seconds)");
                         App.Logger.WriteException(LOG_IDENT, ex);
+
+                        Frontend.ShowMessageBox(
+                            "BoneFish failed to apply the update because the application file is locked or in use. Please close any background BoneFish processes and try again.",
+                            MessageBoxImage.Error
+                        );
                         return;
                     }
 
diff --git a/Bloxstrap/UI/Elements/About/MainWindow.xaml b/Bloxstrap/UI/Elements/About/MainWindow.xaml
@@ -1,4 +1,4 @@
-﻿<base:WpfUiWindow x:Class="Bloxstrap.UI.Elements.About.MainWindow"
+<base:WpfUiWindow x:Class="Bloxstrap.UI.Elements.About.MainWindow"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -7,6 +7,7 @@
              xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
              xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
              xmlns:resources="clr-namespace:Bloxstrap.Resources"
+             xmlns:models="clr-namespace:Bloxstrap.UI.ViewModels"
              mc:Ignorable="d"
              Title="{x:Static resources:Strings.About_Title}"
              Background="{ui:ThemeResource ApplicationBackgroundBrush}"
@@ -42,6 +43,9 @@
                         <TextBlock x:Name="TranslatorsText" Text="{x:Static resources:Strings.About_Translators_Title}" FontSize="10" />
                     </ui:NavigationItem>
                     <ui:NavigationItem Content="{x:Static resources:Strings.About_Licenses_Title}" PageType="{x:Type pages:LicensesPage}" Icon="Code24" Tag="licenses" Margin="0,0,0,12" />
+                    <ui:NavigationItem Content="Donasi (Saweria)" Icon="Heart24" Command="{x:Static models:GlobalViewModel.OpenWebpageCommand}" CommandParameter="https://saweria.co/MahiroDev" Margin="0,0,0,12" />
+                    <ui:NavigationItem Content="Donasi (SociaBuzz)" Icon="Heart24" Command="{x:Static models:GlobalViewModel.OpenWebpageCommand}" CommandParameter="https://sociabuzz.com/zuax" Margin="0,0,0,12" />
+                    <ui:NavigationItem Content="Original Repo" Icon="Code24" Command="{x:Static models:GlobalViewModel.OpenWebpageCommand}" CommandParameter="https://github.com/fishstrap/fishstrap" Margin="0,0,0,12" />
                 </ui:NavigationStore.Items>
             </ui:NavigationStore>
 
diff --git a/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml b/Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml
@@ -1,4 +1,4 @@
-﻿<ui:UiPage x:Class="Bloxstrap.UI.Elements.About.Pages.AboutPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Elements.About.Pages.AboutPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -39,17 +39,18 @@
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" Text="Fishstrap" Margin="0,0,4,0" FontSize="24" FontWeight="Medium" />
+                    <TextBlock Grid.Column="0" Text="BoneFish" Margin="0,0,4,0" FontSize="24" FontWeight="Medium" />
                     <TextBlock Grid.Column="1" Text="{Binding Version, Mode=OneTime}" Margin="4,0,0,2" VerticalAlignment="Bottom" FontSize="16" FontWeight="Medium" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
                 </Grid>
-                <TextBlock Text="{x:Static resources:Strings.Menu_About_Description}" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
+                <TextBlock Text="A fork of Fishstrap (Original Bloxstrap continuation)" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
             </StackPanel>
         </Grid>
 
         <WrapPanel HorizontalAlignment="Center" Orientation="Horizontal">
-            <ui:Anchor Margin="0,0,8,8" Content="{x:Static resources:Strings.Menu_About_GithubRepository}" Icon="Code24" NavigateUri="https://github.com/fishstrap/fishstrap" />
+            <ui:Anchor Margin="0,0,8,8" Content="GitHub Repository" Icon="Code24" NavigateUri="https://github.com/faizinuha/BoneFish" />
+            <ui:Anchor Margin="0,0,8,8" Content="Original Project (Fishstrap)" Icon="Branch24" NavigateUri="https://github.com/fishstrap/fishstrap" />
             <ui:Anchor Margin="0,0,8,8" Content="{x:Static resources:Strings.Menu_About_HelpInformation}" Icon="BookQuestionMark24" NavigateUri="https://github.com/bloxstraplabs/bloxstrap/wiki" />
-            <ui:Anchor Margin="0,0,8,8" Content="{x:Static resources:Strings.Menu_About_ReportIssue}" Icon="BookExclamationMark24" NavigateUri="https://github.com/fishstrap/fishstrap/issues" />
+            <ui:Anchor Margin="0,0,8,8" Content="{x:Static resources:Strings.Menu_About_ReportIssue}" Icon="BookExclamationMark24" NavigateUri="https://github.com/faizinuha/BoneFish/issues" />
             <ui:Anchor Margin="0,0,0,8" Content="{x:Static resources:Strings.Menu_About_DiscordServer}" Icon="Chat48" NavigateUri="https://discord.gg/xSsamjAU84" />
         </WrapPanel>
 
diff --git a/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/FastFlagsPage.xaml
@@ -76,6 +76,18 @@
             <ui:ToggleSwitch IsChecked="{Binding ResetConfiguration, Mode=TwoWay}" />
         </controls:OptionControl>
 
+        <controls:OptionControl 
+            Header="Nonaktifkan Animasi UI Roblox"
+            Description="Menonaktifkan animasi menu ESC dan transisi UI lainnya untuk memperingan game.">
+            <ui:ToggleSwitch IsChecked="{Binding DisableRobloxAnimations, Mode=TwoWay}" />
+        </controls:OptionControl>
+
+        <controls:OptionControl 
+            Header="Mode Memori Rendah Roblox"
+            Description="Mengoptimalkan penggunaan RAM Roblox agar lebih ringan pada PC spek rendah.">
+            <ui:ToggleSwitch IsChecked="{Binding EnableLowMemoryMode, Mode=TwoWay}" />
+        </controls:OptionControl>
+
         <TextBlock Text="{x:Static resources:Strings.Common_Presets}" FontSize="20" FontWeight="Medium" Margin="0,16,0,0" />
 
         <TextBlock Text="{x:Static resources:Strings.Common_Geometry}" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" />
diff --git a/Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml
@@ -97,6 +97,8 @@
             </StackPanel>
         </controls:OptionControl>
 
+        <TextBlock Text="Kustomisasi Gambar" FontSize="20" FontWeight="Medium" Margin="0,16,0,0" />
+
         <controls:OptionControl 
             Header="{x:Static resources:Strings.Menu_Mods_Misc_CustomBackground_Title}" 
             Description="{x:Static resources:Strings.Menu_Mods_Misc_CustomBackground_Description}">
diff --git a/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/FastFlagsViewModel.cs
@@ -184,6 +184,44 @@ public bool ResetConfiguration
             }
         }
 
+        public bool DisableRobloxAnimations
+        {
+            get => App.FastFlags.GetValue("FFlagRenderUIAnimations") == "False";
+            set
+            {
+                if (value)
+                {
+                    App.FastFlags.SetValue("FFlagRenderUIAnimations", "False");
+                    App.FastFlags.SetValue("FFlagRenderMenuTransitions", "False");
+                    App.FastFlags.SetValue("FFlagRenderInventoryEffects", "False");
+                }
+                else
+                {
+                    App.FastFlags.SetValue("FFlagRenderUIAnimations", null);
+                    App.FastFlags.SetValue("FFlagRenderMenuTransitions", null);
+                    App.FastFlags.SetValue("FFlagRenderInventoryEffects", null);
+                }
+                OnPropertyChanged(nameof(DisableRobloxAnimations));
+            }
+        }
+
+        public bool EnableLowMemoryMode
+        {
+            get => App.FastFlags.GetValue("FFlagLuaAppEnableLowMemoryMode") == "True";
+            set
+            {
+                if (value)
+                {
+                    App.FastFlags.SetValue("FFlagLuaAppEnableLowMemoryMode", "True");
+                }
+                else
+                {
+                    App.FastFlags.SetValue("FFlagLuaAppEnableLowMemoryMode", null);
+                }
+                OnPropertyChanged(nameof(EnableLowMemoryMode));
+            }
+        }
+
         public string SelectedPreset
         {
             get => App.Settings.Prop.SelectedPerformancePreset;
@@ -214,6 +252,8 @@ private void ApplyRecommendedFastFlags()
             MeshQuality = 0;
             FRMQualityOverrideEnabled = true;
             FRMQualityOverride = 21;
+            DisableRobloxAnimations = true;
+            EnableLowMemoryMode = true;
 
             SelectedPreset = "AutoOptimize";
             RequestPageReloadEvent?.Invoke(this, EventArgs.Empty);
@@ -273,6 +313,9 @@ private void ApplyUltraLowSpecPreset()
             App.FastFlags.SetValue("FIntRenderLocalLightUpdatesMin", "1");
             App.FastFlags.SetValue("DFIntTextureCompositorActiveJobs", "1");
 
+            DisableRobloxAnimations = true;
+            EnableLowMemoryMode = true;
+
             ApplyRecommendedNetworkSettings();
             App.Settings.Prop.BackgroundUpdatesEnabled = false;
             App.Settings.Prop.FakeBorderlessFullscreen = false;
diff --git a/Bloxstrap/Utilities.cs b/Bloxstrap/Utilities.cs
@@ -1,4 +1,4 @@
-﻿using Bloxstrap.AppData;
+using Bloxstrap.AppData;
 using System.ComponentModel;
 
 namespace Bloxstrap
@@ -161,5 +161,40 @@ public static void KillBackgroundUpdater()
             using EventWaitHandle handle = new EventWaitHandle(false, EventResetMode.AutoReset, "Bloxstrap-BackgroundUpdaterKillEvent");
             handle.Set();
         }
+
+        public static void KillProcessesRunningFrom(string filePath)
+        {
+            const string LOG_IDENT = "Utilities::KillProcessesRunningFrom";
+            int currentPid = Environment.ProcessId;
+            string targetPath = Path.GetFullPath(filePath);
+            string processName = Path.GetFileNameWithoutExtension(filePath);
+
+            foreach (var process in GetProcessesSafe())
+            {
+                try
+                {
+                    if (process.Id == currentPid)
+                        continue;
+
+                    if (!string.Equals(process.ProcessName, processName, StringComparison.OrdinalIgnoreCase))
+                        continue;
+
+                    string? processPath = process.MainModule?.FileName;
+                    if (string.IsNullOrEmpty(processPath))
+                        continue;
+
+                    if (string.Equals(Path.GetFullPath(processPath), targetPath, StringComparison.OrdinalIgnoreCase))
+                    {
+                        App.Logger.WriteLine(LOG_IDENT, $"Killing locking process '{process.ProcessName}' (pid={process.Id}) running from {processPath}");
+                        process.Kill();
+                        process.WaitForExit(2000);
+                    }
+                }
+                catch (Exception)
+                {
+                    // Access denied or process exited, ignore
+                }
+            }
+        }
     }
 }
diff --git a/Bloxstrap/Utility/InterProcessLock.cs b/Bloxstrap/Utility/InterProcessLock.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -28,6 +28,23 @@ public InterProcessLock(string name, TimeSpan timeout)
             }
         }
 
+        public bool RetryAcquire(TimeSpan timeout)
+        {
+            if (IsAcquired)
+                return true;
+
+            try
+            {
+                IsAcquired = Mutex.WaitOne(timeout);
+            }
+            catch (AbandonedMutexException)
+            {
+                IsAcquired = true;
+            }
+
+            return IsAcquired;
+        }
+
         public void Dispose()
         {
             if (IsAcquired)
diff --git a/Bloxstrap/Watcher.cs b/Bloxstrap/Watcher.cs
@@ -7,6 +7,8 @@ public class Watcher : IDisposable
     {
         private readonly InterProcessLock _lock = new("Watcher");
 
+        private readonly System.Threading.EventWaitHandle _exitEvent = new(false, System.Threading.EventResetMode.AutoReset, "BoneFish-WatcherExitEvent");
+
         private readonly WatcherData? _watcherData;
         
         private readonly NotifyIconWrapper? _notifyIcon;
@@ -24,7 +26,31 @@ public Watcher()
 
             if (!_lock.IsAcquired)
             {
-                App.Logger.WriteLine(LOG_IDENT, "Watcher instance already exists");
+                App.Logger.WriteLine(LOG_IDENT, "Watcher instance already exists, signaling it to exit...");
+                try
+                {
+                    _exitEvent.Set();
+                }
+                catch (Exception ex)
+                {
+                    App.Logger.WriteException(LOG_IDENT, ex);
+                }
+
+                if (_lock.RetryAcquire(TimeSpan.FromSeconds(2)))
+                {
+                    App.Logger.WriteLine(LOG_IDENT, "Successfully took over Watcher lock.");
+                }
+                else
+                {
+                    App.Logger.WriteLine(LOG_IDENT, "Failed to acquire Watcher lock after signal. Force closing other instances...");
+                    Utilities.KillProcessesRunningFrom(Paths.Process);
+                    _lock.RetryAcquire(TimeSpan.FromSeconds(1));
+                }
+            }
+
+            if (!_lock.IsAcquired)
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Watcher instance still exists, aborting watcher startup.");
                 return;
             }
 
@@ -131,8 +157,21 @@ public async Task Run()
             if (App.Settings.Prop.EnableSystemTrayOnClose)
             {
                 _notifyIcon?.ShowAlert("BoneFish", "Roblox telah ditutup. BoneFish masih berjalan di system tray.", 5, null);
-                // Menunggu sampai user klik Exit dari context menu
-                await SystemTrayExitSignal.Task;
+                // Menunggu sampai user klik Exit dari context menu ATAU ada watcher baru yang menyuruh kita exit
+                var exitSignalTask = SystemTrayExitSignal.Task;
+                var externalExitTask = Task.Run(() => {
+                    try
+                    {
+                        _exitEvent.WaitOne();
+                        return true;
+                    }
+                    catch
+                    {
+                        return false;
+                    }
+                });
+
+                await Task.WhenAny(exitSignalTask, externalExitTask);
             }
 
             if (_watcherData.AutoclosePids is not null)
@@ -154,6 +193,15 @@ public void Dispose()
 
             App.State.Prop.WatcherRunning = false;
 
+            try
+            {
+                _exitEvent.Dispose();
+            }
+            catch (Exception)
+            {
+                // Ignore disposal exceptions
+            }
+
             GC.SuppressFinalize(this);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.IO;`
	`1`	`+using System.IO;`
`2`	`2`	`using System.Windows;`
`3`	`3`	`using System.Xml.Linq;`
`4`	`4`	`using Bloxstrap.AppData;`
`@@ -450,8 +450,18 @@ public static void HandleUpgrade()`
`450`	`450`	`{`
`451`	`451`	`if (!ipl.IsAcquired)`
`452`	`452`	`{`
`453`		`- App.Logger.WriteLine(LOG_IDENT, "Failed to update! (Could not obtain singleton mutex)");`
`454`		`- return;`
	`453`	`+ App.Logger.WriteLine(LOG_IDENT, "Failed to obtain AutoUpdater mutex, trying to kill locking processes...");`
	`454`	`+ Utilities.KillProcessesRunningFrom(Paths.Application);`
	`455`	`+`
	`456`	`+ if (!ipl.RetryAcquire(TimeSpan.FromSeconds(3)))`
	`457`	`+ {`
	`458`	`+ App.Logger.WriteLine(LOG_IDENT, "Failed to update! (Could not obtain singleton mutex)");`
	`459`	`+ Frontend.ShowMessageBox(`
	`460`	`+ "BoneFish failed to update because another instance of the application is running and could not be closed. Please close any background BoneFish processes and try again.",`
	`461`	`+ MessageBoxImage.Error`
	`462`	`+ );`
	`463`	`+ return;`
	`464`	`+ }`
`455`	`465`	`}`
`456`	`466`	`}`
`457`	`467`
`@@ -469,11 +479,17 @@ public static void HandleUpgrade()`
`469`	`479`	`if (i == 1)`
`470`	`480`	`{`
`471`	`481`	`App.Logger.WriteLine(LOG_IDENT, "Waiting for write permissions to update version");`
	`482`	`+ Utilities.KillProcessesRunningFrom(Paths.Application);`
`472`	`483`	`}`
`473`	`484`	`else if (i == 10)`
`474`	`485`	`{`
`475`	`486`	`App.Logger.WriteLine(LOG_IDENT, "Failed to update! (Could not get write permissions after 10 tries/5 seconds)");`
`476`	`487`	`App.Logger.WriteException(LOG_IDENT, ex);`
	`488`	`+`
	`489`	`+ Frontend.ShowMessageBox(`
	`490`	`+ "BoneFish failed to apply the update because the application file is locked or in use. Please close any background BoneFish processes and try again.",`
	`491`	`+ MessageBoxImage.Error`
	`492`	`+ );`
`477`	`493`	`return;`
`478`	`494`	`}`
`479`	`495`