v1.0.1 - Accidental error

Case sensitivity is wack y'all
FromDarkHell · Sep 24, 2021 · 1134113 · 1134113
1 parent 068210c
commit 1134113
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 20 deletions.
diff --git a/BL3SaveEditor/AutoUpdater.xml b/BL3SaveEditor/AutoUpdater.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <item>
-  <version>1.0.0.0</version>
+  <version>1.0.1.0</version>
   <url>https://github.com/FromDarkHell/BL3SaveEditor/releases/latest/download/BL3SaveEditor.exe</url>
   <changelog>https://github.com/FromDarkHell/BL3SaveEditor/releases/latest</changelog>
   <mandatory>false</mandatory>

diff --git a/BL3SaveEditor/MainWindow.xaml b/BL3SaveEditor/MainWindow.xaml
@@ -6,10 +6,10 @@
         xmlns:helpers="clr-namespace:BL3SaveEditor.Helpers" xmlns:adonisUi="clr-namespace:AdonisUI;assembly=AdonisUI"
         xmlns:adonisControls="clr-namespace:AdonisUI.Controls;assembly=AdonisUI"
         xmlns:adonisExtensions="clr-namespace:AdonisUI.Extensions;assembly=AdonisUI"
-        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d"
-        Title="Borderlands 3 Save Editor" Height="612" Width="859"
-        Background="{DynamicResource {x:Static adonisUi:Brushes.Layer0BackgroundBrush}}" UseLayoutRounding="True"
-        Closed="AdonisWindow_Closed" DataContext="{Binding RelativeSource={RelativeSource Self}}">
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" Title="Borderlands 3 Save Editor"
+        Height="612" Width="859" Background="{DynamicResource {x:Static adonisUi:Brushes.Layer0BackgroundBrush}}"
+        UseLayoutRounding="True" Closed="AdonisWindow_Closed"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}">
     <Window.Style>
         <Style TargetType="Window" BasedOn="{StaticResource {x:Type Window}}" />
     </Window.Style>
@@ -583,9 +583,10 @@
                                 <CheckBox Content="Force Legit Parts" HorizontalAlignment="Left" Margin="10,147,0,0"
                                         VerticalAlignment="Top" Width="108"
                                         DataContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=DataContext}"
-                                        IsChecked="{Binding Path=ForceLegitParts, Mode=TwoWay}" Name="ForceLegitPartsChkBox" />
+                                        IsChecked="{Binding Path=ForceLegitParts, Mode=TwoWay}"
+                                        Name="ForceLegitPartsChkBox" />
                                 <Grid HorizontalAlignment="Stretch" Margin="10,168,0,0" Background="Transparent"
-                                        VerticalAlignment="Stretch" >
+                                        VerticalAlignment="Stretch">
                                     <Grid.Resources>
 
                                         <helpers:SerialPartConverter x:Key="MainPartConverter1" />
@@ -684,7 +685,8 @@
                                             <MultiBinding Converter="{StaticResource AndConverter1}">
                                                 <Binding Path="SelectedSerial.InventoryKey" TargetNullValue="False" />
                                                 <Binding Path="SelectedSerial.Parts.Count"
-                                                        Converter="{StaticResource IntegerLimiterConverter1}" ConverterParameter="63" />
+                                                        Converter="{StaticResource IntegerLimiterConverter1}"
+                                                        ConverterParameter="63" />
                                             </MultiBinding>
                                         </Button.IsEnabled>
                                     </Button>
@@ -747,8 +749,8 @@
                                     </Button>
                                     <Label HorizontalContentAlignment="Center" HorizontalAlignment="Stretch"
                                             Margin="10,10,0,0" VerticalAlignment="Top" Height="16" Grid.Column="1"
-                                            Content="{Binding Path=SelectedSerial.GenericParts.Count}" Name="GenericPartsLabel"
-                                            ContentStringFormat="Generic Parts ({0}/15)" />
+                                            Content="{Binding Path=SelectedSerial.GenericParts.Count}"
+                                            Name="GenericPartsLabel" ContentStringFormat="Generic Parts ({0}/15)" />
 
                                 </Grid>
 
@@ -902,10 +904,12 @@
                         <LineBreak />
                         <Run Text="Thanks to: " />
                         <LineBreak />
-                        <Run Text="- Gibbed, apocalyptech, raptor/cfi2017, c0dycode, apple1417, LostInCompression, DOMIN8" />
+                        <Run
+                                Text="- Gibbed, apocalyptech, raptor/cfi2017, c0dycode, apple1417, LostInCompression, DOMIN8" />
                         <LineBreak />
                         <Run Text="Extra special thanks to" />
