From ba7d2bdc3a8fc5ea7d2e3aca64cd6a3ff0a1effb Mon Sep 17 00:00:00 2001
From: virusek20 <gmoder.virusek20@gmail.com>
Date: Sat, 30 Mar 2019 22:33:03 +0100
Subject: [PATCH] Create viewmodels for properties

---
 ...rializablePropertyToTypeStringConverter.cs | 25 ++++++-----
 .../Model/SaveObjectModel.cs                  | 19 +++++++-
 .../SatisfactorySaveEditor.csproj             | 14 ++++++
 .../Util/PropertyViewModelMapper.cs           | 42 ++++++++++++++++++
 SatisfactorySaveEditor/View/MainWindow.xaml   | 24 +++++-----
 .../View/PropertiesControl.xaml.cs            |  8 ++--
 .../View/PropertyTemplateDictionary.xaml      | 33 +++++++-------
 .../ViewModel/AddViewModel.cs                 |  3 +-
 .../ViewModel/MainViewModel.cs                | 20 ++++-----
 .../Property/ArrayPropertyViewModel.cs        | 44 +++++++++++++++++++
 .../Property/BoolPropertyViewModel.cs         | 29 ++++++++++++
 .../Property/BytePropertyViewModel.cs         | 29 ++++++++++++
 .../Property/EnumPropertyViewModel.cs         | 30 +++++++++++++
 .../Property/FloatPropertyViewModel.cs        | 29 ++++++++++++
 .../Property/IntPropertyViewModel.cs          | 29 ++++++++++++
 .../Property/MapPropertyViewModel.cs          | 18 ++++++++
 .../Property/NamePropertyViewModel.cs         | 29 ++++++++++++
 .../Property/ObjectPropertyViewModel.cs       | 38 ++++++++++++++++
 .../Property/SerializedPropertyViewModel.cs   | 19 ++++++++
 .../Property/StrPropertyViewModel.cs          | 29 ++++++++++++
 .../Property/StructPropertyViewModel.cs       | 33 ++++++++++++++
 .../Property/TextPropertyViewModel.cs         | 38 ++++++++++++++++
 22 files changed, 523 insertions(+), 59 deletions(-)
 create mode 100644 SatisfactorySaveEditor/Util/PropertyViewModelMapper.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/ArrayPropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/BoolPropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/BytePropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/EnumPropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/FloatPropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/IntPropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/MapPropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/NamePropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/ObjectPropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/SerializedPropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/StrPropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/StructPropertyViewModel.cs
 create mode 100644 SatisfactorySaveEditor/ViewModel/Property/TextPropertyViewModel.cs

diff --git a/SatisfactorySaveEditor/Converter/SerializablePropertyToTypeStringConverter.cs b/SatisfactorySaveEditor/Converter/SerializablePropertyToTypeStringConverter.cs
index 9cfd4c6..fab2b73 100644
--- a/SatisfactorySaveEditor/Converter/SerializablePropertyToTypeStringConverter.cs
+++ b/SatisfactorySaveEditor/Converter/SerializablePropertyToTypeStringConverter.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Windows.Data;
 using SatisfactorySaveEditor.ViewModel;
+using SatisfactorySaveEditor.ViewModel.Property;
 using SatisfactorySaveParser.PropertyTypes;
 
 namespace SatisfactorySaveEditor.Converter
