Skip to content

Commit 4a6379c

Browse files
RealMeddsamRealMeddsam
committed
v1.2.6.0
1 parent 8a123d0 commit 4a6379c

64 files changed

Lines changed: 1591 additions & 4735 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci-release.yml‎

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ jobs:
55
build:
66
runs-on: windows-latest
77

8-
outputs:
9-
artifact-id: ${{ steps.upload-artifact.outputs.artifact-id }}
10-
118
steps:
129
- uses: actions/checkout@v4
1310
with:
@@ -27,10 +24,9 @@ jobs:
2724
run: dotnet publish -p:PublishSingleFile=true -p:CommitHash=${{ github.sha }} -p:CommitRef=${{ github.ref_type }}/${{ github.ref_name }} -r win-x64 -c Release --self-contained false .\Bloxstrap\Bloxstrap.csproj
2825

2926
- name: Upload Artifact
30-
id: upload-artifact
3127
uses: actions/upload-artifact@v4
3228
with:
33-
name: Froststrap (Release) (${{ github.sha }})
29+
name: Froststrap(Release) (${{ github.sha }})
3430
path: .\Bloxstrap\bin\Release\net6.0-windows\win-x64\publish\*
3531

3632
release:
@@ -41,27 +37,21 @@ jobs:
4137
contents: write
4238

4339
steps:
44-
- name: Sign and download artifact
45-
uses: signpath/github-action-submit-signing-request@v1.1
40+
- name: Download artifact
41+
uses: actions/download-artifact@v4
4642
with:
47-
api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
48-
organization-id: '837ad744-6d64-4d44-94ef-65a9a2d09399'
49-
project-slug: 'Froststrap'
50-
signing-policy-slug: 'test-signing'
51-
artifact-configuration-slug: 'github-ci'
52-
github-artifact-id: ${{ needs.build.outputs.artifact-id }}
53-
wait-for-completion: true
54-
output-artifact-directory: 'signed'
43+
name: Froststrap(Release) (${{ github.sha }})
44+
path: release
5545

5646
- name: Rename binaries
57-
run: mv signed/Bloxstrap.exe Froststrap-${{ github.ref_name }}.exe
47+
run: mv release/Froststrap.exe Froststrap-${{ github.ref_name }}.exe
5848

5949
- name: Create release
6050
uses: softprops/action-gh-release@v2
6151
with:
6252
draft: true
6353
files: Froststrap-${{ github.ref_name }}.exe
64-
name: Froststrap ${{ github.ref_name }}
54+
name: Froststrap${{ github.ref_name }}
6555
fail_on_unmatched_files: true
6656

6757
release-test:
@@ -72,25 +62,19 @@ jobs:
7262
contents: write
7363

7464
steps:
75-
- name: Sign and download artifact
76-
uses: signpath/github-action-submit-signing-request@v1.1
65+
- name: Download artifact
66+
uses: actions/download-artifact@v4
7767
with:
78-
api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
79-
organization-id: '837ad744-6d64-4d44-94ef-65a9a2d09399'
80-
project-slug: 'Froststrap'
81-
signing-policy-slug: 'test-signing'
82-
artifact-configuration-slug: 'github-ci'
83-
github-artifact-id: ${{ needs.build.outputs.artifact-id }}
84-
wait-for-completion: true
85-
output-artifact-directory: 'signed'
68+
name: Froststrap(Release) (${{ github.sha }})
69+
path: release
8670

8771
- name: Rename binaries
88-
run: mv signed/Bloxstrap.exe Froststrap-${{ github.ref_name }}.exe
72+
run: mv release/Froststrap.exe Froststrap-${{ github.ref_name }}.exe
8973

9074
- name: Create release
9175
uses: softprops/action-gh-release@v2
9276
with:
9377
draft: true
9478
files: Froststrap-${{ github.ref_name }}.exe
95-
name: Froststrap ${{ github.ref_name }}
79+
name: Froststrap${{ github.ref_name }}
9680
fail_on_unmatched_files: true

‎Bloxstrap/App.xaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
<converters:StringFormatConverter x:Key="StringFormatConverter" />
3939
<converters:RangeConverter x:Key="RangeConverter" />
4040
<converters:EnumNameConverter x:Key="EnumNameConverter" />
41+
<converters:EnumToVisibilityConverter x:Key="EnumToVisibilityConverter" />
42+
<converters:SettingsControlTemplateSelector x:Key="SettingsControlSelector" />
4143
<converters:HexToColorConverter x:Key="HexToColorConverter" />
4244
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
4345
<converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter" />

‎Bloxstrap/App.xaml.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ public partial class App : Application
6868

6969
public static readonly FastFlagManager FastFlags = new();
7070

