Add magic decoder

Author: spitfirex86

Ray2StringEd/FixManager.cs

@@ -1,7 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using R2MagicDecoder;
 
 namespace Ray2StringEd
 {
@@ -15,19 +15,21 @@ public FixManager(string path, int offset = 0x7051F4)
 
         private string Path { get; }
         private int Offset { get; }
+        private byte[] FixBytes { get; set; }
 
         public IEnumerable<FixString> ReadFix()
         {
-            using (FileStream file = new FileStream(Path, FileMode.Open, FileAccess.Read))
+            FixBytes = MagicDecoder.DecodeBytes(File.ReadAllBytes(Path));
+            using (MemoryStream fix = new MemoryStream(FixBytes))
             {
-                file.Seek(Offset, SeekOrigin.Begin);
+                fix.Seek(Offset, SeekOrigin.Begin);
 
-                using (BinaryReader reader = new BinaryReader(file))
+                using (BinaryReader reader = new BinaryReader(fix))
                 {
-                    long fileLength = file.Length;
+                    long fixLength = fix.Length;
                     long position;
 
-                    while ((position = reader.BaseStream.Position) != fileLength)
+                    while ((position = reader.BaseStream.Position) != fixLength)
                     {
                         int length = reader.ReadInt32();
 
@@ -45,29 +47,37 @@ public IEnumerable<FixString> ReadFix()
 
         public void WriteFix(IEnumerable<FixString> strings)
         {
-            using (FileStream file = new FileStream(Path, FileMode.Open, FileAccess.Write))
+            using (MemoryStream fix = new MemoryStream(FixBytes))
+            using (BinaryWriter writer = new BinaryWriter(fix))
             {
-                using (BinaryWriter writer = new BinaryWriter(file))
+                foreach (FixString s in strings)
                 {
-                    foreach (FixString s in strings)
-                    {
-                        file.Seek(s.Offset, SeekOrigin.Begin);
+                    fix.Seek(s.Offset, SeekOrigin.Begin);
 
-                        string text = s.Text + '\0';
-                        byte[] bytes = Encoding.GetEncoding(1252).GetBytes(text);
+                    string text = s.Text + '\0';
+                    byte[] bytes = Encoding.GetEncoding(1252).GetBytes(text);
 
-                        writer.Write(s.DwordLength);
-                        writer.Write(bytes);
+                    writer.Write(s.DwordLength);
+                    writer.Write(bytes);
 
-                        int freeLength = s.ByteLength - bytes.Length - 4;
-                        if (freeLength > 0)
-                        {
-                            byte[] freeBytes = new byte[freeLength];
-                            writer.Write(freeBytes);
-                        }
+                    int freeLength = s.ByteLength - bytes.Length - 4;
+                    if (freeLength > 0)
+                    {
+                        byte[] freeBytes = new byte[freeLength];
+                        writer.Write(freeBytes);
                     }
                 }
             }
+
+            File.WriteAllBytes(Path, MagicDecoder.DecodeBytes(FixBytes));
+        }
+
+        public void BackupFix()
+        {
+            string bakPath = Path + ".bak";
+
+            if (!File.Exists(bakPath))
+                File.Copy(Path, bakPath);
         }
     }
 }

Ray2StringEd/MainViewModel.cs

@@ -17,6 +17,8 @@ public MainViewModel()
             WriteFixCommand = new RelayCommand(WriteFix);
         }
 
+        private FixManager Manager { get; set; }
+
         public ObservableCollection<FixString> FixStrings { get; set; }
         public string FixPath { get; set; }
         public FixString SelectedItem { get; set; }
@@ -25,7 +27,7 @@ public MainViewModel()
         public ICommand ReadFixCommand { get; }
         public ICommand WriteFixCommand { get; }
 
-        public void ChooseFile()
+        private void ChooseFile()
         {
             OpenFileDialog dialog = new OpenFileDialog();
             dialog.ShowDialog();
@@ -34,20 +36,20 @@ public void ChooseFile()
                 FixPath = dialog.FileName;
         }
 
-        public void ReadFix()
+        private void ReadFix()
         {
             if (!File.Exists(FixPath)) return;
 
-            FixManager fix = new FixManager(FixPath);
-            FixStrings = new ObservableCollection<FixString>(fix.ReadFix());
+            Manager = new FixManager(FixPath);
+            FixStrings = new ObservableCollection<FixString>(Manager.ReadFix());
         }
 
-        public void WriteFix()
+        private void WriteFix()
         {
             if (!File.Exists(FixPath)) return;
 
-            FixManager fix = new FixManager(FixPath);
-            fix.WriteFix(FixStrings);
+            Manager.BackupFix();
+            Manager.WriteFix(FixStrings);
 
             MessageBox.Show($"Written {FixStrings.Count} strings to {FixPath}.");
         }

Ray2StringEd/Properties/AssemblyInfo.cs

@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
@@ -51,5 +49,4 @@
 // 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.1.0.0")]

Ray2StringEd/R2MagicDecoder.dll

@@ -48,6 +48,10 @@
     <Reference Include="PropertyChanged, Version=3.2.5.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
       <HintPath>..\packages\PropertyChanged.Fody.3.2.5\lib\net40\PropertyChanged.dll</HintPath>
     </Reference>
+    <Reference Include="R2MagicDecoder, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>.\R2MagicDecoder.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
@@ -128,6 +132,9 @@
   <ItemGroup>
     <Resource Include="RTI.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="R2MagicDecoder.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>