@@ -12,29 +13,29 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         {
             switch (value)
             {
-                case ArrayProperty arp:
+                case ArrayPropertyViewModel arp:
                     return $"Array ({AddViewModel.FromStringType(arp.Type)})";
-                case BoolProperty bop:
+                case BoolPropertyViewModel bop:
                     return "Boolean";
-                case ByteProperty byp:
+                case BytePropertyViewModel byp:
                     return "Byte";
-                case EnumProperty enp:
+                case EnumPropertyViewModel enp:
                     return "Enum";
-                case FloatProperty flp:
+                case FloatPropertyViewModel flp:
                     return "Float";
-                case IntProperty inp:
+                case IntPropertyViewModel inp:
                     return "Int";
-                case MapProperty map: // heh
+                case MapPropertyViewModel map: // heh
                     return "Map";
-                case NameProperty nap: // THESE NAMES KEEP GETTING BETTER
+                case NamePropertyViewModel nap: // THESE NAMES KEEP GETTING BETTER
                     return "Name";
-                case ObjectProperty obp:
+                case ObjectPropertyViewModel obp:
                     return "Object";
-                case StrProperty strip:
+                case StrPropertyViewModel strip:
                     return "String";
-                case StructProperty strup:
+                case StructPropertyViewModel strup:
                     return "Struct";
-                case TextProperty tep:
+                case TextPropertyViewModel tep:
                     return "text";
                 default:
                     throw new ArgumentOutOfRangeException(nameof(value), value, null);
diff --git a/SatisfactorySaveEditor/Model/SaveObjectModel.cs b/SatisfactorySaveEditor/Model/SaveObjectModel.cs
index ade6265..0f1ec21 100644
--- a/SatisfactorySaveEditor/Model/SaveObjectModel.cs
+++ b/SatisfactorySaveEditor/Model/SaveObjectModel.cs
@@ -1,7 +1,9 @@
 using System.Collections.ObjectModel;
+using System.Linq;
 using GalaSoft.MvvmLight;
+using SatisfactorySaveEditor.Util;
+using SatisfactorySaveEditor.ViewModel.Property;
 using SatisfactorySaveParser;
-using SatisfactorySaveParser.PropertyTypes;
 
 namespace SatisfactorySaveEditor.Model
 {
@@ -13,7 +15,8 @@ public class SaveObjectModel : ObservableObject
         private bool isExpanded;
 
         public ObservableCollection<SaveObjectModel> Items { get; } = new ObservableCollection<SaveObjectModel>();
-        public ObservableCollection<SerializedProperty> Fields => Model.DataFields;
+
+        public ObservableCollection<SerializedPropertyViewModel> Fields { get; }
 
         public string Title
         {
@@ -46,6 +49,8 @@ public SaveObjectModel(SaveObject model)
             Model = model;
             Title = model.InstanceName;
             RootObject = model.RootObject;
+
+            Fields = new ObservableCollection<SerializedPropertyViewModel>(Model.DataFields.Select(PropertyViewModelMapper.Convert));
         }
 
         public SaveObjectModel(string title)
@@ -92,6 +97,16 @@ public virtual void ApplyChanges()
             {
                 item.ApplyChanges();
             }
+
+            // This is because the named only (pink) nodes aren't actually a valid object in the game
+            if (Model == null) return;
+
+            Model.DataFields.Clear();
+            foreach (var field in Fields)
+            {
+                field.ApplyChanges();
+                Model.DataFields.Add(field.Model);
+            }
         }
     }
 }
diff --git a/SatisfactorySaveEditor/SatisfactorySaveEditor.csproj b/SatisfactorySaveEditor/SatisfactorySaveEditor.csproj
index b84416e..97b0a34 100644
--- a/SatisfactorySaveEditor/SatisfactorySaveEditor.csproj
+++ b/SatisfactorySaveEditor/SatisfactorySaveEditor.csproj
@@ -81,8 +81,22 @@
     <Compile Include="Model\SaveObjectModel.cs" />
     <Compile Include="Util\EditorTreeNode.cs" />
     <Compile Include="Util\BindingProxy.cs" />
+    <Compile Include="Util\PropertyViewModelMapper.cs" />
     <Compile Include="ViewModel\AddViewModel.cs" />
     <Compile Include="ViewModel\MainViewModel.cs" />
+    <Compile Include="ViewModel\Property\ArrayPropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\BoolPropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\BytePropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\EnumPropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\FloatPropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\IntPropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\MapPropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\NamePropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\ObjectPropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\SerializedPropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\StrPropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\StructPropertyViewModel.cs" />
+    <Compile Include="ViewModel\Property\TextPropertyViewModel.cs" />
     <Compile Include="ViewModel\ViewModelLocator.cs" />
     <Compile Include="View\PropertiesControl.xaml.cs">
       <DependentUpon>PropertiesControl.xaml</DependentUpon>
