Initial 3x (#61)

* Changes * begin splitting out updates * Interim commit * Interim commit * Simplify for interim release * Add original update warning * Update gitignore * Cleanup * Update default button logic in UpdateControl * Update markdown
mburbea · Sep 16, 2020 · 4abcdbe · 4abcdbe
1 parent 161ec80
commit 4abcdbe
Show file tree

Hide file tree

Showing 31 changed files with 808 additions and 674 deletions.
diff --git a/.gitignore b/.gitignore
@@ -117,8 +117,6 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 
-
-
 ############
 ## Windows
 ############
@@ -164,4 +162,6 @@ pip-log.txt
 
 # Mac crap
 .DS_Store
-/KoAR.SaveEditor/Views/Updates/github.credentials
+
+# Github Credentials
+github.credentials
diff --git a/KoAR.Core/Amalur.cs b/KoAR.Core/Amalur.cs
@@ -58,15 +58,15 @@ internal static TValue GetOrDefault<TKey, TValue>(this IReadOnlyDictionary<TKey,
         public static string? FindSaveGameDirectory()
         {
             // GOG
-            var directory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "..", "LocalLow", "THQNOnline", "Kingdoms of Amalur Re-Reckoning", "autocloud", "save");
+            var directory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"..\LocalLow\THQNOnline\Kingdoms of Amalur Re-Reckoning\autocloud\save");
             if (Directory.Exists(directory))
             {
                 return directory;
             }
             // Steam
             directory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Steam", "userdata");
             return Directory.Exists(directory) && Directory.GetDirectories(directory) is string[] { Length: 1 } userDirs 
-                    && (Directory.Exists(directory = Path.Combine(userDirs[0], "1041720", "remote", "autocloud", "save")) || Directory.Exists(directory = Path.Combine(userDirs[0], "102500", "remote")))
+                    && (Directory.Exists(directory = Path.Combine(userDirs[0], @"1041720\remote\autocloud\save")) || Directory.Exists(directory = Path.Combine(userDirs[0], @"102500\remote")))
                 ? directory
                 : null;
         }

diff --git a/KoAR.Core/GameSave.cs b/KoAR.Core/GameSave.cs
@@ -25,7 +25,7 @@ public GameSave(string fileName)
             IsRemaster = BitConverter.ToInt32(Bytes, 8) == 0;
             if(IsRemaster && !Path.GetFileNameWithoutExtension(fileName).StartsWith("svd_fmt_5_"))
             {
-                throw new NotSupportedException("Save file is not a user save and changing them can lead to the game infinite looping. The editor only supports saves that start with svd_fmt_5_");
+                throw new NotSupportedException("Save file is not a user save and changing them can lead to the game infinite looping. The editor only supports saves that start with svd_fmt_5.");
             }
             _header = new GameSaveHeader(this);
             Body = Bytes.AsSpan(BodyStart, BodyDataLength).ToArray();

diff --git a/KoAR.SaveEditor/App.config b/KoAR.SaveEditor/App.config
@@ -19,6 +19,9 @@
             <setting name="LastDirectory" serializeAs="String">
                 <value />
             </setting>
+            <setting name="Acknowledged3x" serializeAs="String">
+                <value>False</value>
+            </setting>
         </KoAR.SaveEditor.Properties.Settings>
     </userSettings>
     <applicationSettings>

diff --git a/KoAR.SaveEditor/App.xaml b/KoAR.SaveEditor/App.xaml
@@ -1,14 +1,12 @@
 <Application x:Class="KoAR.SaveEditor.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:updates="clr-namespace:KoAR.SaveEditor.Views.Updates"
     StartupUri="Views/Main/MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/PresentationFramework.Aero;component/Themes/Aero.NormalColor.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <updates:UpdateService x:Key="{x:Type updates:UpdateService}" />
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/KoAR.SaveEditor/App.xaml.cs b/KoAR.SaveEditor/App.xaml.cs
@@ -1,10 +1,13 @@
 using System;
+using System.Reflection;
 using Microsoft.Windows.Themes;
 
 namespace KoAR.SaveEditor
 {
     partial class App
     {
         static App() => Type.GetTypeCode(typeof(PlatformCulture)); // Needed to enforce loading of PresentationFramework.Aero.dll before initializing App.
+
+        public static Version Version { get; } = new Version(Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion);
     }
 }
diff --git a/KoAR.SaveEditor/KoAR.SaveEditor.csproj b/KoAR.SaveEditor/KoAR.SaveEditor.csproj
@@ -9,21 +9,22 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <AssemblyTitle>KoAR.SaveEditor</AssemblyTitle>
     <Product>Kingdoms of Amalur: Reckoning Save Editor</Product>