-                        <Hyperlink TextDecorations="Underline" NavigateUri="https://www.deviantart.com/brokennoah/art/Borderlands-3-icons-797030087">
+                        <Hyperlink TextDecorations="Underline"
+                                NavigateUri="https://www.deviantart.com/brokennoah/art/Borderlands-3-icons-797030087">
                             <Run Text="BrokenNoah" />
                         </Hyperlink>
                         <Run Text="for making the main icon of this program!" />
@@ -952,11 +956,13 @@
                         <Run Foreground="MediumPurple" Text="In memory of Baysix. Fly high." />
                     </TextBlock>
                     <Button Content="Check For Updates" VerticalAlignment="Top" HorizontalAlignment="Right"
-                            Margin="0,0,6,0" Width="120" />
+                            Margin="0,22,6,0" Width="120" />
                     <CheckBox Name="DarkModeBox" Content="Enable Dark Mode" HorizontalAlignment="Right"
-                            Margin="0,30,6,0" VerticalAlignment="Top" RenderTransformOrigin="1.014,-0.938"
-                            IsChecked="True" Height="20" Checked="DarkModeBox_Checked" Unchecked="DarkModeBox_Checked"
-                            Width="120" />
+                            Margin="0,51,6,0" VerticalAlignment="Top" IsChecked="True" Height="20"
+                            Checked="DarkModeBox_Checked" Unchecked="DarkModeBox_Checked" Width="120" />
+                    <Label VerticalAlignment="Top" HorizontalAlignment="Right" FontWeight="Normal"
+                            Content="{Binding Path=Version, Mode=OneTime}" ContentStringFormat="Version: {0}"
+                            Width="120" Margin="0,0,6,0" Height="16" />
                 </Grid>
             </TabItem>
         </TabControl>

diff --git a/BL3SaveEditor/MainWindow.xaml.cs b/BL3SaveEditor/MainWindow.xaml.cs
@@ -21,6 +21,7 @@
 using AutoUpdaterDotNET;
 using System.Windows.Navigation;
 using System.Diagnostics;
+using System.Reflection;
 
 namespace BL3SaveEditor {
 
@@ -30,6 +31,9 @@ namespace BL3SaveEditor {
     public partial class MainWindow {
 
         #region Databinding Data
+
+        public static string Version { get; private set; } = Assembly.GetExecutingAssembly().GetName().Version.ToString();
+
         public static RoutedCommand DuplicateCommand { get; } = new RoutedCommand();
         public static RoutedCommand DeleteCommand { get; } = new RoutedCommand();
 
@@ -621,6 +625,11 @@ private void PasteCodeBtn_Click(object sender, RoutedEventArgs e) {
                 if (ex.knowCause)
                     MessageBox.Show($"Error parsing serial: {ex.Message}", "Serial Parse Exception", AdonisUI.Controls.MessageBoxButton.OK, AdonisUI.Controls.MessageBoxImage.Error);
             }
+            catch(Exception ex) {
+                string message = ex.Message;
+                Console.WriteLine($"Exception ({message}) parsing serial: {ex.ToString()}");
+                MessageBox.Show($"Error parsing serial: {ex.Message}", "Serial Parse Exception", AdonisUI.Controls.MessageBoxButton.OK, AdonisUI.Controls.MessageBoxImage.Error);
+            }
         }
         private void SyncEquippedBtn_Click(object sender, RoutedEventArgs e) {
             if (saveGame == null) return;

diff --git a/BL3SaveEditor/Properties/AssemblyInfo.cs b/BL3SaveEditor/Properties/AssemblyInfo.cs
@@ -51,6 +51,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
diff --git a/BL3Tools/GameData/Items/Borderlands3Serial.cs b/BL3Tools/GameData/Items/Borderlands3Serial.cs
@@ -147,9 +147,8 @@ public byte[] EncryptSerialToBytes(uint seed = 0) {
         /// <param name="serial">BL3(...) encoded serial</param>
         /// <returns>An object representing the passed in <paramref name="serial"/></returns>
         public static Borderlands3Serial DecryptSerial(string serial) {
-            if (serial.StartsWith("BL3(") && serial.EndsWith(")"))
+            if (serial.ToLower().StartsWith("bl3(") && serial.EndsWith(")"))
                 serial = serial.Remove(0, 4).Remove(serial.Length - 5);
-
             return DecryptSerial(Convert.FromBase64String(serial));
         }