diff --git a/SatisfactorySaveEditor/Util/PropertyViewModelMapper.cs b/SatisfactorySaveEditor/Util/PropertyViewModelMapper.cs
new file mode 100644
index 0000000..8cccd5d
--- /dev/null
+++ b/SatisfactorySaveEditor/Util/PropertyViewModelMapper.cs
@@ -0,0 +1,42 @@
+using System;
+using SatisfactorySaveEditor.ViewModel.Property;
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.Util
+{
+    public static class PropertyViewModelMapper
+    {
+        public static SerializedPropertyViewModel Convert(SerializedProperty property)
+        {
+            switch (property)
+            {
+                case ArrayProperty arp:
+                    return new ArrayPropertyViewModel(arp);
+                case BoolProperty bop:
+                    return new BoolPropertyViewModel(bop);
+                case ByteProperty byp:
+                    return new BytePropertyViewModel(byp);
+                case EnumProperty enp:
+                    return new EnumPropertyViewModel(enp);
+                case FloatProperty flp:
+                    return new FloatPropertyViewModel(flp);
+                case IntProperty inp:
+                    return new IntPropertyViewModel(inp);
+                case MapProperty map:
+                    return new MapPropertyViewModel(map);
+                case NameProperty nap:
+                    return new NamePropertyViewModel(nap);
+                case ObjectProperty obp:
+                    return new ObjectPropertyViewModel(obp);
+                case StrProperty strip:
+                    return new StrPropertyViewModel(strip);
+                case StructProperty strup:
+                    return new StructPropertyViewModel(strup);
+                case TextProperty tep:
+                    return new TextPropertyViewModel(tep);
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(property), property, null);
+            }
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/View/MainWindow.xaml b/SatisfactorySaveEditor/View/MainWindow.xaml
index 88b46cb..67ebf67 100644
--- a/SatisfactorySaveEditor/View/MainWindow.xaml
+++ b/SatisfactorySaveEditor/View/MainWindow.xaml
@@ -138,23 +138,23 @@
                 <ContentControl.Resources>
                     <DataTemplate DataType="{x:Type model:SaveEntityModel}">
                         <DockPanel>
-                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Title, FallbackValue='No item selected', StringFormat='Entity name: {0}'}"/>
-                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding RootObject, FallbackValue='No item selected', StringFormat='Root: {0}'}"/>
-                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Int4, FallbackValue='No item selected', StringFormat='Int4: {0}'}"/>
-                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Int6, FallbackValue='No item selected', StringFormat='Int6: {0}'}"/>
-                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Rotation, FallbackValue='No item selected', StringFormat='Rotation: {0}'}"/>
-                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Position, FallbackValue='No item selected', StringFormat='Position: {0}'}"/>
-                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Scale, FallbackValue='No item selected', StringFormat='Scale: {0}'}"/>
-                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding ParentObjectName, FallbackValue='No item selected', StringFormat='ParentObjectName: {0}'}"/>
-                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding ParentObjectRoot, FallbackValue='No item selected', StringFormat='ParentObjectRoot: {0}'}"/>
+                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Title, StringFormat='Entity name: {0}'}"/>
+                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding RootObject, StringFormat='Root: {0}'}"/>
+                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Int4, StringFormat='Int4: {0}'}"/>
+                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Int6, StringFormat='Int6: {0}'}"/>
+                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Rotation, StringFormat='Rotation: {0}'}"/>
+                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Position, StringFormat='Position: {0}'}"/>
+                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding Scale, StringFormat='Scale: {0}'}"/>
+                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding ParentObjectName, StringFormat='ParentObjectName: {0}'}"/>
+                            <TextBlock TextWrapping="Wrap" DockPanel.Dock="Top" Text="{Binding ParentObjectRoot, StringFormat='ParentObjectRoot: {0}'}"/>
                             <view:PropertiesControl Properties="{Binding Fields}" AddPropertyCommand="{Binding Source={StaticResource Proxy}, Path=Data.AddPropertyCommand}"/>
                         </DockPanel>
                     </DataTemplate>
                     <DataTemplate DataType="{x:Type model:SaveComponentModel}">
                         <DockPanel>
-                            <TextBlock DockPanel.Dock="Top" Text="{Binding Title, FallbackValue='No item selected', StringFormat='Component name: {0}'}"/>
-                            <TextBlock DockPanel.Dock="Top" Text="{Binding RootObject, FallbackValue='No item selected', StringFormat='Root: {0}'}"/>
-                            <TextBlock DockPanel.Dock="Top" Text="{Binding ParentEntityName, FallbackValue='No item selected', StringFormat='ParentEntityName: {0}'}"/>
+                            <TextBlock DockPanel.Dock="Top" Text="{Binding Title, StringFormat='Component name: {0}'}"/>
+                            <TextBlock DockPanel.Dock="Top" Text="{Binding RootObject, StringFormat='Root: {0}'}"/>
+                            <TextBlock DockPanel.Dock="Top" Text="{Binding ParentEntityName, StringFormat='ParentEntityName: {0}'}"/>
                             <view:PropertiesControl Properties="{Binding Fields}" AddPropertyCommand="{Binding Source={StaticResource Proxy}, Path=Data.AddPropertyCommand}"/>
                         </DockPanel>
                     </DataTemplate>
