Add support for encoding charts back

Author: GEEKiDoS

AssetDownloader/Program.cs

@@ -36,7 +36,7 @@ static void Main(string[] args)
                 if (file.StartsWith("plain"))
                     ext = "";
 
-                if (File.Exists($"assets/{file}{ext}"))
+                if (File.Exists($"assets/{file}{ext}") || !file.Contains("MusicMaster"))
                     continue;
 
                 Console.WriteLine($"Downloading {file}");

AssetTool/Program.cs

@@ -18,19 +18,24 @@ static bool DecryptMaster(FileInfo inputFile, byte[] decrypted)
             var typeName = inputFile.Name.Replace(".msgpack.enc", "");
             var targetType = MasterTypes.GetDeserializeType(typeName);
 
+            var options = MessagePackSerializerOptions.Standard.WithCompression(MessagePackCompression.Lz4Block);
+
             if (targetType == null)
             {
                 Console.WriteLine($"Not supported master {typeName}.");
-                return false;
+                File.WriteAllText(
+                    inputFile.FullName.Replace(".msgpack.enc", ".json"),
+                    MessagePackSerializer.ConvertToJson(decrypted, options)
+                );
+            }
+            else
+            {
+                var result = MessagePackSerializer.Deserialize(targetType, decrypted, options);
+                File.WriteAllText(
+                    inputFile.FullName.Replace(".msgpack.enc", ".json"),
+                    DumpToJson(result)
+                );
             }
-
-            var options = MessagePackSerializerOptions.Standard.WithCompression(MessagePackCompression.Lz4Block);
-            var result = MessagePackSerializer.Deserialize(targetType, decrypted, options);
-
-            File.WriteAllText(
-                inputFile.FullName.Replace(".msgpack.enc", ".json"),
-                DumpToJson(result)
-            );
 
             return true;
         }
@@ -64,7 +69,7 @@ static void EncryptMaster(FileInfo inputFile)
             }
 
             var options = MessagePackSerializerOptions.Standard.WithCompression(MessagePackCompression.Lz4Block);
-            var result = JsonConvert.DeserializeObject(File.ReadAllText(inputFile.FullName), targetType);
+            var result = JsonConvert.DeserializeObject(File.ReadAllText(inputFile.FullName), targetType, new SBConverterIntInt<ChartLessonMaster>());
             var output = MessagePackSerializer.Serialize(result, options);
             var encrypted = AssetDecryptor.Encrypt(output);
 
@@ -80,7 +85,7 @@ static void ProcessFileSystemEntry(FileSystemInfo fileSystemInfo)
             }
             else if (fileSystemInfo is FileInfo fileInfo)
             {
-                if(fileInfo.Extension == ".enc")
+                if (fileInfo.Extension == ".enc")
                 {
                     Console.WriteLine($"Decrypting {fileInfo.Name}...");
                     var decrypted = AssetDecryptor.Decrypt(fileInfo.OpenRead());
@@ -100,24 +105,26 @@ static void ProcessFileSystemEntry(FileSystemInfo fileSystemInfo)
                             object result = null;
 
                             // Check if this is chart common data
-                            if(fileInfo.Name.EndsWith("0.enc"))
-                                result= DeserializeMsgPack<ChartCommonData>(decrypted);
+                            if (fileInfo.Name.EndsWith("0.enc"))
+                                result = DeserializeMsgPack<ChartCommonData>(decrypted);
                             else
                                 result = DeserializeMsgPack<ChartData>(decrypted);
- 
+
+                            var options = MessagePackSerializerOptions.Standard.WithCompression(MessagePackCompression.Lz4Block);
+
                             File.WriteAllText(
                                 fileInfo.FullName.Replace(".enc", ".json"),
                                 DumpToJson(result)
                             );
 
                             success = true;
                         }
-                        catch(Exception ex)
+                        catch (Exception ex)
                         {
                             Console.WriteLine($"Failed to dump chart: {ex.Message}");
                         }
                     }
-                    else if(fileInfo.Name.EndsWith("ResourceList.msgpack.enc"))
+                    else if (fileInfo.Name.EndsWith("ResourceList.msgpack.enc"))
                     {
                         Console.WriteLine($"Dumping ResourceList...");
 
@@ -141,7 +148,7 @@ static void ProcessFileSystemEntry(FileSystemInfo fileSystemInfo)
                 }
                 else if (fileInfo.Name.EndsWith("ResourceList.msgpack"))
                 {
-                    
+
                     try
                     {
                         var result = DeserializeMsgPack<Dictionary<string, int>>(File.ReadAllBytes(fileInfo.FullName));
@@ -181,11 +188,37 @@ static void ProcessFileSystemEntry(FileSystemInfo fileSystemInfo)
                     }
                 }
                 // Encrypt master back
-                else if(fileInfo.Name.EndsWith("Master.json"))
+                else if (fileInfo.Name.EndsWith("Master.json"))
                 {
                     Console.WriteLine($"Encrypting {fileInfo.Name}...");
                     EncryptMaster(fileInfo);
                 }
