Skip to content

Commit 562465e

Browse files
prevterprevter
committed
v.1.0.0
1 parent c0514a6 commit 562465e

File tree

14 files changed

+109
-67
lines changed

14 files changed

+109
-67
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.vs/
22
bin/
3-
FloatTool/obj/
3+
obj/

‎FloatTool/Assets/Found.wav‎

177 KB
Binary file not shown.

‎FloatTool/Common/Logger.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
- along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
using System;
19-
using System.Reflection;
2018
using log4net;
21-
using log4net.Repository.Hierarchy;
22-
using log4net.Core;
2319
using log4net.Appender;
20+
using log4net.Core;
2421
using log4net.Layout;
22+
using log4net.Repository.Hierarchy;
23+
using System.Reflection;
2524

2625
namespace FloatTool
2726
{
@@ -33,7 +32,8 @@ public static void Initialize()
3332
{
3433
Hierarchy hierarchy = (Hierarchy)LogManager.GetRepository();
3534

36-
PatternLayout patternLayout = new() {
35+
PatternLayout patternLayout = new()
36+
{
3737
ConversionPattern = "%date [%thread] %-5level - %message%newline"
3838
};
3939
patternLayout.ActivateOptions();

‎FloatTool/Common/Settings.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,29 +117,30 @@ public void Save()
117117
public void MigrateFromOldVersion()
118118
{
119119
// This method cleans up old settings and data
120-
List<string> oldFiles = new() {
121-
"debug.log",
122-
"FloatCore.dll",
120+
List<string> oldFiles = new()
121+
{
122+
"debug.log",
123+
"FloatCore.dll",
123124
"FloatTool.exe.config",
124125
"FloatTool.pdb",
125126
"itemData.json",
126127
"theme.json",
127128
"Updater.exe"
128129
};
129130

130-
foreach(var file in oldFiles)
131+
foreach (var file in oldFiles)
131132
{
132133
if (File.Exists(file))
133-
File.Delete(file);
134+
File.Delete(file);
134135
}
135136

136137
App.CleanOldFiles();
137138

138139
// Finally save that we migrated to not do this every time
139140
Migrated = true;
140141
Save();
141-
}
142-
142+
}
143+
143144
public override string ToString()
144145
{
145146
return $"{{LanguageCode: {LanguageCode}, Currency: {Currency}, ThemeURI: {ThemeURI}, Sound: {Sound}, CheckForUpdates: {CheckForUpdates}, DiscordRPC: {DiscordRPC}, ThreadCount: {ThreadCount}, HaveUpdated: {Migrated}}}";

‎FloatTool/Common/Skin.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public RelayCommand CopyCommand
158158
{
159159
return copyCommand ??= new RelayCommand(obj =>
160160
{
161-
Clipboard.SetText(WearValue.ToString(CultureInfo.InvariantCulture));
161+
Clipboard.SetText(WearValue.ToString("0.00000000000000", CultureInfo.InvariantCulture));
162162
});
163163
}
164164
}

‎FloatTool/Common/Utils.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static async Task<UpdateResult> CheckForUpdates()
6060
string response = await result.Content.ReadAsStringAsync();
6161
return JsonConvert.DeserializeObject<UpdateResult>(response);
6262
}
63-
catch(Exception ex)
63+
catch (Exception ex)
6464
{
6565
Logger.Log.Error("Failed to get latest version", ex);
6666
return null;
@@ -95,7 +95,7 @@ public static string ShortCpuName(string cpu)
9595
}
9696
}
9797

98-
#pragma warning disable IDE1006 // Naming Styles
98+
#pragma warning disable IDE1006 // Naming Styles
9999
public class UpdateResult
100100
{
101101
public class Asset
@@ -108,8 +108,8 @@ public class Asset
108108
public List<Asset> assets { get; set; }
109109
public string body { get; set; }
110110
}
111-
#pragma warning restore IDE1006 // Naming Styles
112-
111+
#pragma warning restore IDE1006 // Naming Styles
112+
113113
public class CraftSearchSetup
114114
{
115115
public decimal SearchTarget { get; set; }

‎FloatTool/FloatTool.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
<ApplicationIcon>Assets\Icon.ico</ApplicationIcon>
1515
<DebugType>embedded</DebugType>
1616
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
17-
<BaseOutputPath>$(SolutionDir)bin</BaseOutputPath>
1817
</PropertyGroup>
1918

2019
<ItemGroup>
20+
<None Remove="Assets\Found.wav" />
2121
<None Remove="Assets\SkinList.json" />
2222
</ItemGroup>
2323

@@ -26,6 +26,7 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29+
<EmbeddedResource Include="Assets\Found.wav" />
2930
<EmbeddedResource Include="Assets\SkinList.json" />
3031
</ItemGroup>
3132

‎FloatTool/ViewModels/MainViewModel.cs‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public string CombinationsLabel
136136
get { return $"{ParsedCombinations}/{TotalCombinations}"; }
137137
set { OnPropertyChanged(); }
138138
}
139-
139+
140140
public string CurrentSpeedLabel
141141
{
142142
get { return currentSpeed; }
@@ -146,27 +146,30 @@ public string CurrentSpeedLabel
146146
public string SearchFilter
147147
{
148148
get { return searchFilter; }
149-
set {
149+
set
150+
{
150151
searchFilter = value;
151-
OnPropertyChanged();
152+
OnPropertyChanged();
152153
}
153154
}
154155

155156
public int SkinCount
156157
{
157158
get { return skinCount; }
158-
set {
159-
skinCount = value;
160-
OnPropertyChanged();
159+
set
160+
{
161+
skinCount = value;
162+
OnPropertyChanged();
161163
}
162164
}
163165

164166
public int SkinSkipCount
165167
{
166168
get { return skinSkipCount; }
167-
set {
168-
skinSkipCount = value;
169-
OnPropertyChanged();
169+
set
170+
{
171+
skinSkipCount = value;
172+
OnPropertyChanged();
170173
}
171174
}
172175

@@ -287,7 +290,8 @@ public Visibility IsError
287290
set { isError = value; OnPropertyChanged(); }
288291
}
289292

290-
public float ProgressPercentage {
293+
public float ProgressPercentage
294+
{
291295
get { return progressPercentage; }
292296
set { progressPercentage = value; OnPropertyChanged(); }
293297
}
@@ -448,7 +452,7 @@ public MainViewModel(string weapon, string skin, string quality, string filter,
448452
FoundCombinations = new();
449453

450454
Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("FloatTool.Assets.SkinList.json")!;
451-
if (stream is null)
455+
if (stream is null)
452456
throw new NullReferenceException("Could not find SkinList.json");
453457

454458
using (StreamReader reader = new(stream))

‎FloatTool/ViewModels/SettingsViewModel.cs‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@ public bool CheckUpdates
6363
public bool DiscordRPC
6464
{
6565
get { return Settings.DiscordRPC; }
66-
set {
67-
Settings.DiscordRPC = value;
66+
set
67+
{
68+
Settings.DiscordRPC = value;
6869
OnPropertyChanged();
6970

7071
// Re-enabling does not work. Probably bug in the library
@@ -151,24 +152,34 @@ public int CurrentLanguage
151152
public static List<string> Languages { get; private set; }
152153
public static List<string> LanguageCodes = new()
153154
{
154-
"cs", "da",
155-
"de", "en",
156-
"es", "fi",
157-
"fr", "ga",
158-
"he", "hr",
159-
"it", "ja",
160-
"ka", "lt",
161-
"lv", "pl",
162-
"pt", "uk",
163-
"tr", "ru",
155+
"cs",
156+
"da",
157+
"de",
158+
"en",
159+
"es",
160+
"fi",
161+
"fr",
162+
"ga",
163+
"he",
164+
"hr",
165+
"it",
166+
"ja",
167+
"ka",
168+
"lt",
169+
"lv",
170+
"pl",
171+
"pt",
172+
"uk",
173+
"tr",
174+
"ru",
164175
"zh",
165176
};
166177

167178
public SettingsViewModel(Settings settings)
168179
{
169180
Settings = settings;
170181
Languages = new List<string>();
171-
182+
172183
foreach (var lang in LanguageCodes)
173184
{
174185
var locale = new System.Globalization.CultureInfo(lang);

‎FloatTool/Views/MainWindow.xaml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@
2020
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
2121
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
2222
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
23-
xmlns:draw="clr-namespace:System.Drawing;assembly=System.Drawing"
2423
xmlns:local="clr-namespace:FloatTool"
2524
xmlns:theme="clr-namespace:FloatTool.Theme"
26-
mc:Ignorable="d"
25+
mc:Ignorable="d" KeyUp="Window_KeyUp"
2726
MinWidth="875" MinHeight="420"
2827
Width="875" Height="420"
2928
WindowStartupLocation="CenterScreen"
@@ -303,7 +302,7 @@
303302
<ColumnDefinition/>
304303
<ColumnDefinition Width="Auto"/>
305304
</Grid.ColumnDefinitions>
306-
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
305+
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
307306
<Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
308307
<TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
309308
</Button>
@@ -313,7 +312,7 @@
313312
<ColumnDefinition/>
314313
<ColumnDefinition Width="Auto"/>
315314
</Grid.ColumnDefinitions>
316-
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
315+
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
317316
<Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
318317
<TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
319318
</Button>
@@ -323,7 +322,7 @@
323322
<ColumnDefinition/>
324323
<ColumnDefinition Width="Auto"/>
325324
</Grid.ColumnDefinitions>
326-
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
325+
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
327326
<Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
328327
<TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
329328
</Button>
@@ -333,7 +332,7 @@
333332
<ColumnDefinition/>
334333
<ColumnDefinition Width="Auto"/>
335334
</Grid.ColumnDefinitions>
336-
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
335+
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
337336
<Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
338337
<TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
339338
</Button>
@@ -343,7 +342,7 @@
343342
<ColumnDefinition/>
344343
<ColumnDefinition Width="Auto"/>
345344
</Grid.ColumnDefinitions>
346-
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
345+
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
347346
<Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
348347
<TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
349348
</Button>
@@ -353,7 +352,7 @@
353352
<ColumnDefinition/>
354353
<ColumnDefinition Width="Auto"/>
355354
</Grid.ColumnDefinitions>
356-
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
355+
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
357356
<Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
358357
<TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
359358
</Button>
@@ -363,7 +362,7 @@
363362
<ColumnDefinition/>
364363
<ColumnDefinition Width="Auto"/>
365364
</Grid.ColumnDefinitions>
366-
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
365+
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
367366
<Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
368367
<TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
369368
</Button>
@@ -373,7 +372,7 @@
373372
<ColumnDefinition/>
374373
<ColumnDefinition Width="Auto"/>
375374
</Grid.ColumnDefinitions>
376-
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
375+
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
377376
<Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
378377
<TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
379378
</Button>
@@ -383,7 +382,7 @@
383382
<ColumnDefinition/>
384383
<ColumnDefinition Width="Auto"/>
385384
</Grid.ColumnDefinitions>
386-
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
385+
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
387386
<Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
388387
<TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
389388
</Button>
@@ -393,7 +392,7 @@
393392
<ColumnDefinition/>
394393
<ColumnDefinition Width="Auto"/>
395394
</Grid.ColumnDefinitions>
396-
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
395+
<TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
397396
<Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
398397
<TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
399398
</Button>

0 commit comments

Comments
 (0)