diff --git a/SatisfactorySaveEditor/View/PropertiesControl.xaml.cs b/SatisfactorySaveEditor/View/PropertiesControl.xaml.cs
index 5a7c234..484d08d 100644
--- a/SatisfactorySaveEditor/View/PropertiesControl.xaml.cs
+++ b/SatisfactorySaveEditor/View/PropertiesControl.xaml.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using SatisfactorySaveParser.PropertyTypes;
+using SatisfactorySaveEditor.ViewModel.Property;
 
 namespace SatisfactorySaveEditor.View
 {
@@ -22,13 +22,13 @@ public ICommand AddPropertyCommand
             set => SetValue(AddPropertyCommandProperty, value);
         }
 
-        public ObservableCollection<SerializedProperty> Properties
+        public ObservableCollection<SerializedPropertyViewModel> Properties
         {
-            get => (ObservableCollection<SerializedProperty>)GetValue(PropertiesProperty);
+            get => (ObservableCollection<SerializedPropertyViewModel>)GetValue(PropertiesProperty);
             set => SetValue(PropertiesProperty, value);
         }
 
         public static readonly DependencyProperty AddPropertyCommandProperty = DependencyProperty.Register("AddPropertyCommand", typeof(ICommand), typeof(PropertiesControl));
-        public static readonly DependencyProperty PropertiesProperty = DependencyProperty.Register("Properties", typeof(ObservableCollection<SerializedProperty>), typeof(PropertiesControl));
+        public static readonly DependencyProperty PropertiesProperty = DependencyProperty.Register("Properties", typeof(ObservableCollection<SerializedPropertyViewModel>), typeof(PropertiesControl));
     }
 }
diff --git a/SatisfactorySaveEditor/View/PropertyTemplateDictionary.xaml b/SatisfactorySaveEditor/View/PropertyTemplateDictionary.xaml
index 786ab5d..e570e8b 100644
--- a/SatisfactorySaveEditor/View/PropertyTemplateDictionary.xaml
+++ b/SatisfactorySaveEditor/View/PropertyTemplateDictionary.xaml
@@ -1,9 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:propertyTypes="clr-namespace:SatisfactorySaveParser.PropertyTypes;assembly=SatisfactorySaveParser"
                     xmlns:view="clr-namespace:SatisfactorySaveEditor.View"
-                    xmlns:structs="clr-namespace:SatisfactorySaveParser.PropertyTypes.Structs;assembly=SatisfactorySaveParser">
-    <DataTemplate DataType="{x:Type propertyTypes:ArrayProperty}">
+                    xmlns:property="clr-namespace:SatisfactorySaveEditor.ViewModel.Property">
+    <DataTemplate DataType="{x:Type property:ArrayPropertyViewModel}">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="*"/>
@@ -18,31 +17,31 @@
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
-            <Button Grid.Row="1" Content="Add element" Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type view:MainWindow}}, Path=DataContext.AddPropertyCommand}" CommandParameter="{Binding .}"/>
+            <Button Grid.Row="1" Content="Add element" Command="{Binding AddElementCommand}"/>
         </Grid>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type propertyTypes:BoolProperty}">
+    <DataTemplate DataType="{x:Type property:BoolPropertyViewModel}">
         <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type propertyTypes:ByteProperty}">
+    <DataTemplate DataType="{x:Type property:BytePropertyViewModel}">
         <TextBox Margin="4" VerticalContentAlignment="Center" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type propertyTypes:EnumProperty}">
+    <DataTemplate DataType="{x:Type property:EnumPropertyViewModel}">
         <TextBox Margin="4" VerticalContentAlignment="Center" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type propertyTypes:FloatProperty}">
+    <DataTemplate DataType="{x:Type property:FloatPropertyViewModel}">
         <TextBox Margin="4" VerticalContentAlignment="Center" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type propertyTypes:IntProperty}">
