Start putting back st.db

Projects/Server/Serialization/BinaryFileReader.cs

@@ -14,6 +14,7 @@
  *************************************************************************/
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Text;
@@ -27,16 +28,19 @@ public class BinaryFileReader : IGenericReader, IDisposable
 {
     private static readonly ILogger logger = LogFactory.GetLogger(typeof(BinaryFileReader));
 
+    private Dictionary<ulong, string> _typesDb;
     private BinaryReader _reader;
     private Encoding _encoding;
 
-    public BinaryFileReader(BinaryReader br, Encoding encoding = null)
+    public BinaryFileReader(BinaryReader br, Dictionary<ulong, string> typesDb = null, Encoding encoding = null)
     {
         _reader = br;
         _encoding = encoding ?? TextEncoding.UTF8;
+        _typesDb = typesDb;
     }
 
-    public BinaryFileReader(Stream stream, Encoding encoding = null) : this(new BinaryReader(stream), encoding)
+    public BinaryFileReader(Stream stream, Dictionary<ulong, string> typesDb = null, Encoding encoding = null)
+        : this(new BinaryReader(stream), typesDb, encoding)
     {
     }
 
@@ -115,14 +119,44 @@ public Type ReadTypeByHash()
         var hash = ReadULong();
         var t = AssemblyHandler.FindTypeByHash(hash);
 
-        if (t == null)
+        if (t != null)
+        {
+            return t;
+        }
+
+        if (_typesDb == null)
+        {
+            logger.Error(
+                new Exception($"The file SerializedTypes.db was not loaded. Type hash '{hash}' could not be found."),
+                "Invalid {Hash} at position {Position}",
+                hash,
+                Position
+            );
+
+            return null;
+        }
+
+        if (!_typesDb.TryGetValue(hash, out var typeName))
         {
             logger.Error(
                 new Exception($"Type hash '{hash}' is not present in the serialized types database."),
                 "Invalid type hash {Hash} at position {Position}",
                 hash,
                 Position
             );
+
+            return null;
+        }
+
+        t = AssemblyHandler.FindTypeByFullName(typeName, false);
+
+        if (t == null)
+        {
+            logger.Error(
+                new Exception($"Type '{typeName}' was not found."),
+                "Type {Type} was not found.",
+                typeName
+            );
         }
 
         return t;

Projects/Server/Serialization/BinaryFileWriter.cs

@@ -1,6 +1,6 @@
 /*************************************************************************
  * ModernUO                                                              *
- * Copyright 2019-2024 - ModernUO Development Team                       *
+ * Copyright 2019-2023 - ModernUO Development Team                       *
  * Email: hi@modernuo.com                                                *
  * File: BinaryFileWriter.cs                                             *
  *                                                                       *
@@ -24,11 +24,11 @@ public class BinaryFileWriter : BufferWriter, IDisposable
     private readonly Stream _file;
     private long _position;
 
-    public BinaryFileWriter(string filename, bool prefixStr) :
-        this(new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.None), prefixStr)
+    public BinaryFileWriter(string filename, bool prefixStr, ConcurrentQueue<Type> types = null) :
+        this(new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.None), prefixStr, types)
     {}
 
-    public BinaryFileWriter(Stream stream, bool prefixStr, ConcurrentQueue<Type> types = null) : base(prefixStr)
+    public BinaryFileWriter(Stream stream, bool prefixStr, ConcurrentQueue<Type> types = null) : base(prefixStr, types)
     {
         _file = stream;
         _position = _file.Position;

Projects/Server/Serialization/BufferReader.cs

@@ -1,6 +1,6 @@
 /*************************************************************************
  * ModernUO                                                              *
- * Copyright 2019-2024 - ModernUO Development Team                       *
+ * Copyright 2019-2023 - ModernUO Development Team                       *
  * Email: hi@modernuo.com                                                *
  * File: BufferReader.cs                                                 *
  *                                                                       *
@@ -15,6 +15,7 @@
 
 using System;
 using System.Buffers.Binary;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.CompilerServices;
@@ -28,23 +29,30 @@ public class BufferReader : IGenericReader
 {
     private static readonly ILogger logger = LogFactory.GetLogger(typeof(BufferReader));
 
-    private readonly Encoding _encoding;
+    private Dictionary<ulong, string> _typesDb;
+    private Encoding _encoding;
     private byte[] _buffer;
     private int _position;
 
     public long Position => _position;
     public long BufferSize => _buffer.Length;
 
-    public BufferReader(byte[] buffer, Encoding encoding = null)
+    public BufferReader(byte[] buffer, Dictionary<ulong, string> typesDb = null, Encoding encoding = null)
     {
         _buffer = buffer;
         _encoding = encoding ?? TextEncoding.UTF8;
+        _typesDb = typesDb;
     }
 
-    public BufferReader(byte[] buffer, DateTime lastSerialized) : this(buffer) => LastSerialized = lastSerialized;
+    public BufferReader(byte[] buffer, DateTime lastSerialized, Dictionary<ulong, string> typesDb = null) : this(buffer)
+    {
+        LastSerialized = lastSerialized;
+        _typesDb = typesDb;
+    }
 
-    public void Reset(byte[] newBuffer)
+    public void Reset(byte[] newBuffer, out byte[] oldBuffer)
     {
+        oldBuffer = _buffer;
         _buffer = newBuffer;
         _position = 0;
     }
@@ -156,7 +164,24 @@ public Type ReadTypeByHash()
         var hash = ReadULong();
         var t = AssemblyHandler.FindTypeByHash(hash);
 
-        if (t == null)
+        if (t != null)
+        {
+            return t;
+        }
+
+        if (_typesDb == null)
+        {
+            logger.Error(
+                new Exception($"The file SerializedTypes.db was not loaded. Type hash '{hash}' could not be found."),
+                "Invalid {Hash} at position {Position}",
+                hash,
+                Position
+            );
+
+            return null;
+        }
+
+        if (!_typesDb.TryGetValue(hash, out var typeName))
         {
             logger.Error(
                 new Exception($"Type hash '{hash}' is not present in the serialized types database."),
@@ -168,6 +193,17 @@ public Type ReadTypeByHash()
             return null;
         }
 
+        t = AssemblyHandler.FindTypeByFullName(typeName, false);
+
+        if (t == null)
+        {
+            logger.Error(
+                new Exception($"Type '{typeName}' was not found."),
+                "Type {Type} was not found.",
+                typeName
+            );
+        }
+
         return t;
     }