Revert "Updates Packets & Randomizer (#43)" (#61)

This reverts commit 179cb50557.

Projects/Server/ObjectPropertyList.cs

@@ -18,19 +18,27 @@
  *
  ***************************************************************************/
 
-using System;
-using System.Buffers;
+using System.IO;
 using System.Text;
-using Server.Buffers;
 using Server.Network;
 
 namespace Server
 {
-  public sealed class ObjectPropertyList
+  public interface IPropertyListObject : IEntity
   {
+    ObjectPropertyList PropertyList{ get; }
+    OPLInfo OPLPacket{ get;  }
+
+    void GetProperties(ObjectPropertyList list);
+  }
+
+  public sealed class ObjectPropertyList : Packet
+  {
+    private static byte[] m_Buffer = new byte[1024];
+    private static Encoding m_Encoding = Encoding.Unicode;
+
     // Each of these are localized to "~1_NOTHING~" which allows the string argument to be used
-    // TODO: There are more of these, add them.
-    private static readonly int[] m_StringNumbers =
+    private static int[] m_StringNumbers =
     {
       1042971,
       1070722
@@ -39,9 +47,18 @@ namespace Server
     private int m_Hash;
     private int m_Strings;
 
-    private ArrayBufferWriter<byte> m_Buffer = new ArrayBufferWriter<byte>();
+    public ObjectPropertyList(IEntity e) : base(0xD6)
+    {
+      EnsureCapacity(128);
 
-    public ObjectPropertyList(IEntity e) => Entity = e;
+      Entity = e;
+
+      m_Stream.Write((short)1);
+      m_Stream.Write(e.Serial);
+      m_Stream.Write((byte)0);
+      m_Stream.Write((byte)0);
+      m_Stream.Write(e.Serial);
+    }
 
     public IEntity Entity{ get; }
 
@@ -53,26 +70,29 @@ namespace Server
 
     public static bool Enabled{ get; set; }
 
-    public void Send(NetState ns)
+    public void Add(int number)
     {
-      if (ns == null)
+      if (number == 0)
         return;
 
-      ReadOnlySpan<byte> body = m_Buffer.WrittenSpan;
+      AddHash(number);
 
-      ushort length = (ushort)(19 + body.Length);
-      SpanWriter writer = new SpanWriter(stackalloc byte[length]);
-      writer.Write((byte)0xD6); // Packet ID
-      writer.Write(length); // Dynamic Length
+      if (Header == 0)
+      {
+        Header = number;
+        HeaderArgs = "";
+      }
 
-      writer.Write((short)1); // Command
-      writer.Write(Entity.Serial);
-      writer.Position += 2;
-      writer.Write(m_Hash);
-      writer.Write(body);
-      writer.Position += 4;
+      m_Stream.Write(number);
+      m_Stream.Write((short)0);
+    }
 
-      ns.Send(writer.Span);
+    public void Terminate()
+    {
+      m_Stream.Write(0);
+
+      m_Stream.Seek(11, SeekOrigin.Begin);
+      m_Stream.Write(m_Hash);
     }
 
     public void AddHash(int val)
@@ -81,12 +101,13 @@ namespace Server
       m_Hash ^= val >> 26 & 0x3F;
     }
 
-    public void Add(int number, string arguments = "")
+    public void Add(int number, string arguments)
     {
       if (number == 0)
         return;
 
-      arguments ??= "";
+      if (arguments == null)
+        arguments = "";
 
       if (Header == 0)
       {
@@ -95,17 +116,34 @@ namespace Server
       }
 
       AddHash(number);
-      if (arguments != "")
-        AddHash(arguments.GetHashCode());
+      AddHash(arguments.GetHashCode());
 
-      int argLength = Encoding.Unicode.GetByteCount(arguments);
-      int length = 6 + argLength;
-      SpanWriter writer = new SpanWriter(m_Buffer.GetSpan(length));
-      writer.Write(number);
-      writer.Write((short)argLength);
-      writer.WriteLittleUni(arguments);
+      m_Stream.Write(number);
 
-      m_Buffer.Advance(length);
+      int byteCount = m_Encoding.GetByteCount(arguments);
+
+      if (byteCount > m_Buffer.Length)
+        m_Buffer = new byte[byteCount];
+
+      byteCount = m_Encoding.GetBytes(arguments, 0, arguments.Length, m_Buffer, 0);
+
+      m_Stream.Write((short)byteCount);
+      m_Stream.Write(m_Buffer, 0, byteCount);
+    }
+
+    public void Add(int number, string format, object arg0)
+    {
+      Add(number, string.Format(format, arg0));
+    }
+
+    public void Add(int number, string format, object arg0, object arg1)
+    {
+      Add(number, string.Format(format, arg0, arg1));
+    }
+
+    public void Add(int number, string format, object arg0, object arg1, object arg2)
+    {
+      Add(number, string.Format(format, arg0, arg1, arg2));
     }
 
     public void Add(int number, string format, params object[] args)
@@ -120,20 +158,42 @@ namespace Server
       Add(GetStringNumber(), text);
     }
 
+    public void Add(string format, string arg0)
+    {
+      Add(GetStringNumber(), string.Format(format, arg0));
+    }
+
+    public void Add(string format, string arg0, string arg1)
+    {
+      Add(GetStringNumber(), string.Format(format, arg0, arg1));
+    }
+
+    public void Add(string format, string arg0, string arg1, string arg2)
+    {
+      Add(GetStringNumber(), string.Format(format, arg0, arg1, arg2));
+    }
+
     public void Add(string format, params object[] args)
     {
       Add(GetStringNumber(), string.Format(format, args));
     }
+  }
 
-    public void SendOPLInfo(NetState ns)
+  public sealed class OPLInfo : Packet
+  {
+    /*public OPLInfo( ObjectPropertyList list ) : base( 0xBF )
     {
-      SpanWriter writer = new SpanWriter(stackalloc byte[9]);
-      writer.Write((byte)0xDC); // Packet ID
+      EnsureCapacity( 13 );
 
-      writer.Write(Entity.Serial);
-      writer.Write(m_Hash);
+      m_Stream.Write( (short) 0x10 );
+      m_Stream.Write( (int) list.Entity.Serial );
+      m_Stream.Write( (int) list.Hash );
+    }*/
 
-      ns.Send(writer.Span);
+    public OPLInfo(ObjectPropertyList list) : base(0xDC, 9)
+    {
+      m_Stream.Write(list.Entity.Serial);
+      m_Stream.Write(list.Hash);
     }
   }
 }