+    <DataTemplate DataType="{x:Type property:IntPropertyViewModel}">
         <TextBox Margin="4" VerticalContentAlignment="Center" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type propertyTypes:MapProperty}">
+    <DataTemplate DataType="{x:Type property:MapPropertyViewModel}">
         <Label Margin="4" VerticalContentAlignment="Center" Content="// TODO: MAP STUFF"/>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type propertyTypes:NameProperty}">
+    <DataTemplate DataType="{x:Type property:NamePropertyViewModel}">
         <TextBox Margin="4" VerticalContentAlignment="Center" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type propertyTypes:ObjectProperty}">
+    <DataTemplate DataType="{x:Type property:ObjectPropertyViewModel}">
         <StackPanel Orientation="Vertical">
             <DockPanel>
                 <Label DockPanel.Dock="Left" Target="{Binding ElementName=ParentBox}" Content="Parent:"/>
@@ -61,13 +60,13 @@
             </DockPanel>
         </StackPanel>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type propertyTypes:StrProperty}">
+    <DataTemplate DataType="{x:Type property:StrPropertyViewModel}">
         <TextBox Margin="4" VerticalContentAlignment="Center" Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type propertyTypes:StructProperty}">
+    <DataTemplate DataType="{x:Type property:StructPropertyViewModel}">
         <StackPanel Orientation="Vertical">
-            <Label Margin="4,0,4,0" VerticalContentAlignment="Center" Content="{Binding Type, FallbackValue='OH NO'}" ContentStringFormat="Type: {0}"/>
-            <ItemsControl ItemsSource="{Binding Data.Fields}">
+            <Label Margin="4,0,4,0" VerticalContentAlignment="Center" Content="{Binding Type}" ContentStringFormat="Type: {0}"/>
+            <ItemsControl ItemsSource="{Binding Fields}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <GroupBox Header="{Binding PropertyName}">
@@ -78,7 +77,7 @@
             </ItemsControl>
         </StackPanel>
     </DataTemplate>
-    <DataTemplate DataType="{x:Type propertyTypes:TextProperty}">
+    <DataTemplate DataType="{x:Type property:TextPropertyViewModel}">
         <StackPanel Orientation="Vertical">
             <DockPanel>
                 <Label DockPanel.Dock="Left" Target="{Binding ElementName=ValueBox}" Content="Value:"/>
diff --git a/SatisfactorySaveEditor/ViewModel/AddViewModel.cs b/SatisfactorySaveEditor/ViewModel/AddViewModel.cs
index 20835f0..13873da 100644
--- a/SatisfactorySaveEditor/ViewModel/AddViewModel.cs
+++ b/SatisfactorySaveEditor/ViewModel/AddViewModel.cs
@@ -3,6 +3,7 @@
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.CommandWpf;
 using SatisfactorySaveEditor.Model;
+using SatisfactorySaveEditor.Util;
 using SatisfactorySaveParser.PropertyTypes;
 
 namespace SatisfactorySaveEditor.ViewModel
@@ -188,7 +189,7 @@ private void Ok(Window obj)
         {
             var property = CreateProperty(type, name);
             if (type == AddTypeEnum.Array) ((ArrayProperty) property).Type = FromAddTypeEnum(arrayType);
-            ObjectModel.Fields.Add(property);
+            ObjectModel.Fields.Add(PropertyViewModelMapper.Convert(property));
 
             obj.Close();
         }
diff --git a/SatisfactorySaveEditor/ViewModel/MainViewModel.cs b/SatisfactorySaveEditor/ViewModel/MainViewModel.cs
index c1377d2..c9e6b47 100644
--- a/SatisfactorySaveEditor/ViewModel/MainViewModel.cs
+++ b/SatisfactorySaveEditor/ViewModel/MainViewModel.cs
@@ -12,6 +12,7 @@
 using SatisfactorySaveParser.PropertyTypes;
 using System.IO;
 using System.Linq;
+using SatisfactorySaveEditor.ViewModel.Property;
 using SatisfactorySaveParser.Data;
 
 namespace SatisfactorySaveEditor.ViewModel
