Merge pull request #199 from BigBang1112/dev

2.4.1

Author: BigBang1112

Src/GBX.NET/Engines/Control/CControlList.chunkl

@@ -1,7 +1,15 @@
 CControlList 0x0700F000
 - inherits: CControlContainer
 
-0x007 (ignore)
+0x007
+ int
+ int
+ int
+ int
+ int
+ int
+ int
+ Unknown[]
 
 0x00A
  float
@@ -15,3 +23,10 @@ CControlList 0x0700F000
  float
  float
  bool
+
+archive Unknown
+ string
+ float
+ CMwNod
+ id
+ bool

Src/GBX.NET/Engines/Game/CGameGhost.Data.cs

@@ -160,8 +160,12 @@ private void ReadNew(GbxReader r)
                 }
             }
 
-            // CGameGhostTMData::ArchiveStateTimes
-            stateTimes = r.ReadArray<int>();
+            // guessed. there's some difference between TM1 and TM2 here, pls investigate soon
+            if (Version >= 10 || !IsFixedTimeStep)
+            {
+                // CGameGhostTMData::ArchiveStateTimes
+                stateTimes = r.ReadArray<int>();
+            }
 
             if (r.BaseStream.Position != r.BaseStream.Length)
             {
@@ -264,8 +268,11 @@ private void WriteNew(GbxWriter w)
                 }
             }
 
-            // CGameGhostTMData::ArchiveStateTimes
-            w.WriteArray(stateTimes);
+            if (Version >= 10 || !IsFixedTimeStep)
+            {
+                // CGameGhostTMData::ArchiveStateTimes
+                w.WriteArray(stateTimes);
+            }
         }
 
         private Sample ReadSample(TimeInt32 time, byte[] sampleData)

Src/GBX.NET/Engines/Hms/CHmsItem.cs

@@ -0,0 +1,9 @@
+namespace GBX.NET.Engines.Hms;
+
+public partial class CHmsItem
+{
+    protected override bool OnRawChunkIdRead(uint rawChunkId)
+    {
+        return rawChunkId != 0;
+    }
+}

Src/GBX.NET/Engines/MwFoundations/CMwNod.cs

@@ -34,6 +34,11 @@ internal virtual void Read(GbxReaderWriter rw)
         {
             var rawChunkId = r.ReadHexUInt32();
 
+            if (!OnRawChunkIdRead(rawChunkId))
+            {
+                return;
+            }
+
             if (rawChunkId == FACADE)
             {
                 r.Logger?.LogDebug("- FACADE -");
@@ -388,6 +393,11 @@ public virtual void ReadWrite(GbxReaderWriter rw)
         }
     }
 
+    protected virtual bool OnRawChunkIdRead(uint rawChunkId)
+    {
+        return true;
+    }
+
 #if NET8_0_OR_GREATER
     [Experimental("GBXNET10001")]
 #endif
@@ -518,6 +528,11 @@ public void Save(string fileName, GbxWriteSettings settings = default)
         return Chunks.Create<T>();
     }
 
