From fb7a4aefbd5a94166366e80945c46539d58b6e9c Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 15:49:21 +0200
Subject: [PATCH 01/19] prepare UI for CC export

---
 Config.cs          | 11 +++++--
 MainWindow.xaml    | 16 ++++++---
 MainWindow.xaml.cs | 81 +++++++++++++++++++++++++++++++++++++---------
 3 files changed, 86 insertions(+), 22 deletions(-)

diff --git a/Config.cs b/Config.cs
index 808bdf1..7316820 100644
--- a/Config.cs
+++ b/Config.cs
@@ -1,9 +1,6 @@
 #nullable disable warnings
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Windows.Media.Animation;
 
 namespace TSW3LM
 {
@@ -41,6 +38,12 @@ public static string GamePath
             set { entries.GamePath = value; if (!entries.SkipAutosave) Save(); }
         }
 
+        public static string CCPath
+        {
+            get { return entries.CCPath; }
+            set { entries.CCPath = value; if (!entries.SkipAutosave) Save(); }
+        }
+
         public static string LibraryPath
         {
             get { return entries.LibraryPath; }
@@ -87,6 +90,7 @@ private class Entries
         {
             public bool SkipAutosave = false;
             public string GamePath = "";
+            public string CCPath = "";
             public string LibraryPath = "";
             public bool NoUpdate = false;
             public bool DevUpdates = false;
@@ -97,6 +101,7 @@ internal void ApplyDefaults()
             {
                 SkipAutosave = false;
                 GamePath = "";
+                CCPath = "";
                 LibraryPath = "";
                 NoUpdate = false;
                 DevUpdates = false;
diff --git a/MainWindow.xaml b/MainWindow.xaml
index fa0c2cc..3fd2d31 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -23,11 +23,19 @@
         <Rectangle Fill="#FFC2FF79" Margin="10,10,10,10" Stroke="Black" Grid.Column="2"/>
         <TextBox x:Name="txtGameDir" Height="22" Margin="20,30,115,-6" TextWrapping="NoWrap" VerticalAlignment="Top" MaxLines="1" Grid.Column="2"/>
         <Button Content="Set Game Dir" Height="22" Margin="0,30,20,0" VerticalAlignment="Top" Click="btnGameDir_Click" Grid.Column="2" HorizontalAlignment="Right" Width="85"/>
-        <ListBox x:Name="lstGameLiveries" Margin="20,60,20,20" IsEnabled="{Binding Useable}" Grid.Column="2" SelectionChanged="lstGameLiveries_Change"/>
+        <TabControl HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20,60,20,20" SelectionChanged="GameTab_SelectionChanged" Grid.Column="2">
+            <TabItem x:Name="tab_Game" Header="Game" IsSelected="True">
+                <Grid Background="#FFE5E5E5"/>
+            </TabItem>
+            <TabItem x:Name="tab_CC" Header="CC">
+                <Grid Background="#FFE5E5E5"/>
+            </TabItem>
+        </TabControl>
+        <ListBox x:Name="lstGameLiveries" Margin="20,81,20,20" IsEnabled="{Binding Useable}" Grid.Column="2" SelectionChanged="lstGameLiveries_Change"/>
         <Button Content="BACKUP!" HorizontalAlignment="Center" Height="41" Margin="0,22,0,0" VerticalAlignment="Top" Width="108" FontSize="24" FontWeight="Bold" Click="btnBackup_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
         <TextBox x:Name="txtLibDir" Height="22" Margin="20,30,105,0" TextWrapping="NoWrap" VerticalAlignment="Top" MaxLines="1"/>
         <Button Content="Set Lib Dir" Height="22" Margin="0,30,20,0" VerticalAlignment="Top" Click="btnLibDir_Click" HorizontalAlignment="Right" Width="75"/>
-        <TabControl HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20,60,20,20" SelectionChanged="TabControl_SelectionChanged">
+        <TabControl HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20,60,20,20" SelectionChanged="LibraryTab_SelectionChanged">
             <TabItem x:Name="tab_Tsw3" Header="TSW3" IsSelected="True">
                 <Grid Background="#FFE5E5E5"/>
             </TabItem>
@@ -36,8 +44,8 @@
             </TabItem>
         </TabControl>
         <ListBox x:Name="lstLibraryLiveries" Margin="20,80,20,20" IsEnabled="{Binding Useable}"/>
-        <Button Content="IMPORT  🡒" HorizontalAlignment="Center" Height="36" Margin="0,205,0,0" VerticalAlignment="Top" Width="108" Click="btnImport_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
-        <Button Content="🡐 EXPORT" HorizontalAlignment="Center" Height="35" Margin="0,241,0,0" VerticalAlignment="Top" Width="108" Click="btnExport_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
+        <Button Content="IMPORT  🡒" HorizontalAlignment="Center" Height="36" Margin="0,205,0,0" VerticalAlignment="Top" Width="108" Click="btnImport_Click" IsEnabled="{Binding ImportActive}" Grid.Column="1"/>
+        <Button Content="🡐 EXPORT" HorizontalAlignment="Center" Height="35" Margin="0,241,0,0" VerticalAlignment="Top" Width="108" Click="btnExport_Click" IsEnabled="{Binding ExportActive}" Grid.Column="1"/>
         <Button Content="View/Edit Info >" HorizontalAlignment="Center" Height="20" Margin="0,125,0,0" VerticalAlignment="Top" Width="108" Click="btnInfo_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
         <!--<Button Content="*.tsw2liv Import 🡒" HorizontalAlignment="Center" Height="20" Margin="0,170,0,0" VerticalAlignment="Top" Width="108" Click="btnTsw2Import_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>-->
         <Button Content="RESTORE" HorizontalAlignment="Center" Height="41" Margin="0,63,0,0" VerticalAlignment="Top" Width="108" Click="btnRestore_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 8df942a..23a9050 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -210,30 +210,56 @@ internal void PrintHelp()
             Application.Current.Shutdown();
         }
 
-        internal void UpdateGameGui()
+        internal void UpdateGameGui(bool cc = false)
         {
-            Log.Message("Updating game liveries in GUI...", "MW:UpdateGameGui");
-            lstGameLiveries.Items.Clear();
-            for (int i = 0; i < Config.MaxGameLiveries; i++)
+            if (cc)
             {
-                if (!Game.Liveries.ContainsKey(i))
-                    lstGameLiveries.Items.Add($"({i+1}) <empty>");
-                else
+                if (Config.CCPath == "" && Config.GamePath != "")
                 {
-                    string Id = Game.Liveries[i].ID;
-                    GameLiveryInfo.Info Info = GameLiveryInfo.Get(Id);
-                    string Text = Game.Liveries[i].Compressed ? $"({i + 1}) {Info.Name} for {Info.Model}" : $"({i+1}) [RAW] {Info.Name} for {Info.Model}";
-                    lstGameLiveries.Items.Add(Text);
-                    Log.Message($"Added game livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                    if (Directory.Exists($"{Config.GamePath.Replace("\\SaveGames\\UGCLiveries_0.sav", "")}\\PersistentDownloadDir"))
+                        Config.CCPath = $"{Config.GamePath.Replace("\\SaveGames\\UGCLiveries_0.sav", "")}\\PersistentDownloadDir\\UGC\\0";
+                    else
+                    {
+                        tab_Game.IsSelected = true;
+                        ShowStatusText("You don't have any CC-Liveries");
+                        return;
+                    }
+                }
+                ((Data)DataContext).ImportActive = false;
+                tab_CC.IsSelected = true;
+
+
+            }
+            else
+            {
+                ((Data)DataContext).ImportActive = true;
+                tab_Game.IsSelected = true;
+
+                Log.Message("Updating game liveries in GUI...", "MW:UpdateGameGui");
+                lstGameLiveries.Items.Clear();
+                for (int i = 0; i < Config.MaxGameLiveries; i++)
+                {
+                    if (!Game.Liveries.ContainsKey(i))
+                        lstGameLiveries.Items.Add($"({i + 1}) <empty>");
+                    else
+                    {
+                        string Id = Game.Liveries[i].ID;
+                        GameLiveryInfo.Info Info = GameLiveryInfo.Get(Id);
+                        string Text = Game.Liveries[i].Compressed ? $"({i + 1}) {Info.Name} for {Info.Model}" : $"({i + 1}) [RAW] {Info.Name} for {Info.Model}";
+                        lstGameLiveries.Items.Add(Text);
+                        Log.Message($"Added game livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                    }
                 }
+                Log.Message("Game liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
             }
-            Log.Message("Game liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
         }
 
         internal void UpdateLibraryGui(bool tsw3 = true)
         {
             if (tsw3)
             {
+                ((Data)DataContext).ExportActive = true;
+
                 tab_Tsw3.IsSelected = true;
                 Log.Message("Updating library liveries in GUI...", "MW:UpdateLibraryGui");
                 lstLibraryLiveries.Items.Clear();
@@ -249,6 +275,8 @@ internal void UpdateLibraryGui(bool tsw3 = true)
             }
             else
             {
+                ((Data)DataContext).ExportActive = false;
+
                 tab_Tsw2.IsSelected = true;
                 Log.Message("Updating TSW2 liveries in GUI...", "MW:UpdateLiveryGui");
                 lstLibraryLiveries.Items.Clear();
@@ -612,7 +640,7 @@ private void lstGameLiveries_Change(object sender, SelectionChangedEventArgs e)
                 UpdateLiveryInfoWindow(null, false);
         }
 
-        private void TabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void LibraryTab_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (!((Data)DataContext).Useable) return;
             if (e.Source is TabControl)
@@ -620,6 +648,15 @@ private void TabControl_SelectionChanged(object sender, SelectionChangedEventArg
                 UpdateLibraryGui(tab_Tsw3.IsSelected);
             }
         }
+
+        private void GameTab_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (!((Data)DataContext).Useable) return;
+            if (e.Source is TabControl)
+            {
+                UpdateGameGui(tab_CC.IsSelected);
+            }
+        }
     }
 
     public class Data : INotifyPropertyChanged
@@ -628,7 +665,21 @@ public class Data : INotifyPropertyChanged
         public bool Useable
         {
             get { return _useable; }
-            set { _useable = value; OnPropertyChanged("Useable"); }
+            set { _useable = value; OnPropertyChanged("Useable"); OnPropertyChanged("ExportActive"); OnPropertyChanged("ImportActive"); }
+        }
+
+        public bool _exportActive = true;
+        public bool ExportActive
+        {
+            get { return _exportActive && _useable; }
+            set { _exportActive = value; OnPropertyChanged("ExportActive"); }
+        }
+
+        public bool _importActive = true;
+        public bool ImportActive
+        {
+            get { return _importActive && _useable; }
+            set { _importActive = value; OnPropertyChanged("ImportActive"); }
         }
 
         public event PropertyChangedEventHandler PropertyChanged;

From f92b8f63585cfad0733c445bfb36fec51bd1bcbe Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 17:18:14 +0200
Subject: [PATCH 02/19] added code for cc to library livery

---
 Utils.cs | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 102 insertions(+), 2 deletions(-)

diff --git a/Utils.cs b/Utils.cs
index d5cb956..53ac6d4 100644
--- a/Utils.cs
+++ b/Utils.cs
@@ -1,16 +1,16 @@
 #nullable enable
 using GvasConverter;
+using GvasFormat.Serialization;
 using GvasFormat.Serialization.UETypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Windows.Forms;
+using System.Text;
 
 namespace TSW3LM
 {
@@ -18,6 +18,8 @@ static class Utils
     {
         private static Random random = new Random();
 
+        private static UTF8Encoding Utf8 = new UTF8Encoding(false);
+
         internal static string GenerateHex(int digits)
         {
             byte[] buffer = new byte[digits / 2];
@@ -272,6 +274,104 @@ private static Property IdentifyMisplacedProperty(UEProperty p)
             return Property.UNKNOWN;
         }
 
+        internal static Library.Livery ConvertCC(byte[] ccData)
+        {
+            byte[] data = new byte[ccData.Length - 0x10];
+            for (int j = 0; j < data.Length; j++)
+            {
+                data[j] = ccData[0x10 + j];
+            }
+
+            BinaryReader reader = new BinaryReader(new MemoryStream(data));
+            string Name = reader.ReadUEString();
+            int i = reader.ReadInt32();
+            if (i != 0) throw new FormatException($"Expected 4 byte integer '0' at offset {reader.BaseStream.Position - 4:x}, was {i:x}");
+            string s = reader.ReadUEString();
+            if (s != "EUGCType::Livery") throw new FormatException($"Expected UE String 'EUGCType::Livery' to start at offset 0x{reader.BaseStream.Position - 21:x}, was '{s}'");
+            long l = reader.ReadInt64();
+            if (l != 0) throw new FormatException($"Expected 8 byte integer '0' at offset {reader.BaseStream.Position - 8:x}, was {l:x}");
+            i = reader.ReadInt32();
+            if (l != 0) throw new FormatException($"Expected 4 byte integer '0' at offset {reader.BaseStream.Position - 4:x}, was {i:x}");
+            s = reader.ReadUEString();
+            if (s != "Blob") throw new FormatException($"Expected UEProperty Name 'Blob' to start at offset 0x{reader.BaseStream.Position - 9:x}, was '{s}'");
+            s = reader.ReadUEString();
+            if (s != "ArrayProperty") throw new FormatException($"Expected UEProperty Type 'ArrayProperty' to start at offset 0x{reader.BaseStream.Position - 18:x}, was '{s}'");
+            l = reader.ReadInt64();
+            if (l == 0) throw new FormatException($"Expected 8 byte valueLength '!= 0' at offset {reader.BaseStream.Position - 8:x}, was 0");
+            s = reader.ReadUEString();
+            if (s != "ByteProperty") throw new FormatException($"Expected UEArrayProperty ItemType 'ByteProperty' to start at offset 0x{reader.BaseStream.Position - 17:x}, was '{s}'");
+            i = reader.ReadInt32();
+            if (i == 0) throw new FormatException($"Expected 4 byte UEArrayProperty Count '!= 0' at offset {reader.BaseStream.Position - 4:x}, was 0");
+            byte b = reader.ReadByte();
+            if (b != 0) throw new FormatException($"Expected 1 byte '0' at offset {reader.BaseStream.Position - 1:x}, was {b:x}");
+
+            UEGenericStructProperty prop = new UEGenericStructProperty();
+            prop.StructType = "ReskinSave";
+            prop.Name = "Reskins";
+            prop.Type = "StructProperty";
+            prop.ValueLength = 0; //TODO: Determine
+
+            UEStringProperty idProp = new UEStringProperty { Name = "ID", Type = "NameProperty" };
+            idProp.Value = reader.ReadUEString();
+            idProp.ValueLength = Utf8.GetByteCount(idProp.Value) + 5;
+            prop.Properties.Add(idProp);
+
+            UEDateTimeStructProperty createdDateProp = new UEDateTimeStructProperty { Name = "CreatedDate", Type = "StructProperty", StructType = "DateTime", ValueLength = 8 };
+            createdDateProp.Value = DateTime.FromBinary(reader.ReadInt64());
+            prop.Properties.Add(createdDateProp);
+
+            UETextProperty displayNameProp = new UETextProperty { Name = "DisplayName", Type = "TextProperty", Id = "0" };
+            displayNameProp.Flags = reader.ReadInt64();
+            b = reader.ReadByte();
+            if (b != 0) throw new FormatException($"Expected 1 byte '0' at offset {reader.BaseStream.Position - 1:x}, was {b:x}");
+            displayNameProp.Value = reader.ReadUEString();
+            displayNameProp.ValueLength = Utf8.GetByteCount(displayNameProp.Value) + 14;
+            prop.Properties.Add(displayNameProp);
+
+            UEStringProperty baseDefinitionProp = new UEStringProperty { Name = "BaseDefinition", Type = "SoftObjectProperty" };
+            baseDefinitionProp.Value = reader.ReadUEString();
+            baseDefinitionProp.ValueLength = Utf8.GetByteCount(baseDefinitionProp.Value) + 5;
+            prop.Properties.Add(baseDefinitionProp);
+
+            i = reader.ReadInt32();
+            if (i != 0) throw new FormatException($"Expected 4 byte integer '0' at offset {reader.BaseStream.Position - 4:x}, was {i:x}");
+            i = reader.ReadInt32();
+            if (i == 0) throw new FormatException($"Expected 4 byte Count '!= 0' at offset {reader.BaseStream.Position - 4:x}, was 0");
+
+            UEProperty reskinnedElementsProp = UEProperty.Read(reader);
+            if (reskinnedElementsProp is UEGenericStructProperty)
+                prop.Properties.Add(reskinnedElementsProp);
+            else
+                throw new FormatException($"Expected to deserialize a UEGenericStructProperty, was {reskinnedElementsProp.GetType()}");
+
+            UEProperty noneProp = UEProperty.Read(reader);
+            if (noneProp is UEGenericStructProperty)
+            {
+                prop.Properties.Add(noneProp);
+                prop.Properties.Add(UEProperty.Read(reader));
+            }
+            else
+            {
+                UEGenericStructProperty reskinEditorDataProp = new UEGenericStructProperty { Name = "ReskinEditorData", Type = "StructProperty", StructType = "DTGReskinEditData" };
+                ((UEGenericStructProperty)reskinnedElementsProp).Properties.RemoveAll(p => p is UEMapProperty && p.Name == "MaterialInstances");
+                UEProperty lastUsedColoursProp = ((UEGenericStructProperty)reskinnedElementsProp).Properties.First(p => p is UEArrayProperty && p.Name == "LastUsedColours");
+                ((UEGenericStructProperty)reskinnedElementsProp).Properties.Remove(lastUsedColoursProp);
+                reskinEditorDataProp.Properties.Add(lastUsedColoursProp);
+                reskinEditorDataProp.Properties.Add(new UENoneProperty());
+
+                prop.Properties.Add(reskinEditorDataProp);
+                prop.Properties.Add(noneProp);
+            }
+            while (UEProperty.Read(reader) is UEProperty p)
+            {
+                if (p is UEGenericStructProperty && !(((UEGenericStructProperty)p).Properties[^1] is UENoneProperty))
+                    ((UEGenericStructProperty)p).Properties.Add(new UENoneProperty());
+                prop.Properties.Add(p);
+            }
+
+            return new Library.Livery($"cc_{Name}.tsw3", prop, displayNameProp.Value, baseDefinitionProp.Value.Split('.')[^1], false);
+        }
+
         private enum Property
         {
             UNKNOWN = 0,

From 455e73786088a59b2794c1a89bc59d3109321d49 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 17:23:20 +0200
Subject: [PATCH 03/19] main logic for showing CC liveries

---
 MainWindow.xaml.cs | 12 +++++++++++-
 Utils.cs           | 23 ++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 23a9050..8dbd95f 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -228,6 +228,16 @@ internal void UpdateGameGui(bool cc = false)
                 ((Data)DataContext).ImportActive = false;
                 tab_CC.IsSelected = true;
 
+                Log.Message("Updating creators club liveries in GUI...", "MW:UpdateGameGui");
+                lstGameLiveries.Items.Clear();
+                foreach (FileInfo info in new DirectoryInfo(Config.CCPath).GetFiles("*.ugc"))
+                {
+                    Library.Livery livery = Utils.ConvertCC(File.ReadAllBytes(info.FullName));
+                    string Text = $"{livery.Name} for {livery.Model} <{info.Name}>";
+                    lstGameLiveries.Items.Add(Text);
+                    Log.Message($"Added CC livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                }
+                Log.Message("Creators club liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
 
             }
             else
@@ -280,7 +290,7 @@ internal void UpdateLibraryGui(bool tsw3 = true)
                 tab_Tsw2.IsSelected = true;
                 Log.Message("Updating TSW2 liveries in GUI...", "MW:UpdateLiveryGui");
                 lstLibraryLiveries.Items.Clear();
-                foreach(FileInfo f in new DirectoryInfo(Config.LibraryPath).GetFiles("*.tsw2liv"))
+                foreach (FileInfo f in new DirectoryInfo(Config.LibraryPath).GetFiles("*.tsw2liv"))
                 {
                     try
                     {
diff --git a/Utils.cs b/Utils.cs
index 53ac6d4..932c6ba 100644
--- a/Utils.cs
+++ b/Utils.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using GvasConverter;
-using GvasFormat.Serialization;
 using GvasFormat.Serialization.UETypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -382,6 +381,28 @@ private enum Property
             RESKINNED_ELEMENTS = 5,
             RESKIN_EDITOR_DATA = 6
         }
+
+        public static string ReadUEString(this BinaryReader reader)
+        {
+#pragma warning disable CS8603 // Mögliche Nullverweisrückgabe.
+            //if (reader.PeekChar() < 0)
+            //    return null;
+
+            var length = reader.ReadInt32();
+            if (length == 0)
+                return null;
+
+            if (length == 1)
+                return "";
+
+            if (length < 0)
+                length = -2 * length;
+
+            var valueBytes = reader.ReadBytes(length);
+            return Utf8.GetString(valueBytes, 0, valueBytes.Length - 1);
+
+#pragma warning restore CS8603 // Mögliche Nullverweisrückgabe.
+        }
     }
 
     class Log

From 9f4c53080d97b430a014acc06bdcda166f972bf0 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 17:50:59 +0200
Subject: [PATCH 04/19] logic for exporting cc liveries

---
 MainWindow.xaml.cs | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 8dbd95f..f784076 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -228,7 +228,7 @@ internal void UpdateGameGui(bool cc = false)
                 ((Data)DataContext).ImportActive = false;
                 tab_CC.IsSelected = true;
 
-                Log.Message("Updating creators club liveries in GUI...", "MW:UpdateGameGui");
+                Log.Message("Updating CC liveries in GUI...", "MW:UpdateGameGui");
                 lstGameLiveries.Items.Clear();
                 foreach (FileInfo info in new DirectoryInfo(Config.CCPath).GetFiles("*.ugc"))
                 {
@@ -237,7 +237,7 @@ internal void UpdateGameGui(bool cc = false)
                     lstGameLiveries.Items.Add(Text);
                     Log.Message($"Added CC livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
                 }
-                Log.Message("Creators club liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                Log.Message("CC liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
 
             }
             else
@@ -332,13 +332,12 @@ private void ImportTsw2Livery(string fileName)
             Log.Message($"Importing TSW2 livery from {fileName}", "MW:ImportTsw2Livery");
             try
             {
-                Game.Livery livery = Utils.ConvertTSW2(File.ReadAllBytes(fileName), false);
+                Game.Livery livery = Utils.ConvertTSW2(File.ReadAllBytes($"{Config.LibraryPath}\\{fileName}"), false);
                 string name = ((UETextProperty)livery.GvasBaseProperty.Properties.First(p => p is UETextProperty && p.Name == "DisplayName")).Value;
                 string model = ((UEStringProperty)livery.GvasBaseProperty.Properties.First(p => p is UEStringProperty && p.Name == "BaseDefinition")).Value.Split(".")[^1];
                 string newId = GameLiveryInfo.SetInfo(livery.ID, name, model);
                 livery.ID = newId;
                 Game.Add(livery);
-                UpdateGameGui();
                 ShowStatusText("*.tsw2liv successfully imported");
             }
             catch (Exception e)
@@ -385,8 +384,23 @@ internal void ExportLivery(Game.Livery gl)
 
             Log.Message($"Livery successfully exported (FileName: {ll.FileName})", "MW:ExportLivery", Log.LogLevel.DEBUG);
             ShowStatusText("Livery successfully exported");
+        }
 
-            UpdateLibraryGui();
+        private void ExportCCLivery(string fileName)
+        {
+            Log.Message($"Exporting CC livery from {fileName}", "MW:ExportCCLivery");
+            try
+            {
+                Library.Livery livery = Utils.ConvertCC(File.ReadAllBytes($"{Config.CCPath}\\{fileName}"));
+                Library.Add(livery);
+                Library.Save(livery);
+                ShowStatusText("CC livery successfully exported");
+            }
+            catch (Exception e)
+            {
+                Log.Exception("Error exporting CC livery!", e, "MW:ExportCCLivery");
+                lblMessage.Content = $"[ERR] Error while exporting CC livery: {e.Message}";
+            }
         }
 
         private void UpdateLiveryInfoWindow(Game.Livery livery, bool show)
@@ -474,7 +488,10 @@ private void btnExport_Click(object sender, RoutedEventArgs e)
             }
 
             lblMessage.Content = "";
-            PrepareLiveryExport(Game.Liveries[lstGameLiveries.SelectedIndex]);
+            if (tab_Game.IsSelected)
+                PrepareLiveryExport(Game.Liveries[lstGameLiveries.SelectedIndex]);
+            else if (tab_CC.IsSelected)
+                ExportCCLivery(lstGameLiveries.SelectedItem.ToString().Split("<")[^1].Split(">")[0]);
             UpdateLibraryGui();
         }
 
@@ -490,7 +507,7 @@ private void btnImport_Click(object sender, RoutedEventArgs e)
             if (tab_Tsw3.IsSelected)
                 ImportLivery(Library.Liveries[lstLibraryLiveries.SelectedIndex]);
             else if (tab_Tsw2.IsSelected)
-                ImportTsw2Livery($"{Config.LibraryPath}\\{lstLibraryLiveries.SelectedItem.ToString().Split("<")[^1].Split(">")[0]}");
+                ImportTsw2Livery(lstLibraryLiveries.SelectedItem.ToString().Split("<")[^1].Split(">")[0]);
             UpdateGameGui();
         }
 

From 8e0b4c58d338d1972c3fc2d108769d9da5693700 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 15:49:21 +0200
Subject: [PATCH 05/19] prepare UI for CC export

---
 Config.cs          | 11 +++++--
 MainWindow.xaml    | 16 ++++++---
 MainWindow.xaml.cs | 81 +++++++++++++++++++++++++++++++++++++---------
 3 files changed, 86 insertions(+), 22 deletions(-)

diff --git a/Config.cs b/Config.cs
index 808bdf1..7316820 100644
--- a/Config.cs
+++ b/Config.cs
@@ -1,9 +1,6 @@
 #nullable disable warnings
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Windows.Media.Animation;
 
 namespace TSW3LM
 {
@@ -41,6 +38,12 @@ public static string GamePath
             set { entries.GamePath = value; if (!entries.SkipAutosave) Save(); }
         }
 
+        public static string CCPath
+        {
+            get { return entries.CCPath; }
+            set { entries.CCPath = value; if (!entries.SkipAutosave) Save(); }
+        }
+
         public static string LibraryPath
         {
             get { return entries.LibraryPath; }
@@ -87,6 +90,7 @@ private class Entries
         {
             public bool SkipAutosave = false;
             public string GamePath = "";
+            public string CCPath = "";
             public string LibraryPath = "";
             public bool NoUpdate = false;
             public bool DevUpdates = false;
@@ -97,6 +101,7 @@ internal void ApplyDefaults()
             {
                 SkipAutosave = false;
                 GamePath = "";
+                CCPath = "";
                 LibraryPath = "";
                 NoUpdate = false;
                 DevUpdates = false;
diff --git a/MainWindow.xaml b/MainWindow.xaml
index fa0c2cc..3fd2d31 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -23,11 +23,19 @@
         <Rectangle Fill="#FFC2FF79" Margin="10,10,10,10" Stroke="Black" Grid.Column="2"/>
         <TextBox x:Name="txtGameDir" Height="22" Margin="20,30,115,-6" TextWrapping="NoWrap" VerticalAlignment="Top" MaxLines="1" Grid.Column="2"/>
         <Button Content="Set Game Dir" Height="22" Margin="0,30,20,0" VerticalAlignment="Top" Click="btnGameDir_Click" Grid.Column="2" HorizontalAlignment="Right" Width="85"/>
-        <ListBox x:Name="lstGameLiveries" Margin="20,60,20,20" IsEnabled="{Binding Useable}" Grid.Column="2" SelectionChanged="lstGameLiveries_Change"/>
+        <TabControl HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20,60,20,20" SelectionChanged="GameTab_SelectionChanged" Grid.Column="2">
+            <TabItem x:Name="tab_Game" Header="Game" IsSelected="True">
+                <Grid Background="#FFE5E5E5"/>
+            </TabItem>
+            <TabItem x:Name="tab_CC" Header="CC">
+                <Grid Background="#FFE5E5E5"/>
+            </TabItem>
+        </TabControl>
+        <ListBox x:Name="lstGameLiveries" Margin="20,81,20,20" IsEnabled="{Binding Useable}" Grid.Column="2" SelectionChanged="lstGameLiveries_Change"/>
         <Button Content="BACKUP!" HorizontalAlignment="Center" Height="41" Margin="0,22,0,0" VerticalAlignment="Top" Width="108" FontSize="24" FontWeight="Bold" Click="btnBackup_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
         <TextBox x:Name="txtLibDir" Height="22" Margin="20,30,105,0" TextWrapping="NoWrap" VerticalAlignment="Top" MaxLines="1"/>
         <Button Content="Set Lib Dir" Height="22" Margin="0,30,20,0" VerticalAlignment="Top" Click="btnLibDir_Click" HorizontalAlignment="Right" Width="75"/>
-        <TabControl HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20,60,20,20" SelectionChanged="TabControl_SelectionChanged">
+        <TabControl HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20,60,20,20" SelectionChanged="LibraryTab_SelectionChanged">
             <TabItem x:Name="tab_Tsw3" Header="TSW3" IsSelected="True">
                 <Grid Background="#FFE5E5E5"/>
             </TabItem>
@@ -36,8 +44,8 @@
             </TabItem>
         </TabControl>
         <ListBox x:Name="lstLibraryLiveries" Margin="20,80,20,20" IsEnabled="{Binding Useable}"/>
-        <Button Content="IMPORT  🡒" HorizontalAlignment="Center" Height="36" Margin="0,205,0,0" VerticalAlignment="Top" Width="108" Click="btnImport_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
-        <Button Content="🡐 EXPORT" HorizontalAlignment="Center" Height="35" Margin="0,241,0,0" VerticalAlignment="Top" Width="108" Click="btnExport_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
+        <Button Content="IMPORT  🡒" HorizontalAlignment="Center" Height="36" Margin="0,205,0,0" VerticalAlignment="Top" Width="108" Click="btnImport_Click" IsEnabled="{Binding ImportActive}" Grid.Column="1"/>
+        <Button Content="🡐 EXPORT" HorizontalAlignment="Center" Height="35" Margin="0,241,0,0" VerticalAlignment="Top" Width="108" Click="btnExport_Click" IsEnabled="{Binding ExportActive}" Grid.Column="1"/>
         <Button Content="View/Edit Info >" HorizontalAlignment="Center" Height="20" Margin="0,125,0,0" VerticalAlignment="Top" Width="108" Click="btnInfo_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
         <!--<Button Content="*.tsw2liv Import 🡒" HorizontalAlignment="Center" Height="20" Margin="0,170,0,0" VerticalAlignment="Top" Width="108" Click="btnTsw2Import_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>-->
         <Button Content="RESTORE" HorizontalAlignment="Center" Height="41" Margin="0,63,0,0" VerticalAlignment="Top" Width="108" Click="btnRestore_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 4614ac4..1432f0f 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -211,30 +211,56 @@ internal void PrintHelp()
             Application.Current.Shutdown();
         }
 
-        internal void UpdateGameGui()
+        internal void UpdateGameGui(bool cc = false)
         {
-            Log.Message("Updating game liveries in GUI...", "MW:UpdateGameGui");
-            lstGameLiveries.Items.Clear();
-            for (int i = 0; i < Config.MaxGameLiveries; i++)
+            if (cc)
             {
-                if (!Game.Liveries.ContainsKey(i))
-                    lstGameLiveries.Items.Add($"({i+1}) <empty>");
-                else
+                if (Config.CCPath == "" && Config.GamePath != "")
                 {
-                    string Id = Game.Liveries[i].ID;
-                    GameLiveryInfo.Info Info = GameLiveryInfo.Get(Id);
-                    string Text = Game.Liveries[i].Compressed ? $"({i + 1}) {Info.Name} for {Info.Model}" : $"({i+1}) [RAW] {Info.Name} for {Info.Model}";
-                    lstGameLiveries.Items.Add(Text);
-                    Log.Message($"Added game livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                    if (Directory.Exists($"{Config.GamePath.Replace("\\SaveGames\\UGCLiveries_0.sav", "")}\\PersistentDownloadDir"))
+                        Config.CCPath = $"{Config.GamePath.Replace("\\SaveGames\\UGCLiveries_0.sav", "")}\\PersistentDownloadDir\\UGC\\0";
+                    else
+                    {
+                        tab_Game.IsSelected = true;
+                        ShowStatusText("You don't have any CC-Liveries");
+                        return;
+                    }
+                }
+                ((Data)DataContext).ImportActive = false;
+                tab_CC.IsSelected = true;
+
+
+            }
+            else
+            {
+                ((Data)DataContext).ImportActive = true;
+                tab_Game.IsSelected = true;
+
+                Log.Message("Updating game liveries in GUI...", "MW:UpdateGameGui");
+                lstGameLiveries.Items.Clear();
+                for (int i = 0; i < Config.MaxGameLiveries; i++)
+                {
+                    if (!Game.Liveries.ContainsKey(i))
+                        lstGameLiveries.Items.Add($"({i + 1}) <empty>");
+                    else
+                    {
+                        string Id = Game.Liveries[i].ID;
+                        GameLiveryInfo.Info Info = GameLiveryInfo.Get(Id);
+                        string Text = Game.Liveries[i].Compressed ? $"({i + 1}) {Info.Name} for {Info.Model}" : $"({i + 1}) [RAW] {Info.Name} for {Info.Model}";
+                        lstGameLiveries.Items.Add(Text);
+                        Log.Message($"Added game livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                    }
                 }
+                Log.Message("Game liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
             }
-            Log.Message("Game liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
         }
 
         internal void UpdateLibraryGui(bool tsw3 = true)
         {
             if (tsw3)
             {
+                ((Data)DataContext).ExportActive = true;
+
                 tab_Tsw3.IsSelected = true;
                 Log.Message("Updating library liveries in GUI...", "MW:UpdateLibraryGui");
                 lstLibraryLiveries.Items.Clear();
@@ -250,6 +276,8 @@ internal void UpdateLibraryGui(bool tsw3 = true)
             }
             else
             {
+                ((Data)DataContext).ExportActive = false;
+
                 tab_Tsw2.IsSelected = true;
                 Log.Message("Updating TSW2 liveries in GUI...", "MW:UpdateLiveryGui");
                 lstLibraryLiveries.Items.Clear();
@@ -650,7 +678,7 @@ private void lstGameLiveries_Change(object sender, SelectionChangedEventArgs e)
                 UpdateLiveryInfoWindow(null, false);
         }
 
-        private void TabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void LibraryTab_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (!((Data)DataContext).Useable) return;
             if (e.Source is TabControl)
@@ -658,6 +686,15 @@ private void TabControl_SelectionChanged(object sender, SelectionChangedEventArg
                 UpdateLibraryGui(tab_Tsw3.IsSelected);
             }
         }
+
+        private void GameTab_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (!((Data)DataContext).Useable) return;
+            if (e.Source is TabControl)
+            {
+                UpdateGameGui(tab_CC.IsSelected);
+            }
+        }
     }
 
     public class Data : INotifyPropertyChanged
@@ -666,7 +703,21 @@ public class Data : INotifyPropertyChanged
         public bool Useable
         {
             get { return _useable; }
-            set { _useable = value; OnPropertyChanged("Useable"); }
+            set { _useable = value; OnPropertyChanged("Useable"); OnPropertyChanged("ExportActive"); OnPropertyChanged("ImportActive"); }
+        }
+
+        public bool _exportActive = true;
+        public bool ExportActive
+        {
+            get { return _exportActive && _useable; }
+            set { _exportActive = value; OnPropertyChanged("ExportActive"); }
+        }
+
+        public bool _importActive = true;
+        public bool ImportActive
+        {
+            get { return _importActive && _useable; }
+            set { _importActive = value; OnPropertyChanged("ImportActive"); }
         }
 
         public event PropertyChangedEventHandler PropertyChanged;

From 3ccc265ea85aedaa5cdf776aab3f4b5dfe940ee6 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 17:18:14 +0200
Subject: [PATCH 06/19] added code for cc to library livery

---
 Utils.cs | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 102 insertions(+), 2 deletions(-)

diff --git a/Utils.cs b/Utils.cs
index 766ea2c..2935532 100644
--- a/Utils.cs
+++ b/Utils.cs
@@ -1,16 +1,16 @@
 #nullable enable
 using GvasConverter;
+using GvasFormat.Serialization;
 using GvasFormat.Serialization.UETypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Windows.Forms;
+using System.Text;
 
 namespace TSW3LM
 {
@@ -18,6 +18,8 @@ static class Utils
     {
         private static Random random = new Random();
 
+        private static UTF8Encoding Utf8 = new UTF8Encoding(false);
+
         internal static string GenerateHex(int digits)
         {
             byte[] buffer = new byte[digits / 2];
@@ -272,6 +274,104 @@ private static Property IdentifyMisplacedProperty(UEProperty p)
             return Property.UNKNOWN;
         }
 
+        internal static Library.Livery ConvertCC(byte[] ccData)
+        {
+            byte[] data = new byte[ccData.Length - 0x10];
+            for (int j = 0; j < data.Length; j++)
+            {
+                data[j] = ccData[0x10 + j];
+            }
+
+            BinaryReader reader = new BinaryReader(new MemoryStream(data));
+            string Name = reader.ReadUEString();
+            int i = reader.ReadInt32();
+            if (i != 0) throw new FormatException($"Expected 4 byte integer '0' at offset {reader.BaseStream.Position - 4:x}, was {i:x}");
+            string s = reader.ReadUEString();
+            if (s != "EUGCType::Livery") throw new FormatException($"Expected UE String 'EUGCType::Livery' to start at offset 0x{reader.BaseStream.Position - 21:x}, was '{s}'");
+            long l = reader.ReadInt64();
+            if (l != 0) throw new FormatException($"Expected 8 byte integer '0' at offset {reader.BaseStream.Position - 8:x}, was {l:x}");
+            i = reader.ReadInt32();
+            if (l != 0) throw new FormatException($"Expected 4 byte integer '0' at offset {reader.BaseStream.Position - 4:x}, was {i:x}");
+            s = reader.ReadUEString();
+            if (s != "Blob") throw new FormatException($"Expected UEProperty Name 'Blob' to start at offset 0x{reader.BaseStream.Position - 9:x}, was '{s}'");
+            s = reader.ReadUEString();
+            if (s != "ArrayProperty") throw new FormatException($"Expected UEProperty Type 'ArrayProperty' to start at offset 0x{reader.BaseStream.Position - 18:x}, was '{s}'");
+            l = reader.ReadInt64();
+            if (l == 0) throw new FormatException($"Expected 8 byte valueLength '!= 0' at offset {reader.BaseStream.Position - 8:x}, was 0");
+            s = reader.ReadUEString();
+            if (s != "ByteProperty") throw new FormatException($"Expected UEArrayProperty ItemType 'ByteProperty' to start at offset 0x{reader.BaseStream.Position - 17:x}, was '{s}'");
+            i = reader.ReadInt32();
+            if (i == 0) throw new FormatException($"Expected 4 byte UEArrayProperty Count '!= 0' at offset {reader.BaseStream.Position - 4:x}, was 0");
+            byte b = reader.ReadByte();
+            if (b != 0) throw new FormatException($"Expected 1 byte '0' at offset {reader.BaseStream.Position - 1:x}, was {b:x}");
+
+            UEGenericStructProperty prop = new UEGenericStructProperty();
+            prop.StructType = "ReskinSave";
+            prop.Name = "Reskins";
+            prop.Type = "StructProperty";
+            prop.ValueLength = 0; //TODO: Determine
+
+            UEStringProperty idProp = new UEStringProperty { Name = "ID", Type = "NameProperty" };
+            idProp.Value = reader.ReadUEString();
+            idProp.ValueLength = Utf8.GetByteCount(idProp.Value) + 5;
+            prop.Properties.Add(idProp);
+
+            UEDateTimeStructProperty createdDateProp = new UEDateTimeStructProperty { Name = "CreatedDate", Type = "StructProperty", StructType = "DateTime", ValueLength = 8 };
+            createdDateProp.Value = DateTime.FromBinary(reader.ReadInt64());
+            prop.Properties.Add(createdDateProp);
+
+            UETextProperty displayNameProp = new UETextProperty { Name = "DisplayName", Type = "TextProperty", Id = "0" };
+            displayNameProp.Flags = reader.ReadInt64();
+            b = reader.ReadByte();
+            if (b != 0) throw new FormatException($"Expected 1 byte '0' at offset {reader.BaseStream.Position - 1:x}, was {b:x}");
+            displayNameProp.Value = reader.ReadUEString();
+            displayNameProp.ValueLength = Utf8.GetByteCount(displayNameProp.Value) + 14;
+            prop.Properties.Add(displayNameProp);
+
+            UEStringProperty baseDefinitionProp = new UEStringProperty { Name = "BaseDefinition", Type = "SoftObjectProperty" };
+            baseDefinitionProp.Value = reader.ReadUEString();
+            baseDefinitionProp.ValueLength = Utf8.GetByteCount(baseDefinitionProp.Value) + 5;
+            prop.Properties.Add(baseDefinitionProp);
+
+            i = reader.ReadInt32();
+            if (i != 0) throw new FormatException($"Expected 4 byte integer '0' at offset {reader.BaseStream.Position - 4:x}, was {i:x}");
+            i = reader.ReadInt32();
+            if (i == 0) throw new FormatException($"Expected 4 byte Count '!= 0' at offset {reader.BaseStream.Position - 4:x}, was 0");
+
+            UEProperty reskinnedElementsProp = UEProperty.Read(reader);
+            if (reskinnedElementsProp is UEGenericStructProperty)
+                prop.Properties.Add(reskinnedElementsProp);
+            else
+                throw new FormatException($"Expected to deserialize a UEGenericStructProperty, was {reskinnedElementsProp.GetType()}");
+
+            UEProperty noneProp = UEProperty.Read(reader);
+            if (noneProp is UEGenericStructProperty)
+            {
+                prop.Properties.Add(noneProp);
+                prop.Properties.Add(UEProperty.Read(reader));
+            }
+            else
+            {
+                UEGenericStructProperty reskinEditorDataProp = new UEGenericStructProperty { Name = "ReskinEditorData", Type = "StructProperty", StructType = "DTGReskinEditData" };
+                ((UEGenericStructProperty)reskinnedElementsProp).Properties.RemoveAll(p => p is UEMapProperty && p.Name == "MaterialInstances");
+                UEProperty lastUsedColoursProp = ((UEGenericStructProperty)reskinnedElementsProp).Properties.First(p => p is UEArrayProperty && p.Name == "LastUsedColours");
+                ((UEGenericStructProperty)reskinnedElementsProp).Properties.Remove(lastUsedColoursProp);
+                reskinEditorDataProp.Properties.Add(lastUsedColoursProp);
+                reskinEditorDataProp.Properties.Add(new UENoneProperty());
+
+                prop.Properties.Add(reskinEditorDataProp);
+                prop.Properties.Add(noneProp);
+            }
+            while (UEProperty.Read(reader) is UEProperty p)
+            {
+                if (p is UEGenericStructProperty && !(((UEGenericStructProperty)p).Properties[^1] is UENoneProperty))
+                    ((UEGenericStructProperty)p).Properties.Add(new UENoneProperty());
+                prop.Properties.Add(p);
+            }
+
+            return new Library.Livery($"cc_{Name}.tsw3", prop, displayNameProp.Value, baseDefinitionProp.Value.Split('.')[^1], false);
+        }
+
         private enum Property
         {
             UNKNOWN = 0,

From 901a1a783c12813d84151239ef4e6ef4580f97f3 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 17:23:20 +0200
Subject: [PATCH 07/19] main logic for showing CC liveries

---
 MainWindow.xaml.cs | 12 +++++++++++-
 Utils.cs           | 23 ++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 1432f0f..beb3da2 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -229,6 +229,16 @@ internal void UpdateGameGui(bool cc = false)
                 ((Data)DataContext).ImportActive = false;
                 tab_CC.IsSelected = true;
 
+                Log.Message("Updating creators club liveries in GUI...", "MW:UpdateGameGui");
+                lstGameLiveries.Items.Clear();
+                foreach (FileInfo info in new DirectoryInfo(Config.CCPath).GetFiles("*.ugc"))
+                {
+                    Library.Livery livery = Utils.ConvertCC(File.ReadAllBytes(info.FullName));
+                    string Text = $"{livery.Name} for {livery.Model} <{info.Name}>";
+                    lstGameLiveries.Items.Add(Text);
+                    Log.Message($"Added CC livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                }
+                Log.Message("Creators club liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
 
             }
             else
@@ -281,7 +291,7 @@ internal void UpdateLibraryGui(bool tsw3 = true)
                 tab_Tsw2.IsSelected = true;
                 Log.Message("Updating TSW2 liveries in GUI...", "MW:UpdateLiveryGui");
                 lstLibraryLiveries.Items.Clear();
-                foreach(FileInfo f in new DirectoryInfo(Config.LibraryPath).GetFiles("*.tsw2liv"))
+                foreach (FileInfo f in new DirectoryInfo(Config.LibraryPath).GetFiles("*.tsw2liv"))
                 {
                     try
                     {
diff --git a/Utils.cs b/Utils.cs
index 2935532..6c01335 100644
--- a/Utils.cs
+++ b/Utils.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using GvasConverter;
-using GvasFormat.Serialization;
 using GvasFormat.Serialization.UETypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -382,6 +381,28 @@ private enum Property
             RESKINNED_ELEMENTS = 5,
             RESKIN_EDITOR_DATA = 6
         }
+
+        public static string ReadUEString(this BinaryReader reader)
+        {
+#pragma warning disable CS8603 // Mögliche Nullverweisrückgabe.
+            //if (reader.PeekChar() < 0)
+            //    return null;
+
+            var length = reader.ReadInt32();
+            if (length == 0)
+                return null;
+
+            if (length == 1)
+                return "";
+
+            if (length < 0)
+                length = -2 * length;
+
+            var valueBytes = reader.ReadBytes(length);
+            return Utf8.GetString(valueBytes, 0, valueBytes.Length - 1);
+
+#pragma warning restore CS8603 // Mögliche Nullverweisrückgabe.
+        }
     }
 
     class Log

From 3f846d2205f6e0604f9c7b3df4b1b1f91c6077b0 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 17:50:59 +0200
Subject: [PATCH 08/19] logic for exporting cc liveries

---
 MainWindow.xaml.cs | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index beb3da2..9be8887 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -229,7 +229,7 @@ internal void UpdateGameGui(bool cc = false)
                 ((Data)DataContext).ImportActive = false;
                 tab_CC.IsSelected = true;
 
-                Log.Message("Updating creators club liveries in GUI...", "MW:UpdateGameGui");
+                Log.Message("Updating CC liveries in GUI...", "MW:UpdateGameGui");
                 lstGameLiveries.Items.Clear();
                 foreach (FileInfo info in new DirectoryInfo(Config.CCPath).GetFiles("*.ugc"))
                 {
@@ -238,7 +238,7 @@ internal void UpdateGameGui(bool cc = false)
                     lstGameLiveries.Items.Add(Text);
                     Log.Message($"Added CC livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
                 }
-                Log.Message("Creators club liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                Log.Message("CC liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
 
             }
             else
@@ -333,13 +333,12 @@ private void ImportTsw2Livery(string fileName)
             Log.Message($"Importing TSW2 livery from {fileName}", "MW:ImportTsw2Livery");
             try
             {
-                Game.Livery livery = Utils.ConvertTSW2(File.ReadAllBytes(fileName), false);
+                Game.Livery livery = Utils.ConvertTSW2(File.ReadAllBytes($"{Config.LibraryPath}\\{fileName}"), false);
                 string name = ((UETextProperty)livery.GvasBaseProperty.Properties.First(p => p is UETextProperty && p.Name == "DisplayName")).Value;
                 string model = ((UEStringProperty)livery.GvasBaseProperty.Properties.First(p => p is UEStringProperty && p.Name == "BaseDefinition")).Value.Split(".")[^1];
                 string newId = GameLiveryInfo.SetInfo(livery.ID, name, model);
                 livery.ID = newId;
                 Game.Add(livery);
-                UpdateGameGui();
                 ShowStatusText("*.tsw2liv successfully imported");
             }
             catch (Exception e)
@@ -407,8 +406,23 @@ internal void ExportLivery(Game.Livery gl)
 
             Log.Message($"Livery successfully exported (FileName: {ll.FileName})", "MW:ExportLivery", Log.LogLevel.DEBUG);
             ShowStatusText("Livery successfully exported");
+        }
 
-            UpdateLibraryGui();
+        private void ExportCCLivery(string fileName)
+        {
+            Log.Message($"Exporting CC livery from {fileName}", "MW:ExportCCLivery");
+            try
+            {
+                Library.Livery livery = Utils.ConvertCC(File.ReadAllBytes($"{Config.CCPath}\\{fileName}"));
+                Library.Add(livery);
+                Library.Save(livery);
+                ShowStatusText("CC livery successfully exported");
+            }
+            catch (Exception e)
+            {
+                Log.Exception("Error exporting CC livery!", e, "MW:ExportCCLivery");
+                lblMessage.Content = $"[ERR] Error while exporting CC livery: {e.Message}";
+            }
         }
 
         private void UpdateLiveryInfoWindow(Game.Livery livery, bool show)
@@ -496,7 +510,10 @@ private void btnExport_Click(object sender, RoutedEventArgs e)
             }
 
             lblMessage.Content = "";
-            PrepareLiveryExport(Game.Liveries[lstGameLiveries.SelectedIndex]);
+            if (tab_Game.IsSelected)
+                PrepareLiveryExport(Game.Liveries[lstGameLiveries.SelectedIndex]);
+            else if (tab_CC.IsSelected)
+                ExportCCLivery(lstGameLiveries.SelectedItem.ToString().Split("<")[^1].Split(">")[0]);
             UpdateLibraryGui();
         }
 
@@ -512,7 +529,7 @@ private void btnImport_Click(object sender, RoutedEventArgs e)
             if (tab_Tsw3.IsSelected)
                 ImportLivery(Library.Liveries[lstLibraryLiveries.SelectedIndex]);
             else if (tab_Tsw2.IsSelected)
-                ImportTsw2Livery($"{Config.LibraryPath}\\{lstLibraryLiveries.SelectedItem.ToString().Split("<")[^1].Split(">")[0]}");
+                ImportTsw2Livery(lstLibraryLiveries.SelectedItem.ToString().Split("<")[^1].Split(">")[0]);
             UpdateGameGui();
         }
 

From f1b9d459fadbf29f3842819a2ff68465d71f004a Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 15:49:21 +0200
Subject: [PATCH 09/19] prepare UI for CC export

---
 Config.cs          | 11 +++++--
 MainWindow.xaml    | 16 ++++++---
 MainWindow.xaml.cs | 81 +++++++++++++++++++++++++++++++++++++---------
 3 files changed, 86 insertions(+), 22 deletions(-)

diff --git a/Config.cs b/Config.cs
index 808bdf1..7316820 100644
--- a/Config.cs
+++ b/Config.cs
@@ -1,9 +1,6 @@
 #nullable disable warnings
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Windows.Media.Animation;
 
 namespace TSW3LM
 {
@@ -41,6 +38,12 @@ public static string GamePath
             set { entries.GamePath = value; if (!entries.SkipAutosave) Save(); }
         }
 
+        public static string CCPath
+        {
+            get { return entries.CCPath; }
+            set { entries.CCPath = value; if (!entries.SkipAutosave) Save(); }
+        }
+
         public static string LibraryPath
         {
             get { return entries.LibraryPath; }
@@ -87,6 +90,7 @@ private class Entries
         {
             public bool SkipAutosave = false;
             public string GamePath = "";
+            public string CCPath = "";
             public string LibraryPath = "";
             public bool NoUpdate = false;
             public bool DevUpdates = false;
@@ -97,6 +101,7 @@ internal void ApplyDefaults()
             {
                 SkipAutosave = false;
                 GamePath = "";
+                CCPath = "";
                 LibraryPath = "";
                 NoUpdate = false;
                 DevUpdates = false;
diff --git a/MainWindow.xaml b/MainWindow.xaml
index fa0c2cc..3fd2d31 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -23,11 +23,19 @@
         <Rectangle Fill="#FFC2FF79" Margin="10,10,10,10" Stroke="Black" Grid.Column="2"/>
         <TextBox x:Name="txtGameDir" Height="22" Margin="20,30,115,-6" TextWrapping="NoWrap" VerticalAlignment="Top" MaxLines="1" Grid.Column="2"/>
         <Button Content="Set Game Dir" Height="22" Margin="0,30,20,0" VerticalAlignment="Top" Click="btnGameDir_Click" Grid.Column="2" HorizontalAlignment="Right" Width="85"/>
-        <ListBox x:Name="lstGameLiveries" Margin="20,60,20,20" IsEnabled="{Binding Useable}" Grid.Column="2" SelectionChanged="lstGameLiveries_Change"/>
+        <TabControl HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20,60,20,20" SelectionChanged="GameTab_SelectionChanged" Grid.Column="2">
+            <TabItem x:Name="tab_Game" Header="Game" IsSelected="True">
+                <Grid Background="#FFE5E5E5"/>
+            </TabItem>
+            <TabItem x:Name="tab_CC" Header="CC">
+                <Grid Background="#FFE5E5E5"/>
+            </TabItem>
+        </TabControl>
+        <ListBox x:Name="lstGameLiveries" Margin="20,81,20,20" IsEnabled="{Binding Useable}" Grid.Column="2" SelectionChanged="lstGameLiveries_Change"/>
         <Button Content="BACKUP!" HorizontalAlignment="Center" Height="41" Margin="0,22,0,0" VerticalAlignment="Top" Width="108" FontSize="24" FontWeight="Bold" Click="btnBackup_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
         <TextBox x:Name="txtLibDir" Height="22" Margin="20,30,105,0" TextWrapping="NoWrap" VerticalAlignment="Top" MaxLines="1"/>
         <Button Content="Set Lib Dir" Height="22" Margin="0,30,20,0" VerticalAlignment="Top" Click="btnLibDir_Click" HorizontalAlignment="Right" Width="75"/>
-        <TabControl HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20,60,20,20" SelectionChanged="TabControl_SelectionChanged">
+        <TabControl HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20,60,20,20" SelectionChanged="LibraryTab_SelectionChanged">
             <TabItem x:Name="tab_Tsw3" Header="TSW3" IsSelected="True">
                 <Grid Background="#FFE5E5E5"/>
             </TabItem>
@@ -36,8 +44,8 @@
             </TabItem>
         </TabControl>
         <ListBox x:Name="lstLibraryLiveries" Margin="20,80,20,20" IsEnabled="{Binding Useable}"/>
-        <Button Content="IMPORT  🡒" HorizontalAlignment="Center" Height="36" Margin="0,205,0,0" VerticalAlignment="Top" Width="108" Click="btnImport_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
-        <Button Content="🡐 EXPORT" HorizontalAlignment="Center" Height="35" Margin="0,241,0,0" VerticalAlignment="Top" Width="108" Click="btnExport_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
+        <Button Content="IMPORT  🡒" HorizontalAlignment="Center" Height="36" Margin="0,205,0,0" VerticalAlignment="Top" Width="108" Click="btnImport_Click" IsEnabled="{Binding ImportActive}" Grid.Column="1"/>
+        <Button Content="🡐 EXPORT" HorizontalAlignment="Center" Height="35" Margin="0,241,0,0" VerticalAlignment="Top" Width="108" Click="btnExport_Click" IsEnabled="{Binding ExportActive}" Grid.Column="1"/>
         <Button Content="View/Edit Info >" HorizontalAlignment="Center" Height="20" Margin="0,125,0,0" VerticalAlignment="Top" Width="108" Click="btnInfo_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
         <!--<Button Content="*.tsw2liv Import 🡒" HorizontalAlignment="Center" Height="20" Margin="0,170,0,0" VerticalAlignment="Top" Width="108" Click="btnTsw2Import_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>-->
         <Button Content="RESTORE" HorizontalAlignment="Center" Height="41" Margin="0,63,0,0" VerticalAlignment="Top" Width="108" Click="btnRestore_Click" IsEnabled="{Binding Useable}" Grid.Column="1"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 6530722..299e168 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -211,30 +211,56 @@ internal void PrintHelp()
             Application.Current.Shutdown();
         }
 
-        internal void UpdateGameGui()
+        internal void UpdateGameGui(bool cc = false)
         {
-            Log.Message("Updating game liveries in GUI...", "MW:UpdateGameGui");
-            lstGameLiveries.Items.Clear();
-            for (int i = 0; i < Config.MaxGameLiveries; i++)
+            if (cc)
             {
-                if (!Game.Liveries.ContainsKey(i))
-                    lstGameLiveries.Items.Add($"({i+1}) <empty>");
-                else
+                if (Config.CCPath == "" && Config.GamePath != "")
                 {
-                    string Id = Game.Liveries[i].ID;
-                    GameLiveryInfo.Info Info = GameLiveryInfo.Get(Id);
-                    string Text = Game.Liveries[i].Compressed ? $"({i + 1}) {Info.Name} for {Info.Model}" : $"({i+1}) [RAW] {Info.Name} for {Info.Model}";
-                    lstGameLiveries.Items.Add(Text);
-                    Log.Message($"Added game livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                    if (Directory.Exists($"{Config.GamePath.Replace("\\SaveGames\\UGCLiveries_0.sav", "")}\\PersistentDownloadDir"))
+                        Config.CCPath = $"{Config.GamePath.Replace("\\SaveGames\\UGCLiveries_0.sav", "")}\\PersistentDownloadDir\\UGC\\0";
+                    else
+                    {
+                        tab_Game.IsSelected = true;
+                        ShowStatusText("You don't have any CC-Liveries");
+                        return;
+                    }
+                }
+                ((Data)DataContext).ImportActive = false;
+                tab_CC.IsSelected = true;
+
+
+            }
+            else
+            {
+                ((Data)DataContext).ImportActive = true;
+                tab_Game.IsSelected = true;
+
+                Log.Message("Updating game liveries in GUI...", "MW:UpdateGameGui");
+                lstGameLiveries.Items.Clear();
+                for (int i = 0; i < Config.MaxGameLiveries; i++)
+                {
+                    if (!Game.Liveries.ContainsKey(i))
+                        lstGameLiveries.Items.Add($"({i + 1}) <empty>");
+                    else
+                    {
+                        string Id = Game.Liveries[i].ID;
+                        GameLiveryInfo.Info Info = GameLiveryInfo.Get(Id);
+                        string Text = Game.Liveries[i].Compressed ? $"({i + 1}) {Info.Name} for {Info.Model}" : $"({i + 1}) [RAW] {Info.Name} for {Info.Model}";
+                        lstGameLiveries.Items.Add(Text);
+                        Log.Message($"Added game livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                    }
                 }
+                Log.Message("Game liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
             }
-            Log.Message("Game liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
         }
 
         internal void UpdateLibraryGui(bool tsw3 = true)
         {
             if (tsw3)
             {
+                ((Data)DataContext).ExportActive = true;
+
                 tab_Tsw3.IsSelected = true;
                 Log.Message("Updating library liveries in GUI...", "MW:UpdateLibraryGui");
                 lstLibraryLiveries.Items.Clear();
@@ -250,6 +276,8 @@ internal void UpdateLibraryGui(bool tsw3 = true)
             }
             else
             {
+                ((Data)DataContext).ExportActive = false;
+
                 tab_Tsw2.IsSelected = true;
                 Log.Message("Updating TSW2 liveries in GUI...", "MW:UpdateLiveryGui");
                 lstLibraryLiveries.Items.Clear();
@@ -629,7 +657,7 @@ private void lstGameLiveries_Change(object sender, SelectionChangedEventArgs e)
                 UpdateLiveryInfoWindow(null, false);
         }
 
-        private void TabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void LibraryTab_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (!((Data)DataContext).Useable) return;
             if (e.Source is TabControl)
@@ -637,6 +665,15 @@ private void TabControl_SelectionChanged(object sender, SelectionChangedEventArg
                 UpdateLibraryGui(tab_Tsw3.IsSelected);
             }
         }
+
+        private void GameTab_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (!((Data)DataContext).Useable) return;
+            if (e.Source is TabControl)
+            {
+                UpdateGameGui(tab_CC.IsSelected);
+            }
+        }
     }
 
     public class Data : INotifyPropertyChanged
@@ -645,7 +682,21 @@ public class Data : INotifyPropertyChanged
         public bool Useable
         {
             get { return _useable; }
-            set { _useable = value; OnPropertyChanged("Useable"); }
+            set { _useable = value; OnPropertyChanged("Useable"); OnPropertyChanged("ExportActive"); OnPropertyChanged("ImportActive"); }
+        }
+
+        public bool _exportActive = true;
+        public bool ExportActive
+        {
+            get { return _exportActive && _useable; }
+            set { _exportActive = value; OnPropertyChanged("ExportActive"); }
+        }
+
+        public bool _importActive = true;
+        public bool ImportActive
+        {
+            get { return _importActive && _useable; }
+            set { _importActive = value; OnPropertyChanged("ImportActive"); }
         }
 
         public event PropertyChangedEventHandler PropertyChanged;

From dc7fcb1b03d8654493708e31e6805a3f092f4e33 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 17:18:14 +0200
Subject: [PATCH 10/19] added code for cc to library livery

---
 Utils.cs | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 102 insertions(+), 2 deletions(-)

diff --git a/Utils.cs b/Utils.cs
index 766ea2c..2935532 100644
--- a/Utils.cs
+++ b/Utils.cs
@@ -1,16 +1,16 @@
 #nullable enable
 using GvasConverter;
+using GvasFormat.Serialization;
 using GvasFormat.Serialization.UETypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
-using System.CodeDom;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Windows.Forms;
+using System.Text;
 
 namespace TSW3LM
 {
@@ -18,6 +18,8 @@ static class Utils
     {
         private static Random random = new Random();
 
+        private static UTF8Encoding Utf8 = new UTF8Encoding(false);
+
         internal static string GenerateHex(int digits)
         {
             byte[] buffer = new byte[digits / 2];
@@ -272,6 +274,104 @@ private static Property IdentifyMisplacedProperty(UEProperty p)
             return Property.UNKNOWN;
         }
 
+        internal static Library.Livery ConvertCC(byte[] ccData)
+        {
+            byte[] data = new byte[ccData.Length - 0x10];
+            for (int j = 0; j < data.Length; j++)
+            {
+                data[j] = ccData[0x10 + j];
+            }
+
+            BinaryReader reader = new BinaryReader(new MemoryStream(data));
+            string Name = reader.ReadUEString();
+            int i = reader.ReadInt32();
+            if (i != 0) throw new FormatException($"Expected 4 byte integer '0' at offset {reader.BaseStream.Position - 4:x}, was {i:x}");
+            string s = reader.ReadUEString();
+            if (s != "EUGCType::Livery") throw new FormatException($"Expected UE String 'EUGCType::Livery' to start at offset 0x{reader.BaseStream.Position - 21:x}, was '{s}'");
+            long l = reader.ReadInt64();
+            if (l != 0) throw new FormatException($"Expected 8 byte integer '0' at offset {reader.BaseStream.Position - 8:x}, was {l:x}");
+            i = reader.ReadInt32();
+            if (l != 0) throw new FormatException($"Expected 4 byte integer '0' at offset {reader.BaseStream.Position - 4:x}, was {i:x}");
+            s = reader.ReadUEString();
+            if (s != "Blob") throw new FormatException($"Expected UEProperty Name 'Blob' to start at offset 0x{reader.BaseStream.Position - 9:x}, was '{s}'");
+            s = reader.ReadUEString();
+            if (s != "ArrayProperty") throw new FormatException($"Expected UEProperty Type 'ArrayProperty' to start at offset 0x{reader.BaseStream.Position - 18:x}, was '{s}'");
+            l = reader.ReadInt64();
+            if (l == 0) throw new FormatException($"Expected 8 byte valueLength '!= 0' at offset {reader.BaseStream.Position - 8:x}, was 0");
+            s = reader.ReadUEString();
+            if (s != "ByteProperty") throw new FormatException($"Expected UEArrayProperty ItemType 'ByteProperty' to start at offset 0x{reader.BaseStream.Position - 17:x}, was '{s}'");
+            i = reader.ReadInt32();
+            if (i == 0) throw new FormatException($"Expected 4 byte UEArrayProperty Count '!= 0' at offset {reader.BaseStream.Position - 4:x}, was 0");
+            byte b = reader.ReadByte();
+            if (b != 0) throw new FormatException($"Expected 1 byte '0' at offset {reader.BaseStream.Position - 1:x}, was {b:x}");
+
+            UEGenericStructProperty prop = new UEGenericStructProperty();
+            prop.StructType = "ReskinSave";
+            prop.Name = "Reskins";
+            prop.Type = "StructProperty";
+            prop.ValueLength = 0; //TODO: Determine
+
+            UEStringProperty idProp = new UEStringProperty { Name = "ID", Type = "NameProperty" };
+            idProp.Value = reader.ReadUEString();
+            idProp.ValueLength = Utf8.GetByteCount(idProp.Value) + 5;
+            prop.Properties.Add(idProp);
+
+            UEDateTimeStructProperty createdDateProp = new UEDateTimeStructProperty { Name = "CreatedDate", Type = "StructProperty", StructType = "DateTime", ValueLength = 8 };
+            createdDateProp.Value = DateTime.FromBinary(reader.ReadInt64());
+            prop.Properties.Add(createdDateProp);
+
+            UETextProperty displayNameProp = new UETextProperty { Name = "DisplayName", Type = "TextProperty", Id = "0" };
+            displayNameProp.Flags = reader.ReadInt64();
+            b = reader.ReadByte();
+            if (b != 0) throw new FormatException($"Expected 1 byte '0' at offset {reader.BaseStream.Position - 1:x}, was {b:x}");
+            displayNameProp.Value = reader.ReadUEString();
+            displayNameProp.ValueLength = Utf8.GetByteCount(displayNameProp.Value) + 14;
+            prop.Properties.Add(displayNameProp);
+
+            UEStringProperty baseDefinitionProp = new UEStringProperty { Name = "BaseDefinition", Type = "SoftObjectProperty" };
+            baseDefinitionProp.Value = reader.ReadUEString();
+            baseDefinitionProp.ValueLength = Utf8.GetByteCount(baseDefinitionProp.Value) + 5;
+            prop.Properties.Add(baseDefinitionProp);
+
+            i = reader.ReadInt32();
+            if (i != 0) throw new FormatException($"Expected 4 byte integer '0' at offset {reader.BaseStream.Position - 4:x}, was {i:x}");
+            i = reader.ReadInt32();
+            if (i == 0) throw new FormatException($"Expected 4 byte Count '!= 0' at offset {reader.BaseStream.Position - 4:x}, was 0");
+
+            UEProperty reskinnedElementsProp = UEProperty.Read(reader);
+            if (reskinnedElementsProp is UEGenericStructProperty)
+                prop.Properties.Add(reskinnedElementsProp);
+            else
+                throw new FormatException($"Expected to deserialize a UEGenericStructProperty, was {reskinnedElementsProp.GetType()}");
+
+            UEProperty noneProp = UEProperty.Read(reader);
+            if (noneProp is UEGenericStructProperty)
+            {
+                prop.Properties.Add(noneProp);
+                prop.Properties.Add(UEProperty.Read(reader));
+            }
+            else
+            {
+                UEGenericStructProperty reskinEditorDataProp = new UEGenericStructProperty { Name = "ReskinEditorData", Type = "StructProperty", StructType = "DTGReskinEditData" };
+                ((UEGenericStructProperty)reskinnedElementsProp).Properties.RemoveAll(p => p is UEMapProperty && p.Name == "MaterialInstances");
+                UEProperty lastUsedColoursProp = ((UEGenericStructProperty)reskinnedElementsProp).Properties.First(p => p is UEArrayProperty && p.Name == "LastUsedColours");
+                ((UEGenericStructProperty)reskinnedElementsProp).Properties.Remove(lastUsedColoursProp);
+                reskinEditorDataProp.Properties.Add(lastUsedColoursProp);
+                reskinEditorDataProp.Properties.Add(new UENoneProperty());
+
+                prop.Properties.Add(reskinEditorDataProp);
+                prop.Properties.Add(noneProp);
+            }
+            while (UEProperty.Read(reader) is UEProperty p)
+            {
+                if (p is UEGenericStructProperty && !(((UEGenericStructProperty)p).Properties[^1] is UENoneProperty))
+                    ((UEGenericStructProperty)p).Properties.Add(new UENoneProperty());
+                prop.Properties.Add(p);
+            }
+
+            return new Library.Livery($"cc_{Name}.tsw3", prop, displayNameProp.Value, baseDefinitionProp.Value.Split('.')[^1], false);
+        }
+
         private enum Property
         {
             UNKNOWN = 0,

From a454a87def51118600e496334dba4c4a63746170 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 17:23:20 +0200
Subject: [PATCH 11/19] main logic for showing CC liveries

---
 MainWindow.xaml.cs | 12 +++++++++++-
 Utils.cs           | 23 ++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 299e168..4f09651 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -229,6 +229,16 @@ internal void UpdateGameGui(bool cc = false)
                 ((Data)DataContext).ImportActive = false;
                 tab_CC.IsSelected = true;
 
+                Log.Message("Updating creators club liveries in GUI...", "MW:UpdateGameGui");
+                lstGameLiveries.Items.Clear();
+                foreach (FileInfo info in new DirectoryInfo(Config.CCPath).GetFiles("*.ugc"))
+                {
+                    Library.Livery livery = Utils.ConvertCC(File.ReadAllBytes(info.FullName));
+                    string Text = $"{livery.Name} for {livery.Model} <{info.Name}>";
+                    lstGameLiveries.Items.Add(Text);
+                    Log.Message($"Added CC livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                }
+                Log.Message("Creators club liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
 
             }
             else
@@ -281,7 +291,7 @@ internal void UpdateLibraryGui(bool tsw3 = true)
                 tab_Tsw2.IsSelected = true;
                 Log.Message("Updating TSW2 liveries in GUI...", "MW:UpdateLiveryGui");
                 lstLibraryLiveries.Items.Clear();
-                foreach(FileInfo f in new DirectoryInfo(Config.LibraryPath).GetFiles("*.tsw2liv"))
+                foreach (FileInfo f in new DirectoryInfo(Config.LibraryPath).GetFiles("*.tsw2liv"))
                 {
                     try
                     {
diff --git a/Utils.cs b/Utils.cs
index 2935532..6c01335 100644
--- a/Utils.cs
+++ b/Utils.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using GvasConverter;
-using GvasFormat.Serialization;
 using GvasFormat.Serialization.UETypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -382,6 +381,28 @@ private enum Property
             RESKINNED_ELEMENTS = 5,
             RESKIN_EDITOR_DATA = 6
         }
+
+        public static string ReadUEString(this BinaryReader reader)
+        {
+#pragma warning disable CS8603 // Mögliche Nullverweisrückgabe.
+            //if (reader.PeekChar() < 0)
+            //    return null;
+
+            var length = reader.ReadInt32();
+            if (length == 0)
+                return null;
+
+            if (length == 1)
+                return "";
+
+            if (length < 0)
+                length = -2 * length;
+
+            var valueBytes = reader.ReadBytes(length);
+            return Utf8.GetString(valueBytes, 0, valueBytes.Length - 1);
+
+#pragma warning restore CS8603 // Mögliche Nullverweisrückgabe.
+        }
     }
 
     class Log

From 202d86f2891aa9bcc7b8267cb34f75a51c9ab895 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 17:50:59 +0200
Subject: [PATCH 12/19] logic for exporting cc liveries

---
 MainWindow.xaml.cs | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 4f09651..4da0a3f 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -229,7 +229,7 @@ internal void UpdateGameGui(bool cc = false)
                 ((Data)DataContext).ImportActive = false;
                 tab_CC.IsSelected = true;
 
-                Log.Message("Updating creators club liveries in GUI...", "MW:UpdateGameGui");
+                Log.Message("Updating CC liveries in GUI...", "MW:UpdateGameGui");
                 lstGameLiveries.Items.Clear();
                 foreach (FileInfo info in new DirectoryInfo(Config.CCPath).GetFiles("*.ugc"))
                 {
@@ -238,7 +238,7 @@ internal void UpdateGameGui(bool cc = false)
                     lstGameLiveries.Items.Add(Text);
                     Log.Message($"Added CC livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
                 }
-                Log.Message("Creators club liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                Log.Message("CC liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
 
             }
             else
@@ -333,13 +333,12 @@ private void ImportTsw2Livery(string fileName)
             Log.Message($"Importing TSW2 livery from {fileName}", "MW:ImportTsw2Livery");
             try
             {
-                Game.Livery livery = Utils.ConvertTSW2(File.ReadAllBytes(fileName), false);
+                Game.Livery livery = Utils.ConvertTSW2(File.ReadAllBytes($"{Config.LibraryPath}\\{fileName}"), false);
                 string name = ((UETextProperty)livery.GvasBaseProperty.Properties.First(p => p is UETextProperty && p.Name == "DisplayName")).Value;
                 string model = ((UEStringProperty)livery.GvasBaseProperty.Properties.First(p => p is UEStringProperty && p.Name == "BaseDefinition")).Value.Split(".")[^1];
                 string newId = GameLiveryInfo.SetInfo(livery.ID, name, model);
                 livery.ID = newId;
                 Game.Add(livery);
-                UpdateGameGui();
                 ShowStatusText("*.tsw2liv successfully imported");
             }
             catch (Exception e)
@@ -386,8 +385,23 @@ internal void ExportLivery(Game.Livery gl)
 
             Log.Message($"Livery successfully exported (FileName: {ll.FileName})", "MW:ExportLivery", Log.LogLevel.DEBUG);
             ShowStatusText("Livery successfully exported");
+        }
 
-            UpdateLibraryGui();
+        private void ExportCCLivery(string fileName)
+        {
+            Log.Message($"Exporting CC livery from {fileName}", "MW:ExportCCLivery");
+            try
+            {
+                Library.Livery livery = Utils.ConvertCC(File.ReadAllBytes($"{Config.CCPath}\\{fileName}"));
+                Library.Add(livery);
+                Library.Save(livery);
+                ShowStatusText("CC livery successfully exported");
+            }
+            catch (Exception e)
+            {
+                Log.Exception("Error exporting CC livery!", e, "MW:ExportCCLivery");
+                lblMessage.Content = $"[ERR] Error while exporting CC livery: {e.Message}";
+            }
         }
 
         private void UpdateLiveryInfoWindow(Game.Livery livery, bool show)
@@ -475,7 +489,10 @@ private void btnExport_Click(object sender, RoutedEventArgs e)
             }
 
             lblMessage.Content = "";
-            PrepareLiveryExport(Game.Liveries[lstGameLiveries.SelectedIndex]);
+            if (tab_Game.IsSelected)
+                PrepareLiveryExport(Game.Liveries[lstGameLiveries.SelectedIndex]);
+            else if (tab_CC.IsSelected)
+                ExportCCLivery(lstGameLiveries.SelectedItem.ToString().Split("<")[^1].Split(">")[0]);
             UpdateLibraryGui();
         }
 
@@ -491,7 +508,7 @@ private void btnImport_Click(object sender, RoutedEventArgs e)
             if (tab_Tsw3.IsSelected)
                 ImportLivery(Library.Liveries[lstLibraryLiveries.SelectedIndex]);
             else if (tab_Tsw2.IsSelected)
-                ImportTsw2Livery($"{Config.LibraryPath}\\{lstLibraryLiveries.SelectedItem.ToString().Split("<")[^1].Split(">")[0]}");
+                ImportTsw2Livery(lstLibraryLiveries.SelectedItem.ToString().Split("<")[^1].Split(">")[0]);
             UpdateGameGui();
         }
 

From cf2120ac95b151bab093b13691505e7a3773514c Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 17:18:14 +0200
Subject: [PATCH 13/19] added code for cc to library livery

---
 Utils.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Utils.cs b/Utils.cs
index 6c01335..9ddfd4b 100644
--- a/Utils.cs
+++ b/Utils.cs
@@ -1,5 +1,6 @@
 #nullable enable
 using GvasConverter;
+using GvasFormat.Serialization;
 using GvasFormat.Serialization.UETypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

From 2753117951cf6cc2cb9e75a185fdf856f7a0e766 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Thu, 22 Sep 2022 17:23:20 +0200
Subject: [PATCH 14/19] main logic for showing CC liveries

---
 Utils.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Utils.cs b/Utils.cs
index 9ddfd4b..6c01335 100644
--- a/Utils.cs
+++ b/Utils.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using GvasConverter;
-using GvasFormat.Serialization;
 using GvasFormat.Serialization.UETypes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;

From 8a00f6ec4af2afe83758fe6f6c8b4d1f9e252ef5 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Mon, 26 Sep 2022 13:22:01 +0200
Subject: [PATCH 15/19] fixing cc handling: - fix error when game livery file
 only contains raw liveries (Game) - enable exporting only raw liveries (Game)
 - only export gvas.json when in dev version (Game) - make LateInit own
 Function to call after Game/LibDir change (Main) - trim name of cc liveries
 on conversion (Utils) - show CC name instead of livery name when converting
 cc livery (Utils) - fix readUEString Utf codepoint handling (Utils) - fix
 livery json deserialization not deserializing Compressed property (Utils)

---
 Game.cs            | 32 +++++++++++++++++---------------
 Library.cs         | 29 -----------------------------
 MainWindow.xaml.cs | 32 ++++++++++++++++++--------------
 Utils.cs           | 17 ++++++++++++-----
 4 files changed, 47 insertions(+), 63 deletions(-)

diff --git a/Game.cs b/Game.cs
index 5f9e63e..e4eda81 100644
--- a/Game.cs
+++ b/Game.cs
@@ -54,12 +54,15 @@ internal static class Game
             try
             {
                 if (!GameData.Properties.Any(p => p is UEArrayProperty))
-                {
                     Log.Message("No livery exists in the game...", "G:Load", Log.LogLevel.WARNING);
-                    GvasZipArray = new UEArrayProperty();
-                    return null;
+                try
+                {
+                    GvasZipArray = (UEArrayProperty)GameData.Properties.First(p => p is UEArrayProperty && p.Name == "CompressedReskins");
+                }
+                catch (Exception)
+                {
+                    GvasZipArray = new UEArrayProperty { Name = "CompressedReskins", Type = "ArrayProperty", ItemType = "StructProperty", Items = new UEProperty[] { } };
                 }
-                GvasZipArray = (UEArrayProperty)GameData.Properties.First(p => p is UEArrayProperty && p.Name == "CompressedReskins");
 
                 try
                 {
@@ -67,12 +70,7 @@ internal static class Game
                 }
                 catch (Exception)
                 {
-                    GvasRawArray = new UEArrayProperty();
-                    GameData.Properties.Add(GvasRawArray);
-                    GvasRawArray.Name = "Reskins";
-                    GvasRawArray.Type = "ArrayProperty";
-                    GvasRawArray.ItemType = "StructProperty";
-                    GvasRawArray.Items = new UEProperty[] { };
+                    GvasRawArray = new UEArrayProperty { Name = "Reskins", Type = "ArrayProperty", ItemType = "StructProperty", Items = new UEProperty[] { } };
                 }
 
                 int i = 0;
@@ -104,11 +102,14 @@ internal static void Save()
             List<UEGenericStructProperty> zip = Liveries.Values.Where(p => p.Compressed).Select(p => p.GvasBaseProperty).ToList();
             List<UEGenericStructProperty> raw = Liveries.Values.Where(p => !p.Compressed).Select(p => p.GvasBaseProperty).ToList();
 
-            GvasZipArray.Count = zip.Count;
-            GvasZipArray.Items = zip.ToArray();
-
             GameData.Properties.Clear();
-            GameData.Properties.Add(GvasZipArray);
+
+            if (zip.Count > 0)
+            {
+                GvasZipArray.Count = zip.Count;
+                GvasZipArray.Items = zip.ToArray();
+                GameData.Properties.Add(GvasZipArray);
+            }
 
             if (raw.Count > 0)
             {
@@ -119,7 +120,8 @@ internal static void Save()
 
             GameData.Properties.Add(new UENoneProperty());
 
-            File.WriteAllText($"{Config.LibraryPath}\\gvas.json", JsonConvert.SerializeObject(GameData));
+            if (!int.TryParse(MainWindow.VERSION.Split('.')[^1], out int _))    //If in dev-version
+                File.WriteAllText($"{Config.LibraryPath}\\backup\\zz_gvas.json", JsonConvert.SerializeObject(GameData, Formatting.Indented));
 
             byte[] Contents = File.ReadAllBytes(Config.GamePath);
             Directory.CreateDirectory($"{Config.LibraryPath}\\backup");
diff --git a/Library.cs b/Library.cs
index 4252609..fe16fac 100644
--- a/Library.cs
+++ b/Library.cs
@@ -40,35 +40,6 @@ internal static void Load()
                 }
             }
 
-            /*Log.AddLogMessage($"Loading TSW2LM-Liveries...", "L:Load", Log.LogLevel.DEBUG);
-            foreach (FileInfo file in Info.GetFiles("*.tsw2liv"))
-            {
-                try
-                {
-                    byte[] data = File.ReadAllBytes(file.FullName);
-                    for (int i = 0; i < data.Length; i++)
-                    {
-                        if (i + 1 == data.Length)
-                            data[i] = 0;
-                        else
-                            data[i] = data[i+1];
-                    }
-                    File.WriteAllBytes(file.FullName + ".tmp", data);
-
-                    List<UEProperty> properties = new List<UEProperty>();
-
-                    BinaryReader reader = new BinaryReader(File.Open(file.FullName + ".tmp", FileMode.Open, FileAccess.Read, FileShare.Read), Encoding.ASCII, true);
-                    while (UEProperty.Read(reader) is UEProperty prop) properties.Add(prop);
-
-                    Livery livery = new Livery(file.FullName, properties);
-
-                }
-                catch (Exception e)
-                {
-                    Log.AddLogMessage($"Error while loading livery {file.Name}: {e.Message}", "L:Load", Log.LogLevel.WARNING);
-                }
-            }*/
-
             Log.Message($"Library fully loaded", "L:Load", Log.LogLevel.DEBUG);
         }
 
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 4da0a3f..d74baa0 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -21,7 +21,7 @@ public partial class MainWindow : Window
     {
         internal static MainWindow INSTANCE;
 
-        private const string VERSION = "0.2.1";
+        internal const string VERSION = "0.2.1";
 
         private Thread InfoCollectorThread = new Thread(GameLiveryInfo.AutoRefresh);
 
@@ -124,9 +124,19 @@ public MainWindow()
 
             InitializeComponent();
 
+            LateInit();
+
+            LiveryInfoWindow.INSTANCE = new LiveryInfoWindow();
+
+            //InfoCollectorThread.SetApartmentState(ApartmentState.STA);
+            //InfoCollectorThread.Start();
+        }
+
+        private void LateInit()
+        {
             if (Config.GamePath != "")
             {
-                Log.Message("Loading GamePath Data...", "MW::<init>");
+                Log.Message("Loading GamePath Data...", "MW:LateInit");
                 if (File.Exists(Config.GamePath))
                 {
                     txtGameDir.Text = Config.GamePath;
@@ -145,8 +155,10 @@ public MainWindow()
                     lblMessage.Content = $"ERROR WHILE LOADING GAME LIVERIES, please ensure you:\n - have created at least one livery in the game\n\nif you need help, consult the wiki at https://github.com/RagingLightning/TSW2-Livery-Manager/wiki/(1)-Getting-Started \n or @RagingLightning on discord or create an issue on github";
                 }
             }
+
             if (Config.LibraryPath != "")
             {
+                Log.Message("Initializing GameLiveryInfo...", "MW:LateInit");
                 if (File.Exists("LiveryInfo.json"))
                     File.Move("LiveryInfo.json", $"{Config.LibraryPath}\\zz_LiveryInfo.json");
                 GameLiveryInfo.Init($"{Config.LibraryPath}\\zz_LiveryInfo.json");
@@ -156,6 +168,7 @@ public MainWindow()
 
             if (Config.LibraryPath != "")
             {
+                Log.Message("Loading LibraryPath Data...", "MW:LateInit");
                 txtLibDir.Text = Config.LibraryPath;
                 Library.Load();
             }
@@ -164,12 +177,6 @@ public MainWindow()
 
             if (Config.LibraryPath != "" && Config.GamePath != "")
                 ((Data)DataContext).Useable = true;
-
-            LiveryInfoWindow.INSTANCE = new LiveryInfoWindow();
-
-            //InfoCollectorThread.SetApartmentState(ApartmentState.STA);
-            //InfoCollectorThread.Start();
-
         }
 
         private void Close(object sender, CancelEventArgs e)
@@ -553,11 +560,8 @@ private void btnLibDir_Click(object sender, RoutedEventArgs e)
                     txtLibDir.Text = Dialog.SelectedPath;
                     Log.Message($"Changed library path to {Config.LibraryPath}", "MW:LibDirClick");
                 }
-                Library.Load();
-                UpdateLibraryGui();
 
-                if (Config.LibraryPath != "" && Config.GamePath != "")
-                    ((Data)DataContext).Useable = true;
+                LateInit();
 
             }
             catch (Exception ex)
@@ -589,8 +593,8 @@ private void btnGameDir_Click(object sender, RoutedEventArgs e)
                     txtGameDir.Text = Dialog.SelectedPath;
                     Log.Message($"Changed game path to {Config.GamePath}", "MW::GameDirClick");
                 }
-                Game.Load();
-                UpdateGameGui();
+
+                LateInit();
             }
             catch (Exception ex)
             {
diff --git a/Utils.cs b/Utils.cs
index 6c01335..f38e2e7 100644
--- a/Utils.cs
+++ b/Utils.cs
@@ -282,7 +282,7 @@ internal static Library.Livery ConvertCC(byte[] ccData)
             }
 
             BinaryReader reader = new BinaryReader(new MemoryStream(data));
-            string Name = reader.ReadUEString();
+            string Name = reader.ReadUEString().Trim();
             int i = reader.ReadInt32();
             if (i != 0) throw new FormatException($"Expected 4 byte integer '0' at offset {reader.BaseStream.Position - 4:x}, was {i:x}");
             string s = reader.ReadUEString();
@@ -368,7 +368,7 @@ internal static Library.Livery ConvertCC(byte[] ccData)
                 prop.Properties.Add(p);
             }
 
-            return new Library.Livery($"cc_{Name}.tsw3", prop, displayNameProp.Value, baseDefinitionProp.Value.Split('.')[^1], false);
+            return new Library.Livery($"cc_{Name}.tsw3", prop, Name, baseDefinitionProp.Value.Split('.')[^1].Replace("RF_", ""), false);
         }
 
         private enum Property
@@ -395,11 +395,16 @@ public static string ReadUEString(this BinaryReader reader)
             if (length == 1)
                 return "";
 
+            byte[] valueBytes;
             if (length < 0)
-                length = -2 * length;
+            {
+                valueBytes = reader.ReadBytes(-2*length).Where(b => b != 0).ToArray();
+            } else
+            {
+                valueBytes = reader.ReadBytes(length);
+            }
 
-            var valueBytes = reader.ReadBytes(length);
-            return Utf8.GetString(valueBytes, 0, valueBytes.Length - 1);
+            return Enumerable.Range(0, valueBytes.Length-1).Select(i => char.ConvertFromUtf32(valueBytes[i])).Aggregate((a, b) => $"{a}{b}");
 
 #pragma warning restore CS8603 // Mögliche Nullverweisrückgabe.
         }
@@ -507,6 +512,8 @@ public override bool CanConvert(Type objectType)
                 livery.Name = jo["Name"].ToString();
                 livery.Model = jo["Model"].ToString();
                 livery.GvasBaseProperty = (UEGenericStructProperty)ReadUEProperty((JObject)jo["GvasBaseProperty"]);
+                if (jo["Compressed"] != null)   //Check for TSW3 file before Version 0.2.0
+                    livery.Compressed = jo["Compressed"].ToString() == "true";
                 return livery;
 #pragma warning restore CS8602,CS8600
             }

From 6a9edddfa811dadc36f6c813b684ff91518bbf6f Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Mon, 26 Sep 2022 13:22:29 +0200
Subject: [PATCH 16/19] v0.3.0a

---
 MainWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index d74baa0..6403d67 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -21,7 +21,7 @@ public partial class MainWindow : Window
     {
         internal static MainWindow INSTANCE;
 
-        internal const string VERSION = "0.2.1";
+        internal const string VERSION = "0.3.0a";
 
         private Thread InfoCollectorThread = new Thread(GameLiveryInfo.AutoRefresh);
 

From 843c27202b15ae600758c04ebceb1b422fcede48 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Mon, 26 Sep 2022 14:45:22 +0200
Subject: [PATCH 17/19] fix crash when running without command line arguments

---
 MainWindow.xaml.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 6403d67..626ad52 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -47,7 +47,10 @@ public MainWindow()
                 Log.ConsoleLevel = Log.LogLevel.DEBUG;
             }
             Log.Message($"+ Starting TSW3LM Version {VERSION}", "MW:<init>");
-            Log.Message($"Command line: TSW3LM.exe {Environment.GetCommandLineArgs().Skip(1).Aggregate((a, b) => $"{a} {b}")}", "MW:<init>");
+            if (Environment.GetCommandLineArgs().Length > 1)
+                Log.Message($"Command line: TSW3LM.exe {Environment.GetCommandLineArgs().Skip(1).Aggregate((a, b) => $"{a} {b}")}", "MW:<init>");
+            else
+                Log.Message($"Command line: TSW3LM.exe", "MW:<init>");
 
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(Utils.ExceptionHandler);
 

From ddbab36c4e00b8ceea05b5491c8496be20d2f5e5 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Mon, 26 Sep 2022 15:03:21 +0200
Subject: [PATCH 18/19] fix CC conversion crash when no "LastUsedColours"
 property exists

---
 MainWindow.xaml.cs | 13 +++++++++----
 Utils.cs           | 10 +++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 626ad52..caa8dbf 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -11,6 +11,7 @@
 using System.ComponentModel;
 using System.Threading;
 using GvasFormat.Serialization.UETypes;
+using static TSW3LM.GameLiveryInfo;
 
 namespace TSW3LM
 {
@@ -243,10 +244,14 @@ internal void UpdateGameGui(bool cc = false)
                 lstGameLiveries.Items.Clear();
                 foreach (FileInfo info in new DirectoryInfo(Config.CCPath).GetFiles("*.ugc"))
                 {
-                    Library.Livery livery = Utils.ConvertCC(File.ReadAllBytes(info.FullName));
-                    string Text = $"{livery.Name} for {livery.Model} <{info.Name}>";
-                    lstGameLiveries.Items.Add(Text);
-                    Log.Message($"Added CC livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                    try
+                    {
+                        Library.Livery livery = Utils.ConvertCC(File.ReadAllBytes(info.FullName));
+                        string Text = $"{livery.Name} for {livery.Model} <{info.Name}>";
+                        lstGameLiveries.Items.Add(Text);
+                        Log.Message($"Added CC livery {Text}", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
+                    }
+                    catch (Exception e) { Log.Exception($"Error adding CC livery {info.Name}", e, "MW:UpdateGameGui"); }
                 }
                 Log.Message("CC liveries in GUI updated", "MW:UpdateGameGui", Log.LogLevel.DEBUG);
 
diff --git a/Utils.cs b/Utils.cs
index f38e2e7..c6d34c4 100644
--- a/Utils.cs
+++ b/Utils.cs
@@ -353,9 +353,13 @@ internal static Library.Livery ConvertCC(byte[] ccData)
             {
                 UEGenericStructProperty reskinEditorDataProp = new UEGenericStructProperty { Name = "ReskinEditorData", Type = "StructProperty", StructType = "DTGReskinEditData" };
                 ((UEGenericStructProperty)reskinnedElementsProp).Properties.RemoveAll(p => p is UEMapProperty && p.Name == "MaterialInstances");
-                UEProperty lastUsedColoursProp = ((UEGenericStructProperty)reskinnedElementsProp).Properties.First(p => p is UEArrayProperty && p.Name == "LastUsedColours");
-                ((UEGenericStructProperty)reskinnedElementsProp).Properties.Remove(lastUsedColoursProp);
-                reskinEditorDataProp.Properties.Add(lastUsedColoursProp);
+                try
+                {
+                    UEProperty lastUsedColoursProp = ((UEGenericStructProperty)reskinnedElementsProp).Properties.First(p => p is UEArrayProperty && p.Name == "LastUsedColours");
+                    ((UEGenericStructProperty)reskinnedElementsProp).Properties.Remove(lastUsedColoursProp);
+                    reskinEditorDataProp.Properties.Add(lastUsedColoursProp);
+                }
+                catch (Exception) { }
                 reskinEditorDataProp.Properties.Add(new UENoneProperty());
 
                 prop.Properties.Add(reskinEditorDataProp);

From 223a67885baf65fac3e8ae96ba45b4185984aad7 Mon Sep 17 00:00:00 2001
From: RagingLightning <RagingLightningCode@gmail.com>
Date: Mon, 26 Sep 2022 18:10:17 +0200
Subject: [PATCH 19/19] move gvas.json creation after backup folder creation

---
 Game.cs            | 5 ++---
 MainWindow.xaml.cs | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Game.cs b/Game.cs
index e4eda81..f325cdd 100644
--- a/Game.cs
+++ b/Game.cs
@@ -120,11 +120,10 @@ internal static void Save()
 
             GameData.Properties.Add(new UENoneProperty());
 
-            if (!int.TryParse(MainWindow.VERSION.Split('.')[^1], out int _))    //If in dev-version
-                File.WriteAllText($"{Config.LibraryPath}\\backup\\zz_gvas.json", JsonConvert.SerializeObject(GameData, Formatting.Indented));
-
             byte[] Contents = File.ReadAllBytes(Config.GamePath);
             Directory.CreateDirectory($"{Config.LibraryPath}\\backup");
+            if (!int.TryParse(MainWindow.VERSION.Split('.')[^1], out int _))    //If in dev-version
+                File.WriteAllText($"{Config.LibraryPath}\\backup\\zz-gvas.json", JsonConvert.SerializeObject(GameData, Formatting.Indented));
             string backupName = DateTime.Now.ToString("yyMMdd-HHmmss") + ".bak3";
             File.WriteAllBytes($"{Config.LibraryPath}\\backup\\{backupName}", Contents);
 
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index caa8dbf..1cf3bfe 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -22,7 +22,7 @@ public partial class MainWindow : Window
     {
         internal static MainWindow INSTANCE;
 
-        internal const string VERSION = "0.3.0a";
+        internal const string VERSION = "0.3.0c";
 
         private Thread InfoCollectorThread = new Thread(GameLiveryInfo.AutoRefresh);