rewrite chf things

src/StarBreaker.Chf/Parser/ChfDataParser.cs → src/StarBreaker.Chf/ChfParts/ChfData.cs

@@ -1,31 +1,31 @@
 using StarBreaker.Common;
 
-namespace StarBreaker.Chf.Parser;
+namespace StarBreaker.Chf;
 
-public class ChfDataParser
+public class ChfData
 {
     public required CigGuid GenderId { get; init; }
-    public required DnaChunk Dna { get; init; }
+    public required Dna Dna { get; init; }
     public required ItemPort ItemPort { get; init; }
     public required List<Material> Materials { get; init; }
 
-    public static ChfDataParser FromBytes(ReadOnlySpan<byte> data)
+    public static ChfData FromBytes(ReadOnlySpan<byte> data)
     {
         var reader = new SpanReader(data);
 
         reader.Expect<uint>(2);
         reader.Expect<uint>(7);
         var gender = reader.Read<CigGuid>();
         reader.Expect(CigGuid.Empty);
-        var dna = DnaChunk.Read(ref reader);
+        var dna = Dna.Read(ref reader);
         var itemPortCount = reader.ReadUInt64();
         var itemPort = ItemPort.Read(ref reader);
         reader.Expect<uint>(5);
         var materials = new List<Material>();
         while (reader.Remaining > 0)
             materials.Add(Material.Read(ref reader));
 
-        return new ChfDataParser
+        return new ChfData
         {
             GenderId = gender,
             Dna = dna,

src/StarBreaker.Chf/Parser/Dna.cs → src/StarBreaker.Chf/ChfParts/Dna.cs

@@ -1,5 +1,4 @@
-using StarBreaker.Chf.Parser;
-using StarBreaker.Common;
+using StarBreaker.Common;
 
 namespace StarBreaker.Chf;
 
@@ -9,7 +8,7 @@ public sealed class Dna
     private const int PartCount = 48;
 
     public required string DnaString { get; init; }
-    public required uint ChildCount { get; init; }
+    public required uint MaxHeadId { get; init; }
     public required Dictionary<FacePart, DnaPart[]> Parts { get; init; }
 
     public static Dna Read(ref SpanReader reader)
@@ -65,7 +64,7 @@ public static Dna Read(ref SpanReader reader)
         return new Dna
         {
             DnaString = dnaString,
-            ChildCount = maxHeadId,
+            MaxHeadId = maxHeadId,
             Parts = perBodyPart
         };
     }

src/StarBreaker.Chf/Parser/ItemPort.cs → src/StarBreaker.Chf/ChfParts/ItemPort.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using StarBreaker.Common;
 
-namespace StarBreaker.Chf.Parser;
+namespace StarBreaker.Chf;
 
 [DebuggerDisplay("{Name}")]
 public class ItemPort

src/StarBreaker.Chf/Parser/Material.cs → src/StarBreaker.Chf/ChfParts/Material.cs

@@ -1,6 +1,6 @@
 using StarBreaker.Common;
 
-namespace StarBreaker.Chf.Parser;
+namespace StarBreaker.Chf;
 
 public class Material
 {

src/StarBreaker.Chf/Parser/MaterialParam.cs → src/StarBreaker.Chf/ChfParts/MaterialParam.cs

@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 using StarBreaker.Common;
 
-namespace StarBreaker.Chf.Parser;
+namespace StarBreaker.Chf;
 
 public class MaterialParam<T> where T : unmanaged
 {

src/StarBreaker.Chf/Parser/NameHash.cs → src/StarBreaker.Chf/ChfParts/NameHash.cs

@@ -2,14 +2,14 @@
 using System.Diagnostics.CodeAnalysis;
 using StarBreaker.Common;
 
-namespace StarBreaker.Chf.Parser;
+namespace StarBreaker.Chf;
 
-[DebuggerDisplay("{Name}")]
+[DebuggerDisplay("{Value}")]
 public readonly record struct NameHash
 {
     private readonly uint _value;
 
-    public string Name => TryGetName(out var name) ? name : $"0x{_value:X8}";
+    public string Value => TryGetName(out var name) ? name : $"0x{_value:X8}";
 
     private NameHash(uint value)
     {

src/StarBreaker.Chf/Parser/SubMaterial.cs → src/StarBreaker.Chf/ChfParts/SubMaterial.cs

@@ -1,6 +1,6 @@
 using StarBreaker.Common;
 
-namespace StarBreaker.Chf.Parser;
+namespace StarBreaker.Chf;
 
 public class SubMaterial
 {

src/StarBreaker.Chf/Parser/Texture.cs → src/StarBreaker.Chf/ChfParts/Texture.cs

@@ -1,6 +1,6 @@
 using StarBreaker.Common;
 
-namespace StarBreaker.Chf.Parser;
+namespace StarBreaker.Chf;
 
 public class Texture
 {

src/StarBreaker.Chf/ChfProcessing.cs

@@ -1,5 +1,5 @@
 using System.Text.Json;
-using StarBreaker.Chf.Parser;
+using StarBreaker.Chf;
 using StarBreaker.Common;
 
 namespace StarBreaker.Chf;
@@ -17,7 +17,7 @@ public static async Task ProcessCharacter(string chf)
 
         var json = Path.ChangeExtension(chf, ".json");
         var data = await File.ReadAllBytesAsync(bin);
-        var character = ChfDataParser.FromBytes(data);
+        var character = ChfData.FromBytes(data);
 
         var options = new JsonSerializerOptions
         {

src/StarBreaker.Chf/ChfSerializerContext.cs

@@ -1,9 +1,8 @@
 using System.Text.Json.Serialization;
-using StarBreaker.Chf.Parser;
+using StarBreaker.Chf;
 
 namespace StarBreaker.Chf;
 
-[JsonSerializable(typeof(StarCitizenCharacter))]
-[JsonSerializable(typeof(ChfDataParser))]
+[JsonSerializable(typeof(ChfData))]
 [JsonSourceGenerationOptions(WriteIndented = true)]
 internal partial class ChfSerializerContext : JsonSerializerContext;