-    <Copyright>Copyright © Michael Burbea 2020</Copyright>
+    <Copyright>Copyright © Michael Burbea &amp; Amir Burbea 2020</Copyright>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>app.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Authors>Michael Burbea; Amir Burbea</Authors>
     <Company>-</Company>
     <Description>Save editor for Kingdoms of Amalur: Reckoning</Description>
-    <PackageLicenseExpression>ISC</PackageLicenseExpression>
+    <PackageLicenseExpression></PackageLicenseExpression>
     <RepositoryType>Git</RepositoryType>
     <PackageProjectUrl>https://github.com/mburbea/koar-item-editor</PackageProjectUrl>
     <RepositoryUrl>https://github.com/mburbea/koar-item-editor</RepositoryUrl>
     <NeutralLanguage>en-US</NeutralLanguage>
     <UserSecretsId>08a013c8-a2ef-43c0-9e42-9500e36a74d4</UserSecretsId>
-    <Version>2.0.0</Version>
+    <Version>3.0.0</Version>
+    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>
@@ -196,6 +197,10 @@
     <None Remove="Resources\Zoom.png" />
     <None Remove="Views\Updates\github.credentials" />
     <None Remove="Views\Updates\update.ps1" />
+    <None Include="..\LICENSE.md">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Markdown.Xaml" Version="1.0.0" />
@@ -344,8 +349,8 @@
     <Resource Include="Resources\categories\Torso_Finesse.png" />
     <Resource Include="Resources\Unknown.png" />
     <Resource Include="Resources\Zoom.png" />
-    <Resource Include="Views\Updates\github.credentials" />
-    <Resource Include="Views\Updates\update.ps1" />
+    <Resource Include="Updates\github.credentials" />
+    <Resource Include="Updates\update.ps1" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
@@ -380,6 +385,6 @@
     </None>
   </ItemGroup>
   <Target Name="EnsureCredentialsFileExists" BeforeTargets="BeforeBuild">
-    <WriteLinesToFile File="$(MSBuildProjectDirectory)\Views\Updates\github.credentials" Lines="" Overwrite="False" />
+    <WriteLinesToFile File="$(MSBuildProjectDirectory)\Updates\github.credentials" Lines="" Overwrite="False" />
   </Target>
 </Project>
diff --git a/KoAR.SaveEditor/Properties/Settings.Designer.cs b/KoAR.SaveEditor/Properties/Settings.Designer.cs
diff --git a/KoAR.SaveEditor/Properties/Settings.settings b/KoAR.SaveEditor/Properties/Settings.settings
@@ -14,5 +14,8 @@
     <Setting Name="LastDirectory" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="Acknowledged3x" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/KoAR.SaveEditor/Themes/Generic.xaml b/KoAR.SaveEditor/Themes/Generic.xaml
@@ -1,18 +1,18 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
     <ResourceDictionary.MergedDictionaries>
         <!-- Views -->
+        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.ArmorTypeIcon.xaml" />
         <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.BuffCollectionManager.xaml" />
-        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.BuffSelector.xaml" />
         <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.BuffDescriptionIcon.xaml" />
         <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.BuffIcon.xaml" />
-        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.RarityIcon.xaml" />
+        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.BuffSelector.xaml" />
         <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.ElementIcon.xaml" />
-        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.SocketIcon.xaml" />
-        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.ArmorTypeIcon.xaml" />
-        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.ItemFiltersEditor.xaml" />
         <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.EquipmentCategoryIcon.xaml" />
-        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.ItemDefinitionControl.xaml" />
         <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.ItemCollectionManager.xaml" />
+        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.ItemDefinitionControl.xaml" />
+        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.ItemFiltersEditor.xaml" />
+        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.RarityIcon.xaml" />
+        <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.SocketIcon.xaml" />
         <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.ZoomScaler.xaml" />
         <!-- Constructs -->
         <ResourceDictionary Source="/KoAR.SaveEditor;component/Themes/Generic.LoadingIndicator.xaml" />

diff --git a/....SaveEditor/Views/Updates/IReleaseInfo.cs → KoAR.SaveEditor/Updates/IReleaseInfo.cs b/....SaveEditor/Views/Updates/IReleaseInfo.cs → KoAR.SaveEditor/Updates/IReleaseInfo.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace KoAR.SaveEditor.Views.Updates
+namespace KoAR.SaveEditor.Updates
 {
     public interface IReleaseInfo
     {
@@ -10,7 +10,7 @@ public interface IReleaseInfo
 
         DateTime PublishedAt { get; }
 
-        string Version { get; }
+        Version Version { get; }
 
         int ZipFileSize { get; }