+                else if(fileInfo.Name.StartsWith("chart") && fileInfo.Extension == ".json")
+                {
+                    Console.WriteLine("Encrypting chart...");
+
+                    try
+                    {
+                        var json = File.ReadAllText(fileInfo.FullName);
+
+                        object result = null;
+
+                        // Check if this is chart common data
+                        if (fileInfo.Name.EndsWith("0.json"))
+                            result = JsonConvert.DeserializeObject<ChartCommonData>(json);
+                        else
+                            result = JsonConvert.DeserializeObject<ChartData>(json);
+
+                        File.WriteAllBytes(
+                            fileInfo.FullName.Replace(".json", ".enc"),
+                            AssetDecryptor.Encrypt(SerializeMsgPack(result))
+                        );
+                    }
+                    catch (Exception ex)
+                    {
+                        Console.WriteLine($"Failed to dump chart: {ex.Message}");
+                    }
+                }
                 else
                 {
                     Console.WriteLine($"Encrypting {fileInfo.Name}...");

AssetTool/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "AssetTool": {
       "commandName": "Project",
-      "commandLineArgs": "iOSResourceList.msgpack.enc"
+      "commandLineArgs": "chart_00000014.json"
     }
   }
 }

AssetTool/TupleConvertor.cs

@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using MessagePack;
+using Newtonsoft.Json;
+
+namespace D4DJ_Tools
+{
+    public class SBConverterIntInt<T> : JsonConverter<Dictionary<(int, int), T>>
+    {
+        /// <summary>
+        /// Override ReadJson to read the dictionary key and value
+        /// </summary>
+        /// <param name="reader"></param>
+        /// <param name="objectType"></param>
+        /// <param name="existingValue"></param>
+        /// <param name="serializer"></param>
+        /// <returns></returns>
+        public override Dictionary<(int, int), T> ReadJson(JsonReader reader, Type objectType, [AllowNull] Dictionary<(int, int), T> existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            var _dict = new Dictionary<(int, int), T>();
+
+            //loop through the JSON string reader
+            while (reader.Read())
+            {
+                // check whether it is a property
+                if (reader.TokenType == JsonToken.PropertyName)
+                {
+                    string readerValue = reader.Value.ToString();
+                    if (reader.Read())
+                    {
+                        // check if the property is tuple (Dictionary key)
+                        if (readerValue.Contains('(') && readerValue.Contains(')'))
+                        {
+                            string[] result = ConvertTuple(readerValue);
+
+                            if (result == null)
+                                continue;
+
+                            // Custom Deserialize the Dictionary key (Tuple)
+                            var _tuple = (int.Parse(result[0].Trim()), int.Parse(result[1].Trim()));
+
+                            // Custom Deserialize the Dictionary value
+                            var _value = serializer.Deserialize<T>(reader);
+
+                            _dict.Add(_tuple, _value);
+                        }
+                        else
+                        {
+                            // Deserialize the remaining data from the reader
+                            serializer.Deserialize(reader);
+                            break;
+                        }
+                    }
+                }
+            }
+            return _dict;
+        }
+
+        /// <summary>
+        /// To convert Tuple
+        /// </summary>
+        /// <param name="_string"></param>
+        /// <returns></returns>
+        public string[] ConvertTuple(string _string)
+        {
+            string tempStr = null;
+
+            // remove the first character which is a brace '('
+            if (_string.Contains('('))
+                tempStr = _string.Remove(0, 1);
+
+            // remove the last character which is a brace ')'
+            if (_string.Contains(')'))
+                tempStr = tempStr.Remove(tempStr.Length - 1, 1);
+
+            // seperate the Item1 and Item2
+            if (_string.Contains(','))
+                return tempStr.Split(',');
+
+            return null;
+        }
+
+        /// <summary>
+        /// WriteJson needs to be implemented since it is an abstract function.
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="value"></param>
+        /// <param name="serializer"></param>
+        public override void WriteJson(JsonWriter writer, Dictionary<(int, int), T> value, JsonSerializer serializer)
+        {
+            serializer.Serialize(writer, value);
+        }
+    }
+
+    public class IntIntTuple
+    {
+        public int Item1;
+        public int Item2;
+
+        public static implicit operator IntIntTuple(string value)
+        {
+            var values = value.Trim('(', ')').Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+            return new IntIntTuple { Item1 = int.Parse(values[0]), Item2 = int.Parse(values[1]) };
+        }
+
+        public static implicit operator string(IntIntTuple value)
+        {
+            return $"({value.Item1}, {value.Item2})";
+        }
+
+        public override string ToString()
+        {
+            return this;
+        }
+    }
+
+    public class IntIntTupleDic<T> : Dictionary<(int,int), T>
+    {
+
+    }
+}

D4DJ-Tools.sln

@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "D4DJ.Types", "D4DJ.Types\D4
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicRenamer", "MusicRenamer\MusicRenamer.csproj", "{9EBF88C9-1671-4B07-92AF-8166DF8643BA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetDownloader", "AssetDownloader\AssetDownloader.csproj", "{628D6092-2307-49F0-BEF1-58198B9B65E4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetDownloader", "AssetDownloader\AssetDownloader.csproj", "{628D6092-2307-49F0-BEF1-58198B9B65E4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

D4DJ.Types/ChartData.cs

@@ -36,13 +36,25 @@ public class NoteData
         public float EffectParameter { get; set; }
     }
 
+    [MessagePackObject]
+    public class SoflanData
+    {
+        [Key(0)]
+        public float Time { get; set; }
+        [Key(1)]
+        public float TimeScale { get; set; }
+        [Key(2)]
+        public int LeftRight { get; set; }
+    }
+
     [MessagePackObject]
     public class ChartData
     {
         [Key(0)]
         public string MusicName { get; set; }
         [Key(1)]
-        public (float, float, int)[] SoflanDataList { get; set; }
+        //public (float, float, int)[] SoflanDataList { get; set; }
+        public SoflanData[] SoflanDataList { get; set; }
         [Key(2)]
         public float[] BarLineList { get; set; }
         [Key(3)]