+    public bool TryCreateChunk<T>(out T chunk) where T : IChunk, new()
+    {
+        return Chunks.TryCreate<T>(out chunk);
+    }
+
     public T? GetChunk<T>() where T : IChunk
     {
         return Chunks.Get<T>();

Src/GBX.NET/Engines/TrackMania/CCtnMediaBlockUiTMSimpleEvtsDisplay.chunkl

@@ -1,5 +1,5 @@
 CCtnMediaBlockUiTMSimpleEvtsDisplay 0x24092000
-- inherits: CGameCtnMediaBlock
+- inherits: CGameCtnMediaBlockUi
 
 0x000
 

Src/GBX.NET/GBX.NET.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <PackageId>GBX.NET</PackageId>
-        <VersionPrefix>2.4.0</VersionPrefix>
+        <VersionPrefix>2.4.1</VersionPrefix>
         <Authors>BigBang1112</Authors>
         <Description>General purpose library for Gbx files - data from Nadeo games like Trackmania or Shootmania. It supports high performance serialization and deserialization of 400+ Gbx classes.</Description>
         <Copyright>Copyright (c) 2026 Petr Pivoňka</Copyright>

Src/GBX.NET/Serialization/BoundedStream.cs

@@ -3,10 +3,10 @@
 internal sealed partial class BoundedStream : Stream
 {
     private readonly Stream baseStream;
-    private readonly long length;
-    private readonly long startPosition;
+    private readonly int length;
+    private readonly int startPosition;
 
-    private long remaining;
+    private int remaining;
     private MemoryStream? memoryStream;
 
     public override bool CanRead => true;
@@ -22,14 +22,14 @@ public override long Position
 
     public long Remaining => remaining;
 
-    public BoundedStream(Stream baseStream, long length)
+    public BoundedStream(Stream baseStream, int length)
     {
         this.baseStream = baseStream ?? throw new ArgumentNullException(nameof(baseStream));
         if (!baseStream.CanRead) throw new ArgumentException("Base stream must be readable.");
         if (length < 0) throw new ArgumentOutOfRangeException(nameof(length));
 
         this.length = length;
-        startPosition = baseStream.CanSeek ? baseStream.Position : 0;
+        startPosition = baseStream.CanSeek ? (int)baseStream.Position : 0;
         remaining = length;
     }
 
@@ -173,7 +173,7 @@ public override long Seek(long offset, SeekOrigin origin)
             memoryStream.Seek(newPosition, SeekOrigin.Begin);
         }
 
-        remaining = length - newPosition;
+        remaining = length - (int)newPosition;
         return newPosition;
     }
 

Src/GBX.NET/Serialization/Chunking/ChunkSetOfT.cs

@@ -25,6 +25,23 @@ public interface IChunkSet<TKind> : ICollection<TKind>, IEnumerable<TKind>, IEnu
     /// <returns>A new chunk instance.</returns>
     T Create<T>() where T : TKind, new();
 
+    /// <summary>
+    /// Tries to create a new chunk using the ID. Returns false if the same chunk ID already exists.
+    /// </summary>
+    /// <param name="chunkId">ID of the chunk.</param>
+    /// <param name="preferHeaderChunks">Whether to prefer creating header chunks if available.</param>
+    /// <param name="chunk">The created chunk if successful.</param>
+    /// <returns>True if a new chunk was successfully created, otherwise false.</returns>
+    bool TryCreate(uint chunkId, bool preferHeaderChunks, out TKind chunk);
+
+    /// <summary>
+    /// Tries to create a new chunk using the chunk type. Returns false if the same chunk already exists.
+    /// </summary>
+    /// <typeparam name="T">Type of the chunk.</typeparam>
+    /// <param name="chunk">The created chunk if successful.</param>
+    /// <returns>True if a new chunk was successfully created, otherwise false.</returns>
+    bool TryCreate<T>(out T chunk) where T : TKind, new();
+
     /// <summary>
     /// Gets a chunk using the ID.
     /// </summary>
@@ -165,6 +182,34 @@ public TKind Create(uint chunkId, bool preferHeaderChunks = false)
         return newChunk;
     }
 
+    public bool TryCreate(uint chunkId, bool preferHeaderChunks, out TKind chunk)
+    {
+        if (chunksById.TryGetValue(chunkId, out chunk))
+        {
+            return false;
+        }
+
+        chunk = New(chunkId, preferHeaderChunks);
+
+        Add(chunk);
+
+        return true;
+    }
+
+    public bool TryCreate<T>(out T chunk) where T : TKind, new()
+    {
+        if (chunksByType.TryGetValue(typeof(T), out var chunkBase))
+        {
+            chunk = (T)chunkBase;
+            return false;
+        }
+
+        chunk = new T();
+        Add(chunk);
+
+        return true;
+    }
+
     public TKind? Get(uint chunkId)
     {
         return chunksById.TryGetValue(chunkId, out var chunk) ? chunk : default;

Tools/ParseRepeater/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "ParseRepeater": {
       "commandName": "Project",
-      "commandLineArgs": "\"D:\\GbxTools\\Dataset\\TM10\\Alpine\\Media\\Texture\\AlpineBark.Texture.gbx\""
+      "commandLineArgs": "\"E:\\Games\\TrackMania Nations ESWC\\GameData\\Tracks\\Replays\\Bench.Replay.Gbx\""
     }
   }
 }