71+
public static readonly GBSEditor GlobalSettings = new();
72+
7173
public static readonly HttpClient HttpClient = new(
7274
new HttpClientLoggingHandler(
7375
new HttpClientHandler { AutomaticDecompression = DecompressionMethods.All }
@@ -411,11 +413,13 @@ protected override void OnStartup(StartupEventArgs e)
411413
Terminate();
412414
}
413415

416+
Task.Run(App.RemoteData.LoadData); // ok
417+
414418
Settings.Load();
415419
State.Load();
416420
RobloxState.Load();
417421
FastFlags.Load();
418-
Task.Run(App.RemoteData.LoadData); // ok
422+
GlobalSettings.Load();
419423

420424
if (!Locale.SupportedLocales.ContainsKey(Settings.Prop.Locale))
421425
{

‎Bloxstrap/Bloxstrap.csproj‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<UseWPF>true</UseWPF>
88
<UseWindowsForms>True</UseWindowsForms>
99
<ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
10-
<Version>1.2.5.0</Version>
11-
<FileVersion>1.2.5.0</FileVersion>
10+
<Version>1.2.6.0</Version>
11+
<FileVersion>1.2.6.0</FileVersion>
1212
<ApplicationManifest>app.manifest</ApplicationManifest>
1313
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1414
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
@@ -21,7 +21,7 @@
2121
<Resource Include="Bloxstrap.ico" />
2222
<Resource Include="Resources\Checkmark.ico" />
2323
<Resource Include="Resources\CrossMark.ico" />
24-
<Resource Include="Resources\People.png" />
24+
<Resource Include="Resources\People.png" />
2525
<Resource Include="Resources\Froststrap Custom Background.png" />
2626
<Resource Include="Resources\LightEditor.xshd" />
2727
<Resource Include="Resources\Fonts\NotoSansThai-VariableFont_wdth,wght.ttf" />
@@ -33,12 +33,6 @@
3333
<Resource Include="Resources\MessageBox\Information.png" />
3434
<Resource Include="Resources\MessageBox\Question.png" />
3535
<Resource Include="Resources\MessageBox\Warning.png" />
36-
<Resource Include="Resources\PCTweaks\CPU.png" />
37-
<Resource Include="Resources\PCTweaks\GPU.png" />
38-
<Resource Include="Resources\PCTweaks\Network.png" />
39-
<Resource Include="Resources\PCTweaks\Performance.png" />
40-
<Resource Include="Resources\PCTweaks\Privacy.png" />
41-
<Resource Include="Resources\PCTweaks\Warning.png" />
4236
<EmbeddedResource Include="Resources\FroststrapPowerPlans\FroststrapLowLatency.pow" />
4337
<EmbeddedResource Include="Resources\FroststrapPowerPlans\FroststrapMaximumFPS.pow" />
4438
<EmbeddedResource Include="Resources\mappings.json" />

‎Bloxstrap/Bootstrapper.cs‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,11 @@ public async Task Run()
264264

265265
if (!_noConnection)
266266
{
267+
if (App.RemoteData.LoadedState == GenericTriState.Unknown) // we dont want it to flicker
268+
SetStatus(Strings.Bootstrapper_Status_WaitingForData);
269+
270+
await SetupPackageDictionaries(); // mods also require it
271+
267272
// we are checking if eurotrucks2 exists in client directory
268273
if (
269274
File.Exists(Path.Combine(AppData.Directory, App.RobloxAnselAppName))
@@ -1333,11 +1338,6 @@ private async Task UpgradeRoblox()
13331338
return;
13341339
}
13351340

1336-
if (App.RemoteData.LoadedState == GenericTriState.Unknown) // we dont want it to flicker
1337-
SetStatus(Strings.Bootstrapper_Status_WaitingForData);
1338-
1339-
await SetupPackageDictionaries();
1340-
13411341
if (String.IsNullOrEmpty(AppData.State.VersionGuid))
13421342
SetStatus(Strings.Bootstrapper_Status_Installing);
13431343
else
@@ -1622,7 +1622,7 @@ private async Task<bool> ApplyModifications()
16221622

16231623
App.Logger.WriteLine(LOG_IDENT, $"Setting font for {jsonFilename}");
16241624

1625-
var fontFamilyData = JsonSerializer.Deserialize<Bloxstrap.Models.FontFamily>(File.ReadAllText(jsonFilePath));
1625+
var fontFamilyData = JsonSerializer.Deserialize<Models.FontFamily>(File.ReadAllText(jsonFilePath));
16261626

16271627
if (fontFamilyData is null)
16281628
continue;
@@ -1709,23 +1709,19 @@ private async Task<bool> ApplyModifications()
17091709
if (modFolderFiles.Contains(fileLocation))
17101710
continue;
17111711

1712-
if (PackageDirectoryMap == null || PackageDirectoryMap.Count == 0)
1713-
{
1714-
App.Logger.WriteLine(LOG_IDENT, "PackageDirectoryMap is null or empty, skipping package restoration check");
1715-
continue;
1716-
}
1717-
1718-
var packageMapEntry = PackageDirectoryMap
1719-
.SingleOrDefault(x => !String.IsNullOrEmpty(x.Value) && fileLocation.StartsWith(x.Value));
1720-
1712+
var packageMapEntry = PackageDirectoryMap.SingleOrDefault(x => !String.IsNullOrEmpty(x.Value) && fileLocation.StartsWith(x.Value));
17211713
string packageName = packageMapEntry.Key;
17221714

1715+
// package doesn't exist, likely mistakenly placed file
17231716
if (String.IsNullOrEmpty(packageName))
17241717
{
17251718
App.Logger.WriteLine(LOG_IDENT, $"{fileLocation} was removed as a mod but does not belong to a package");
1719+
17261720
string versionFileLocation = Path.Combine(_latestVersionDirectory, fileLocation);
1721+
17271722
if (File.Exists(versionFileLocation))
17281723
File.Delete(versionFileLocation);
1724+
17291725
continue;
17301726
}
17311727

0 commit comments

Comments
 (0)