@@ -87,7 +88,7 @@ private void Cheat(string cheatType)
                         {
                             if (field.PropertyName == "mAvailableSchematics" || field.PropertyName == "mPurchasedSchematics")
                             {
-                                if (!(field is ArrayProperty arrayField))
+                                if (!(field is ArrayPropertyViewModel arrayField))
                                 {
                                     MessageBox.Show("Expected schematic data is of wrong type.\nThis means that the loaded save is probably corrupt. Aborting.", "Wrong schematics type", MessageBoxButton.OK, MessageBoxImage.Error);
                                     return;
@@ -97,7 +98,7 @@ private void Cheat(string cheatType)
                                 {
                                     if(!arrayField.Elements.Cast<ObjectProperty>().Any(e => e.Str2 == research))
                                     {
-                                        arrayField.Elements.Add(new ObjectProperty(null, "", research));
+                                        arrayField.Elements.Add(new ObjectPropertyViewModel(new ObjectProperty(null, "", research)));
                                     }
                                 }
                             }
@@ -115,16 +116,16 @@ private void Cheat(string cheatType)
                             return;
                         }
 
-                        if (cheatObject.Fields.FirstOrDefault(f => f.PropertyName == "mIsMapUnlocked") is BoolProperty mapUnlocked)
+                        if (cheatObject.Fields.FirstOrDefault(f => f.PropertyName == "mIsMapUnlocked") is BoolPropertyViewModel mapUnlocked)
                         {
                             mapUnlocked.Value = true;
                         }
                         else
                         {
-                            cheatObject.Fields.Add(new BoolProperty("mIsMapUnlocked")
+                            cheatObject.Fields.Add(new BoolPropertyViewModel(new BoolProperty("mIsMapUnlocked")
                             {
                                 Value = true
-                            });
+                            }));
                         }
 
                         MessageBox.Show("Map unlocked", "Success", MessageBoxButton.OK, MessageBoxImage.Information);
@@ -139,16 +140,16 @@ private void Cheat(string cheatType)
                             return;
                         }
 
-                        if (cheatObject.Fields.FirstOrDefault(f => f.PropertyName == "mNumAdditionalInventorySlots") is IntProperty inventorySize)
+                        if (cheatObject.Fields.FirstOrDefault(f => f.PropertyName == "mNumAdditionalInventorySlots") is IntPropertyViewModel inventorySize)
                         {
                             inventorySize.Value = 56;
                         }
                         else
                         {
-                            cheatObject.Fields.Add(new IntProperty("mNumAdditionalInventorySlots")
+                            cheatObject.Fields.Add(new IntPropertyViewModel(new IntProperty("mNumAdditionalInventorySlots")
                             {
                                 Value = 56
-                            });
+                            }));
                         }
 
                         MessageBox.Show("Inventory enlarged", "Success", MessageBoxButton.OK, MessageBoxImage.Information);
@@ -203,9 +204,6 @@ private void AddProperty(object obj)
                     avm.ObjectModel = som;
                     window.ShowDialog();
                     break;
-                case ArrayProperty ap:
-                    ap.Elements.Add(AddViewModel.CreateProperty(AddViewModel.FromStringType(ap.Type), $"Element {ap.Elements.Count}"));
-                    break;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(obj));
             }
