v.1.0.0

Prevter · Apr 22, 2022 · 562465e · 562465e
1 parent c0514a6
commit 562465e
Show file tree

Hide file tree

Showing 14 changed files with 109 additions and 67 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 .vs/
 bin/
-FloatTool/obj/
+obj/
diff --git a/FloatTool/Assets/Found.wav b/FloatTool/Assets/Found.wav
diff --git a/FloatTool/Common/Logger.cs b/FloatTool/Common/Logger.cs
@@ -15,13 +15,12 @@
 - along with this program. If not, see <https://www.gnu.org/licenses/>.
 */
 
-using System;
-using System.Reflection;
 using log4net;
-using log4net.Repository.Hierarchy;
-using log4net.Core;
 using log4net.Appender;
+using log4net.Core;
 using log4net.Layout;
+using log4net.Repository.Hierarchy;
+using System.Reflection;
 
 namespace FloatTool
 {
@@ -33,7 +32,8 @@ public static void Initialize()
         {
             Hierarchy hierarchy = (Hierarchy)LogManager.GetRepository();
 
-            PatternLayout patternLayout = new() {
+            PatternLayout patternLayout = new()
+            {
                 ConversionPattern = "%date [%thread] %-5level - %message%newline"
             };
             patternLayout.ActivateOptions();

diff --git a/FloatTool/Common/Settings.cs b/FloatTool/Common/Settings.cs
@@ -117,29 +117,30 @@ public void Save()
         public void MigrateFromOldVersion()
         {
             // This method cleans up old settings and data            
-            List<string> oldFiles = new() { 
-                "debug.log", 
-                "FloatCore.dll", 
+            List<string> oldFiles = new()
+            {
+                "debug.log",
+                "FloatCore.dll",
                 "FloatTool.exe.config",
                 "FloatTool.pdb",
                 "itemData.json",
                 "theme.json",
                 "Updater.exe"
             };
 
-            foreach(var file in oldFiles)
+            foreach (var file in oldFiles)
             {
                 if (File.Exists(file))
-                    File.Delete(file);                    
+                    File.Delete(file);
             }
 
             App.CleanOldFiles();
 
             // Finally save that we migrated to not do this every time
             Migrated = true;
             Save();
-        }        
-        
+        }
+
         public override string ToString()
         {
             return $"{{LanguageCode: {LanguageCode}, Currency: {Currency}, ThemeURI: {ThemeURI}, Sound: {Sound}, CheckForUpdates: {CheckForUpdates}, DiscordRPC: {DiscordRPC}, ThreadCount: {ThreadCount}, HaveUpdated: {Migrated}}}";

diff --git a/FloatTool/Common/Skin.cs b/FloatTool/Common/Skin.cs
@@ -158,7 +158,7 @@ public RelayCommand CopyCommand
             {
                 return copyCommand ??= new RelayCommand(obj =>
                 {
-                    Clipboard.SetText(WearValue.ToString(CultureInfo.InvariantCulture));
+                    Clipboard.SetText(WearValue.ToString("0.00000000000000", CultureInfo.InvariantCulture));
                 });
             }
         }

diff --git a/FloatTool/Common/Utils.cs b/FloatTool/Common/Utils.cs
@@ -60,7 +60,7 @@ public static async Task<UpdateResult> CheckForUpdates()
                 string response = await result.Content.ReadAsStringAsync();
                 return JsonConvert.DeserializeObject<UpdateResult>(response);
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 Logger.Log.Error("Failed to get latest version", ex);
                 return null;
@@ -95,7 +95,7 @@ public static string ShortCpuName(string cpu)
         }
     }
 
-    #pragma warning disable IDE1006 // Naming Styles
+#pragma warning disable IDE1006 // Naming Styles
     public class UpdateResult
     {
         public class Asset
@@ -108,8 +108,8 @@ public class Asset
         public List<Asset> assets { get; set; }
         public string body { get; set; }
     }
-    #pragma warning restore IDE1006 // Naming Styles
-    
+#pragma warning restore IDE1006 // Naming Styles
+
     public class CraftSearchSetup
     {
         public decimal SearchTarget { get; set; }

diff --git a/FloatTool/FloatTool.csproj b/FloatTool/FloatTool.csproj
@@ -14,10 +14,10 @@
     <ApplicationIcon>Assets\Icon.ico</ApplicationIcon>
     <DebugType>embedded</DebugType>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
-    <BaseOutputPath>$(SolutionDir)bin</BaseOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="Assets\Found.wav" />
     <None Remove="Assets\SkinList.json" />
   </ItemGroup>
 
@@ -26,6 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="Assets\Found.wav" />
     <EmbeddedResource Include="Assets\SkinList.json" />
   </ItemGroup>
 

diff --git a/FloatTool/ViewModels/MainViewModel.cs b/FloatTool/ViewModels/MainViewModel.cs
@@ -136,7 +136,7 @@ public string CombinationsLabel
             get { return $"{ParsedCombinations}/{TotalCombinations}"; }
             set { OnPropertyChanged(); }
         }
-            
+
         public string CurrentSpeedLabel
         {
             get { return currentSpeed; }
@@ -146,27 +146,30 @@ public string CurrentSpeedLabel
         public string SearchFilter
         {
             get { return searchFilter; }
-            set { 
+            set
+            {
                 searchFilter = value;
-                OnPropertyChanged(); 
+                OnPropertyChanged();
             }
         }
 
         public int SkinCount
         {
             get { return skinCount; }
-            set { 
-                skinCount = value; 
-                OnPropertyChanged(); 
+            set
+            {
+                skinCount = value;
+                OnPropertyChanged();
             }
         }
 
         public int SkinSkipCount
         {
             get { return skinSkipCount; }
-            set { 
-                skinSkipCount = value; 
-                OnPropertyChanged(); 
+            set
+            {
+                skinSkipCount = value;
+                OnPropertyChanged();
             }
         }
 
@@ -287,7 +290,8 @@ public Visibility IsError
             set { isError = value; OnPropertyChanged(); }
         }
 
-        public float ProgressPercentage {
+        public float ProgressPercentage
+        {
             get { return progressPercentage; }
             set { progressPercentage = value; OnPropertyChanged(); }
         }
@@ -448,7 +452,7 @@ public MainViewModel(string weapon, string skin, string quality, string filter,
             FoundCombinations = new();
 
             Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("FloatTool.Assets.SkinList.json")!;
-            if (stream is null) 
+            if (stream is null)
                 throw new NullReferenceException("Could not find SkinList.json");
 
             using (StreamReader reader = new(stream))

diff --git a/FloatTool/ViewModels/SettingsViewModel.cs b/FloatTool/ViewModels/SettingsViewModel.cs
@@ -63,8 +63,9 @@ public bool CheckUpdates
         public bool DiscordRPC
         {
             get { return Settings.DiscordRPC; }
-            set { 
-                Settings.DiscordRPC = value; 
+            set
+            {
+                Settings.DiscordRPC = value;
                 OnPropertyChanged();
 
                 // Re-enabling does not work. Probably bug in the library
@@ -151,24 +152,34 @@ public int CurrentLanguage
         public static List<string> Languages { get; private set; }
         public static List<string> LanguageCodes = new()
         {
-            "cs", "da",
-            "de", "en",
-            "es", "fi",
-            "fr", "ga",
-            "he", "hr",
-            "it", "ja",
-            "ka", "lt",
-            "lv", "pl",
-            "pt", "uk",
-            "tr", "ru",
+            "cs",
+            "da",
+            "de",
+            "en",
+            "es",
+            "fi",
+            "fr",
+            "ga",
+            "he",
+            "hr",
+            "it",
+            "ja",
+            "ka",
+            "lt",
+            "lv",
+            "pl",
+            "pt",
+            "uk",
+            "tr",
+            "ru",
             "zh",
         };
 
         public SettingsViewModel(Settings settings)
         {
             Settings = settings;
             Languages = new List<string>();
-            
+
             foreach (var lang in LanguageCodes)
             {
                 var locale = new System.Globalization.CultureInfo(lang);

diff --git a/FloatTool/Views/MainWindow.xaml b/FloatTool/Views/MainWindow.xaml
@@ -20,10 +20,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:draw="clr-namespace:System.Drawing;assembly=System.Drawing"
     xmlns:local="clr-namespace:FloatTool"
     xmlns:theme="clr-namespace:FloatTool.Theme" 
-    mc:Ignorable="d" 
+    mc:Ignorable="d" KeyUp="Window_KeyUp"
     MinWidth="875" MinHeight="420" 
     Width="875" Height="420" 
     WindowStartupLocation="CenterScreen" 
@@ -303,7 +302,7 @@
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
+                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
                                                 <Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
                                                     <TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
                                                 </Button>
@@ -313,7 +312,7 @@
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
+                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
                                                 <Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
                                                     <TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
                                                 </Button>
@@ -323,7 +322,7 @@
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
+                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
                                                 <Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
                                                     <TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
                                                 </Button>
@@ -333,7 +332,7 @@
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
+                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
                                                 <Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
                                                     <TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
                                                 </Button>
@@ -343,7 +342,7 @@
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
+                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
                                                 <Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
                                                     <TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
                                                 </Button>
@@ -353,7 +352,7 @@
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
+                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
                                                 <Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
                                                     <TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
                                                 </Button>
@@ -363,7 +362,7 @@
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
+                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
                                                 <Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
                                                     <TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
                                                 </Button>
@@ -373,7 +372,7 @@
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
+                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
                                                 <Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
                                                     <TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
                                                 </Button>
@@ -383,7 +382,7 @@
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
+                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
                                                 <Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
                                                     <TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
                                                 </Button>
@@ -393,7 +392,7 @@
                                                     <ColumnDefinition/>
                                                     <ColumnDefinition Width="Auto"/>
                                                 </Grid.ColumnDefinitions>
-                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue}" VerticalContentAlignment="Center"/>
+                                                <TextBox Style="{DynamicResource MainTextBoxStyle}" IsReadOnly="true" FontSize="13" Text="{Binding WearValue, StringFormat=0.00000000000000}" VerticalContentAlignment="Center"/>
                                                 <Button Grid.Column="1" Style="{DynamicResource MainButtonStyle}" HorizontalAlignment="Right" Command="{Binding CopyCommand}">
                                                     <TextBlock Text="{DynamicResource m_Copy}" Margin="8,0"/>
                                                 </Button>
-Original file line number
+Diff line change
@@ Expand Up / @@ -158,7 +158,7 @@ public RelayCommand CopyCommand @@
                 {
                     return copyCommand ??= new RelayCommand(obj =>
                     {
-                        Clipboard.SetText(WearValue.ToString(CultureInfo.InvariantCulture));
+                        Clipboard.SetText(WearValue.ToString("0.00000000000000", CultureInfo.InvariantCulture));
                     });
                 }
             }
@@ Expand Down @@