diff --git a/SatisfactorySaveEditor/ViewModel/Property/ArrayPropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/ArrayPropertyViewModel.cs
new file mode 100644
index 0000000..99fc49d
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/ArrayPropertyViewModel.cs
@@ -0,0 +1,44 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using GalaSoft.MvvmLight.CommandWpf;
+using SatisfactorySaveEditor.Util;
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class ArrayPropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly ArrayProperty model;
+
+        public RelayCommand AddElementCommand { get; }
+
+        public ObservableCollection<SerializedPropertyViewModel> Elements { get; }
+
+        public string Type => model.Type;
+
+        public ArrayPropertyViewModel(ArrayProperty arrayProperty) : base(arrayProperty)
+        {
+            model = arrayProperty;
+
+            Elements = new ObservableCollection<SerializedPropertyViewModel>(arrayProperty.Elements.Select(PropertyViewModelMapper.Convert));
+
+            AddElementCommand = new RelayCommand(AddElement);
+        }
+
+        private void AddElement()
+        {
+            var property = AddViewModel.CreateProperty(AddViewModel.FromStringType(Type), $"Element {Elements.Count}");
+            Elements.Add(PropertyViewModelMapper.Convert(property));
+        }
+
+        public override void ApplyChanges()
+        {
+            model.Elements.Clear();
+            foreach (var element in Elements)
+            {
+                element.ApplyChanges();
+                model.Elements.Add(element.Model);
+            }
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/BoolPropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/BoolPropertyViewModel.cs
new file mode 100644
index 0000000..3ff9416
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/BoolPropertyViewModel.cs
@@ -0,0 +1,29 @@
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class BoolPropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly BoolProperty model;
+
+        private bool value;
+
+        public bool Value
+        {
+            get => value;
+            set { Set(() => Value, ref this.value, value); }
+        }
+
+        public BoolPropertyViewModel(BoolProperty boolProperty) : base(boolProperty)
+        {
+            model = boolProperty;
+
+            value = model.Value;
+        }
+
+        public override void ApplyChanges()
+        {
+            model.Value = value;
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/BytePropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/BytePropertyViewModel.cs
new file mode 100644
index 0000000..b095ad1
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/BytePropertyViewModel.cs
@@ -0,0 +1,29 @@
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class BytePropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly ByteProperty model;
+
+        private string value;
+
+        public string Value
+        {
+            get => value;
+            set { Set(() => Value, ref this.value, value); }
+        }
+
+        public BytePropertyViewModel(ByteProperty byteProperty) : base(byteProperty)
+        {
+            model = byteProperty;
+
+            value = model.Value;
+        }
+
+        public override void ApplyChanges()
+        {
+            model.Value = value;
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/EnumPropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/EnumPropertyViewModel.cs
new file mode 100644
index 0000000..7857085
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/EnumPropertyViewModel.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class EnumPropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly EnumProperty model;
+
+        private int value;
+
+        public int Value
+        {
+            get => value;
+            set { Set(() => Value, ref this.value, value); }
+        }
+
+        public EnumPropertyViewModel(EnumProperty enumProperty) : base(enumProperty)
+        {
+            model = enumProperty;
+
+            value = model.Value;
+        }
+
+        public override void ApplyChanges()
+        {
+            model.Value = value;
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/FloatPropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/FloatPropertyViewModel.cs
new file mode 100644
index 0000000..d338579
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/FloatPropertyViewModel.cs
@@ -0,0 +1,29 @@
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class FloatPropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly FloatProperty model;
+
+        private float value;
+
+        public float Value
+        {
+            get => value;
+            set { Set(() => Value, ref this.value, value); }
+        }
+
+        public FloatPropertyViewModel(FloatProperty floatProperty) : base(floatProperty)
+        {
+            model = floatProperty;
+
+            value = model.Value;
+        }
+
+        public override void ApplyChanges()
+        {
+            model.Value = value;
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/IntPropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/IntPropertyViewModel.cs
new file mode 100644
index 0000000..5e9f28e
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/IntPropertyViewModel.cs
@@ -0,0 +1,29 @@
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class IntPropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly IntProperty model;
+
+        private int value;
+
+        public int Value
+        {
+            get => value;
+            set { Set(() => Value, ref this.value, value); }
+        }
+
+        public IntPropertyViewModel(IntProperty intProperty) : base(intProperty)
+        {
+            model = intProperty;
+
+            value = model.Value;
+        }
+
+        public override void ApplyChanges()
+        {
+            model.Value = value;
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/MapPropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/MapPropertyViewModel.cs
new file mode 100644
index 0000000..676151f
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/MapPropertyViewModel.cs
@@ -0,0 +1,18 @@
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class MapPropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly MapProperty model;
+
+        public MapPropertyViewModel(MapProperty mapProperty) : base(mapProperty)
+        {
+            model = mapProperty;
+        }
+
+        public override void ApplyChanges()
+        {
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/NamePropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/NamePropertyViewModel.cs
new file mode 100644
index 0000000..1e8c176
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/NamePropertyViewModel.cs
@@ -0,0 +1,29 @@
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class NamePropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly NameProperty model;
+
+        private string value;
+
+        public string Value
+        {
+            get => value;
+            set { Set(() => Value, ref this.value, value); }
+        }
+
+        public NamePropertyViewModel(NameProperty nameProperty) : base(nameProperty)
+        {
+            model = nameProperty;
+
+            value = model.Value;
+        }
+
+        public override void ApplyChanges()
+        {
+            model.Value = value;
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/ObjectPropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/ObjectPropertyViewModel.cs
new file mode 100644
index 0000000..b31f1fb
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/ObjectPropertyViewModel.cs
@@ -0,0 +1,38 @@
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class ObjectPropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly ObjectProperty model;
+
+        private string str1;
+        private string str2;
+
+        public string Str1
+        {
+            get => str1;
+            set { Set(() => Str1, ref str1, value); }
+        }
+
+        public string Str2
+        {
+            get => str2;
+            set { Set(() => Str2, ref str2, value); }
+        }
+
+        public ObjectPropertyViewModel(ObjectProperty objectProperty) : base(objectProperty)
+        {
+            model = objectProperty;
+
+            str1 = model.Str1;
+            str2 = model.Str2;
+        }
+
+        public override void ApplyChanges()
+        {
+            model.Str1 = str1;
+            model.Str2 = str2;
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/SerializedPropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/SerializedPropertyViewModel.cs
new file mode 100644
index 0000000..1638f75
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/SerializedPropertyViewModel.cs
@@ -0,0 +1,19 @@
+using GalaSoft.MvvmLight;
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public abstract class SerializedPropertyViewModel : ViewModelBase
+    {
+        public readonly SerializedProperty Model;
+
+        public string PropertyName => Model.PropertyName;
+
+        protected SerializedPropertyViewModel(SerializedProperty serializedProperty)
+        {
+            Model = serializedProperty;
+        }
+
+        public abstract void ApplyChanges();
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/StrPropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/StrPropertyViewModel.cs
new file mode 100644
index 0000000..8ba133b
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/StrPropertyViewModel.cs
@@ -0,0 +1,29 @@
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class StrPropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly StrProperty model;
+
+        private string value;
+
+        public string Value
+        {
+            get => value;
+            set { Set(() => Value, ref this.value, value); }
+        }
+
+        public StrPropertyViewModel(StrProperty strProperty) : base(strProperty)
+        {
+            model = strProperty;
+
+            value = model.Value;
+        }
+
+        public override void ApplyChanges()
+        {
+            model.Value = value;
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/StructPropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/StructPropertyViewModel.cs
new file mode 100644
index 0000000..7660d3d
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/StructPropertyViewModel.cs
@@ -0,0 +1,33 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using SatisfactorySaveEditor.Util;
+using SatisfactorySaveParser.PropertyTypes;
+using SatisfactorySaveParser.PropertyTypes.Structs;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class StructPropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly StructProperty model;
+
+        public string Type => model.Type;
+
+        public ObservableCollection<SerializedPropertyViewModel> Fields { get; }
+
+        public StructPropertyViewModel(StructProperty structProperty) : base(structProperty)
+        {
+            model = structProperty;
+
+            if (model.Data is DynamicStructData dsd)
+            {
+                Fields = new ObservableCollection<SerializedPropertyViewModel>(dsd.Fields.Select(PropertyViewModelMapper.Convert));
+            }
+            else Fields = new ObservableCollection<SerializedPropertyViewModel>();
+        }
+
+        public override void ApplyChanges()
+        {
+            foreach (var field in Fields) field.ApplyChanges();
+        }
+    }
+}
diff --git a/SatisfactorySaveEditor/ViewModel/Property/TextPropertyViewModel.cs b/SatisfactorySaveEditor/ViewModel/Property/TextPropertyViewModel.cs
new file mode 100644
index 0000000..66067cb
--- /dev/null
+++ b/SatisfactorySaveEditor/ViewModel/Property/TextPropertyViewModel.cs
@@ -0,0 +1,38 @@
+using SatisfactorySaveParser.PropertyTypes;
+
+namespace SatisfactorySaveEditor.ViewModel.Property
+{
+    public class TextPropertyViewModel : SerializedPropertyViewModel
+    {
+        private readonly TextProperty model;
+
+        private string value;
+        private int unknown4;
+
+        public string Value
+        {
+            get => value;
+            set { Set(() => Value, ref this.value, value); }
+        }
+
+        public int Unknown4
+        {
+            get => unknown4;
+            set { Set(() => Unknown4, ref this.unknown4, value); }
+        }
+
+        public TextPropertyViewModel(TextProperty textProperty) : base(textProperty)
+        {
+            model = textProperty;
+
+            value = model.Value;
+            unknown4 = model.Unknown4;
+        }
+
+        public override void ApplyChanges()
+        {
+            model.Value = value;
+            model.Unknown4 = unknown4;
+        }
+    }
+}