warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates Packets & Randomizer (#43)

Browse source 
* Fixes a bug with the main loop. Removes unnecessary optimizations for RDRand.

* WIP - Rewriting packets.

* Cleanup and updates README

* Converts more packets

* Fixes header

* Converts Effects packets.

* Forgot the send command

* Adds the start of containers packets.

* Adds message packets with caching

* Extends the send methods

* Starts to add Acquire methods

* Converted the packets

* Cleanup

* Cleanup

* Adds more packets

* Adds more packets

* Fixes clearing arrays from pool. Adds Mobile Incoming

* Converts more packets.

* Moves more packets

* Moves more packets

* Test compression

* Merges

* Migrating to an idiomatic syntax that also supports compression, and proxying.

* Optimize the stack alloc. Changes attributes

* Converted container packets

* Visual Studio doesn't auto save files. I am still getting used to subpar IDEs.

* Adds static packet caching. Will profile later. Converts more packets

* Fixes packets and changes how compression is configured

* WIP - Adds basics for Gumps. Not finished though.

* Fix file

* Fixes formatting

* Changed SpanWriter to be more idiomatic.

* Fixes Span vs RawSpan and missing stackallocs

* Converts over some more gumps

* WIP - Deletes 32bit support.

* Drops RDRand32 support.

* Fixes gump compilation

* Converting gump components

* Removes old huffman compression function

* Revert signature for backwards compatibility

* WIP - Converting more gump components

* Creates ArraySet for the strings. Updates AppendTo to reference that.

* Converts the maining gump components

* Cleans up gump components

* Cleans up directives

* Cleans up ArraySet and moves it. Adds null-coalescing-assignment

* Cleanup, Target Packets, and C# 8 changes.

* Removed OPL Packet

* World packets

* Fixing packet uses

* Cleans up code. Fixes packet uses in various places.

* More cleanup for packets

* Code cleanup

* Converts more packet uses and cleans up more code

* More code cleanup

* Finishes fixing the packets in Item

* Updates secure trade packets

* Updates core and gets it to compile.

* Moved packets to scripts. Fixed account handler use of packets

* Code cleanup

* Updates chat packets

* Code cleanuo

* Adds party packets, but need to implement them.

* Party packets WIP

* Finishes party packets

* Rearrange movement namespaces and classes

* Finishes plant packets

* Code Formatting

* Fixes moving effects

* Code cleanup, eliminates equipinfo

* Adds more packets. Fixes bugs with various packets.

* Finishes mahjon packets

* Fixes mahjong packet

* Code cleanup

* Finishes mahjong packets

* Adds Map packets

* Add multifacet maps and charts

* Cleans up some packets with UTF8

* Optimizes packets

* Cleans up more packets. Moves the MessageHelper

* Removes assistant support. Removes extended protocol. Incorporates MapUO packets as normal packets.

* Updates protocol extensions packet receiver

* Fixes a few bugs. Fixes a few more packets.

* Code cleanup and fixing more packets

* Fixes packet effects

* Cleaned up more code

* Buff Icon cleanup

* Removed unused constructors

* Code Cleanup. Adds BoatHS Packets

* Moves house files. Updates house foundation packets.

* Deployment cleanup

* Fixes:

* Code cleanup

* More code cleanup

* More code cleanup

* Cleaned up BaseHouse

* Enforces styling

* Converts foreach to linq where possible.

* Dont need that

* Goals/Readme updates

* Removes 32bit support at the highest level. Turns on HRT by default.

* Code cleanup. Fixes extended features packet.

* Fixes various bugs

* Code cleanup

* Code cleanup

* Code cleanup. Fixes gump X/Y assignment.

* Code cleanup using |= operator

* More code cleanup

* Cleanup

* Fixes spacing issues. Thanks Visual Studio. You suck.

* Compiler error

* Fixes NPE from RunUO 2.7

* Renames ScriptCompiler to AssemblyHandler. Fixes packets. Updates README

* Fixes more packets. Stupid trailing nulls.

* Fixes various bugs.

* Fixes for gumps

* Fixes more gump stuff. Going to split it out later since it is getting insane

* Recoded the gump writing

* WIP

* *Added output path of scripts project to dev branch
*Activated debugging in code
This commit is contained in:
Kamron Batman 2019-11-11 03:40:16 -08:00 • committed by 3HMonkey
parent 7aa8fd3df1
commit 179cb50557
588 changed files with 10843 additions and 16177 deletions
Download patch file Download diff file Expand all files Collapse all files

260
Projects/Server/Gumps/Gump.cs
View file

@ -19,8 +19,13 @@
***************************************************************************/
using System;
using System.Buffers;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using Server.Buffers;
using Server.Collections;
using Server.Network;
namespace Server.Gumps
@ -29,135 +34,45 @@ namespace Server.Gumps
{
private static uint m_NextSerial = 1;
private static byte[] m_BeginLayout = StringToBuffer("{ ");
private static byte[] m_EndLayout = StringToBuffer(" }");
private static byte[] m_NoMove = StringToBuffer("{ nomove }");
private static byte[] m_NoClose = StringToBuffer("{ noclose }");
private static byte[] m_NoDispose = StringToBuffer("{ nodispose }");
private static byte[] m_NoResize = StringToBuffer("{ noresize }");
private bool m_Closable = true;
private bool m_Disposable = true;
private bool m_Draggable = true;
private bool m_Resizable = true;
private uint m_Serial;
private List<string> m_Strings;
internal int m_TextEntries, m_Switches;
private int m_X, m_Y;
public Gump(int x, int y)
{
do
{
m_Serial = m_NextSerial++;
} while (m_Serial == 0); // standard client apparently doesn't send a gump response packet if serial == 0
Serial = m_NextSerial++;
} while (Serial == 0); // standard client apparently doesn't send a gump response packet if serial == 0
m_X = x;
m_Y = y;
X = x;
Y = y;
TypeID = GetTypeID(GetType());
Entries = new List<GumpEntry>();
m_Strings = new List<string>();
}
public int TypeID{ get; }
public List<GumpEntry> Entries{ get; }
public uint Serial
{
get => m_Serial;
set
{
if (m_Serial != value)
{
m_Serial = value;
Invalidate();
}
}
}
public uint Serial { get; set; }
public int X
{
get => m_X;
set
{
if (m_X != value)
{
m_X = value;
Invalidate();
}
}
}
public int X { get; set; }
public int Y
{
get => m_Y;
set
{
if (m_Y != value)
{
m_Y = value;
Invalidate();
}
}
}
public int Y { get; set; }
public bool Disposable
{
get => m_Disposable;
set
{
if (m_Disposable != value)
{
m_Disposable = value;
Invalidate();
}
}
}
public bool Disposable { get; set; } = true;
public bool Resizable
{
get => m_Resizable;
set
{
if (m_Resizable != value)
{
m_Resizable = value;
Invalidate();
}
}
}
public bool Resizable { get; set; } = true;
public bool Draggable
{
get => m_Draggable;
set
{
if (m_Draggable != value)
{
m_Draggable = value;
Invalidate();
}
}
}
public bool Draggable { get; set; } = true;
public bool Closable
{
get => m_Closable;
set
{
if (m_Closable != value)
{
m_Closable = value;
Invalidate();
}
}
}
public bool Closable { get; set; } = true;
public static int GetTypeID(Type type) => type?.FullName?.GetHashCode() ?? -1;
@ -262,7 +177,12 @@ namespace Server.Gumps
Add(new GumpRadio(x, y, inactiveID, activeID, initialState, switchID));
}
public void AddTextEntry(int x, int y, int width, int height, int hue, int entryID, string initialText, int size = 0)
public void AddTextEntry( int x, int y, int width, int height, int hue, int entryID, string initialText )
{
Add( new GumpTextEntry( x, y, width, height, hue, entryID, initialText ) );
}
public void AddTextEntry(int x, int y, int width, int height, int hue, int entryID, string initialText, int size)
{
Add(new GumpTextEntryLimited(x, y, width, height, hue, entryID, initialText, size));
}
@ -275,14 +195,8 @@ namespace Server.Gumps
public void Add(GumpEntry g)
{
if (g.Parent != this)
{
g.Parent = this;
}
else if (!Entries.Contains(g))
{
Invalidate();
Entries.Add(g);
}
else if (!Entries.Contains(g)) Entries.Add(g);
}
public void Remove(GumpEntry g)
@ -290,70 +204,120 @@ namespace Server.Gumps
if (g == null || !Entries.Contains(g))
return;
Invalidate();
Entries.Remove(g);
g.Parent = null;
}
public int Intern(string value)
{
int indexOf = m_Strings.IndexOf(value);
if (indexOf >= 0) return indexOf;
Invalidate();
m_Strings.Add(value);
return m_Strings.Count - 1;
}
public static byte[] StringToBuffer(string str) => Encoding.ASCII.GetBytes(str);
public void SendTo(NetState state)
{
state.AddGump(this);
state.Send(Compile(state));
ArrayBufferWriter<byte> bufferWriter = new ArrayBufferWriter<byte>(0x10000);
m_TextEntries = 0;
m_Switches = 0;
if (state.Unpack)
CompilePacked(bufferWriter);
else
CompileFast(bufferWriter);
state.Send(bufferWriter.WrittenSpan);
}
private void WriteLayout(ArrayBufferWriter<byte> layoutBuffer, ArraySet<string> strings)
{
if (!Draggable)
layoutBuffer.Write(m_NoMove);
if (!Closable)
layoutBuffer.Write(m_NoClose);
if (!Disposable)
layoutBuffer.Write(m_NoDispose);
if (!Resizable)
layoutBuffer.Write(m_NoResize);
for (int i = 0; i < Entries.Count; ++i)
Entries[i].AppendTo(layoutBuffer, strings, ref m_TextEntries, ref m_Switches);
}
private static void WriteStrings(IBufferWriter<byte> stringsBuffer, IList<string> strings)
{
int stringLength = 2 * strings.Count + strings.Sum(t => t.Length * 2);
SpanWriter rawStringsWriter = new SpanWriter(stringsBuffer.GetSpan(stringLength));
for (int i = 0; i < strings.Count; ++i)
{
string v = strings[i] ?? "";
rawStringsWriter.Write((ushort)v.Length);
rawStringsWriter.WriteBigUni(v);
}
stringsBuffer.Advance(stringLength);
}
public static byte[] StringToBuffer(string str) => Encoding.ASCII.GetBytes(str);
private Packet Compile(NetState ns = null)
private void CompileFast(IBufferWriter<byte> bufferWriter)
{
IGumpWriter disp;
SpanWriter writer = new SpanWriter(bufferWriter.GetSpan(21));
writer.Write((byte)0xB0); // Packed ID
writer.Position += 2; // Dynamic Length
if (ns?.Unpack == true)
disp = new DisplayGumpPacked(this);
else
disp = new DisplayGumpFast(this);
writer.Write(Serial);
writer.Write(TypeID);
writer.Write(X);
writer.Write(Y);
if (!m_Draggable)
disp.AppendLayout(m_NoMove);
ArraySet<string> strings = new ArraySet<string>();
ArrayBufferWriter<byte> layoutBuffer = new ArrayBufferWriter<byte>();
WriteLayout(layoutBuffer, strings);
if (!m_Closable)
disp.AppendLayout(m_NoClose);
writer.Write((ushort)layoutBuffer.WrittenCount);
if (!m_Disposable)
disp.AppendLayout(m_NoDispose);
ArrayBufferWriter<byte> stringsBuffer = new ArrayBufferWriter<byte>();
Span<byte> span = stringsBuffer.GetSpan(2);
span[0] = (byte)(strings.Count >> 8);
span[1] = (byte)strings.Count;
bufferWriter.Advance(2);
WriteStrings(stringsBuffer, strings);
if (!m_Resizable)
disp.AppendLayout(m_NoResize);
writer.Position = 1;
writer.Write((ushort)(23 + layoutBuffer.WrittenCount + stringsBuffer.WrittenCount));
int count = Entries.Count;
// Write the header
bufferWriter.Advance(21);
for (int i = 0; i < count; ++i)
// Write the layout
bufferWriter.Write(layoutBuffer.WrittenSpan);
// Write strings
bufferWriter.Write(stringsBuffer.WrittenSpan);
}
private static int GetMaxPackedSize(int sourceLength) => 8 + (int)Compression.MaxPackSize((ulong)sourceLength);
private static int WritePacked(ReadOnlySpan<byte> source, Span<byte> dest)
{
int length = source.Length;
if (length == 0)
{
GumpEntry e = Entries[i];
disp.AppendLayout(m_BeginLayout);
e.AppendTo(ns, disp);
disp.AppendLayout(m_EndLayout);
dest.Clear();
return 4;
}
disp.WriteStrings(m_Strings);
ulong packLength = (ulong)dest.Length - 8;
disp.Flush();
ZLibError ce = Compression.Pack(dest.Slice(8), ref packLength, source, ZLibQuality.Default);
if (ce != ZLibError.Okay) Console.WriteLine("ZLib error: {0} (#{1})", ce, (int)ce);
SpanWriter writer = new SpanWriter(dest);
int packLengthInt = (int)packLength;
writer.Write(4 + packLengthInt);
writer.Write(length);
m_TextEntries = disp.TextEntries;
m_Switches = disp.Switches;
return (Packet)disp;
return 8 + packLengthInt;
}
public virtual void OnResponse(NetState sender, RelayInfo info)

61
Projects/Server/Gumps/GumpAlphaRegion.cs
View file

@ -18,57 +18,46 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpAlphaRegion : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("checkertrans");
private int m_Width, m_Height;
private int m_X, m_Y;
public GumpAlphaRegion(int x, int y, int width, int height)
{
m_X = x;
m_Y = y;
m_Width = width;
m_Height = height;
X = x;
Y = y;
Width = width;
Height = height;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int Width
{
get => m_Width;
set => Delta(ref m_Width, value);
}
public int Width { get; set; }
public int Height
{
get => m_Height;
set => Delta(ref m_Height, value);
}
public int Height { get; set; }
public override string Compile(NetState ns) => $"{{ checkertrans {m_X} {m_Y} {m_Width} {m_Height} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_Width);
disp.AppendLayout(m_Height);
SpanWriter writer = new SpanWriter(buffer.GetSpan(60));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Width.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Height.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}
}

69
Projects/Server/Gumps/GumpBackground.cs
View file

@ -18,66 +18,53 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpBackground : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("resizepic");
private int m_GumpID;
private int m_Width, m_Height;
private int m_X, m_Y;
public GumpBackground(int x, int y, int width, int height, int gumpID)
{
m_X = x;
m_Y = y;
m_Width = width;
m_Height = height;
X = x;
Y = y;
Width = width;
Height = height;
m_GumpID = gumpID;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int Width
{
get => m_Width;
set => Delta(ref m_Width, value);
}
public int Width { get; set; }
public int Height
{
get => m_Height;
set => Delta(ref m_Height, value);
}
public int Height { get; set; }
public int GumpID
{
get => m_GumpID;
set => Delta(ref m_GumpID, value);
}
public override string Compile(ArraySet<string> strings) => $"{{ resizepic {X} {Y} {m_GumpID} {Width} {Height} }}";
public override string Compile(NetState ns) => $"{{ resizepic {m_X} {m_Y} {m_GumpID} {m_Width} {m_Height} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_GumpID);
disp.AppendLayout(m_Width);
disp.AppendLayout(m_Height);
SpanWriter writer = new SpanWriter(buffer.GetSpan(68));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(m_GumpID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Width.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Height.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}
}

105
Projects/Server/Gumps/GumpButton.cs
View file

@ -18,7 +18,9 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
@ -30,89 +32,56 @@ namespace Server.Gumps
public class GumpButton : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("button");
private int m_ButtonID;
private int m_ID1, m_ID2;
private int m_Param;
private GumpButtonType m_Type;
private int m_X, m_Y;
public GumpButton(int x, int y, int normalID, int pressedID, int buttonID,
GumpButtonType type = GumpButtonType.Reply, int param = 0)
{
m_X = x;
m_Y = y;
m_ID1 = normalID;
m_ID2 = pressedID;
m_ButtonID = buttonID;
m_Type = type;
m_Param = param;
X = x;
Y = y;
NormalID = normalID;
PressedID = pressedID;
ButtonID = buttonID;
Type = type;
Param = param;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int NormalID
{
get => m_ID1;
set => Delta(ref m_ID1, value);
}
public int NormalID { get; set; }
public int PressedID
{
get => m_ID2;
set => Delta(ref m_ID2, value);
}
public int PressedID { get; set; }
public int ButtonID
{
get => m_ButtonID;
set => Delta(ref m_ButtonID, value);
}
public int ButtonID { get; set; }
public GumpButtonType Type
{
get => m_Type;
set
{
if (m_Type != value)
{
m_Type = value;
public GumpButtonType Type { get; set; }
Gump parent = Parent;
public int Param { get; set; }
parent?.Invalidate();
}
}
}
public int Param
{
get => m_Param;
set => Delta(ref m_Param, value);
}
public override string Compile(ArraySet<string> strings) => $"{{ button {X} {Y} {NormalID} {PressedID} {(int)Type} {Param} {ButtonID} }}";
public override string Compile(NetState ns) => $"{{ button {m_X} {m_Y} {m_ID1} {m_ID2} {(int)m_Type} {m_Param} {m_ButtonID} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_ID1);
disp.AppendLayout(m_ID2);
disp.AppendLayout((int)m_Type);
disp.AppendLayout(m_Param);
disp.AppendLayout(m_ButtonID);
SpanWriter writer = new SpanWriter(buffer.GetSpan(68));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(NormalID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(PressedID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(((int)Type).ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Param.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(ButtonID.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}

89
Projects/Server/Gumps/GumpCheck.cs
View file

@ -18,77 +18,58 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpCheck : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("checkbox");
private int m_ID1, m_ID2;
private bool m_InitialState;
private int m_SwitchID;
private int m_X, m_Y;
public GumpCheck(int x, int y, int inactiveID, int activeID, bool initialState, int switchID)
{
m_X = x;
m_Y = y;
m_ID1 = inactiveID;
m_ID2 = activeID;
m_InitialState = initialState;
m_SwitchID = switchID;
X = x;
Y = y;
InactiveID = inactiveID;
ActiveID = activeID;
InitialState = initialState;
SwitchID = switchID;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int InactiveID
{
get => m_ID1;
set => Delta(ref m_ID1, value);
}
public int InactiveID { get; set; }
public int ActiveID
{
get => m_ID2;
set => Delta(ref m_ID2, value);
}
public int ActiveID { get; set; }
public bool InitialState
{
get => m_InitialState;
set => Delta(ref m_InitialState, value);
}
public bool InitialState { get; set; }
public int SwitchID
{
get => m_SwitchID;
set => Delta(ref m_SwitchID, value);
}
public int SwitchID { get; set; }
public override string Compile(NetState ns) => $"{{ checkbox {m_X} {m_Y} {m_ID1} {m_ID2} {(m_InitialState ? 1 : 0)} {m_SwitchID} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_ID1);
disp.AppendLayout(m_ID2);
disp.AppendLayout(m_InitialState);
disp.AppendLayout(m_SwitchID);
private static readonly byte[] m_LayoutName = Gump.StringToBuffer("{ checkbox ");
disp.Switches++;
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
SpanWriter writer = new SpanWriter(buffer.GetSpan(69));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(InactiveID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(ActiveID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(InitialState ? "1" : "0");
writer.Write((byte)0x20); // ' '
writer.WriteAscii(SwitchID.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}
}

37
Projects/Server/Gumps/GumpEntry.cs
View file

@ -18,7 +18,8 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Collections;
namespace Server.Gumps
{
@ -42,37 +43,7 @@ namespace Server.Gumps
}
}
protected void Delta(ref uint var, uint val)
{
if (var != val)
var = val;
}
protected void Delta(ref int var, int val)
{
if (var != val)
var = val;
}
protected void Delta(ref bool var, bool val)
{
if (var != val)
var = val;
}
protected void Delta(ref string var, string val)
{
if (var != val)
var = val;
}
protected void Delta(ref object[] var, object[] val)
{
if (var != val)
var = val;
}
public abstract string Compile(NetState ns);
public abstract void AppendTo(NetState ns, IGumpWriter disp);
public abstract string Compile(ArraySet<string> strings);
public abstract void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches);
}
}

25
Projects/Server/Gumps/GumpGroup.cs
View file

@ -18,29 +18,30 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpGroup : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("group");
private int m_Group;
public GumpGroup(int group) => Group = group;
public GumpGroup(int group) => m_Group = group;
public int Group
{
get => m_Group;
set => Delta(ref m_Group, value);
}
public override string Compile(ArraySet<string> strings) => $"{{ group {Group} }}";
public override string Compile(NetState ns) => $"{{ group {m_Group} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_Group);
SpanWriter writer = new SpanWriter(buffer.GetSpan(20));
writer.Write(m_LayoutName);
writer.WriteAscii(Group.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}
}

96
Projects/Server/Gumps/GumpHtml.cs
View file

@ -18,83 +18,61 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpHtml : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("htmlgump");
private bool m_Background, m_Scrollbar;
private string m_Text;
private int m_Width, m_Height;
private int m_X, m_Y;
public GumpHtml(int x, int y, int width, int height, string text, bool background, bool scrollbar)
{
m_X = x;
m_Y = y;
m_Width = width;
m_Height = height;
m_Text = text;
m_Background = background;
m_Scrollbar = scrollbar;
X = x;
Y = y;
Width = width;
Height = height;
Text = text;
Background = background;
Scrollbar = scrollbar;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int Width
{
get => m_Width;
set => Delta(ref m_Width, value);
}
public int Width { get; set; }
public int Height
{
get => m_Height;
set => Delta(ref m_Height, value);
}
public int Height { get; set; }
public string Text
{
get => m_Text;
set => Delta(ref m_Text, value);
}
public string Text { get; set; }
public bool Background
{
get => m_Background;
set => Delta(ref m_Background, value);
}
public bool Background { get; set; }
public bool Scrollbar
{
get => m_Scrollbar;
set => Delta(ref m_Scrollbar, value);
}
public bool Scrollbar { get; set; }
public override string Compile(NetState ns) => $"{{ htmlgump {m_X} {m_Y} {m_Width} {m_Height} {Parent.Intern(m_Text)} {(m_Background ? 1 : 0)} {(m_Scrollbar ? 1 : 0)} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_Width);
disp.AppendLayout(m_Height);
disp.AppendLayout(Parent.Intern(m_Text));
disp.AppendLayout(m_Background);
disp.AppendLayout(m_Scrollbar);
SpanWriter writer = new SpanWriter(buffer.GetSpan(71));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Width.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Height.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(strings.Add(Text).ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Background ? "1" : "0");
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Scrollbar ? "1" : "0");
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}
}

220
Projects/Server/Gumps/GumpHtmlLocalized.cs
View file

@ -18,7 +18,9 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
@ -31,45 +33,33 @@ namespace Server.Gumps
public class GumpHtmlLocalized : GumpEntry
{
private static byte[] m_LayoutNamePlain = Gump.StringToBuffer("xmfhtmlgump");
private static byte[] m_LayoutNameColor = Gump.StringToBuffer("xmfhtmlgumpcolor");
private static byte[] m_LayoutNameArgs = Gump.StringToBuffer("xmfhtmltok");
private string m_Args;
private bool m_Background, m_Scrollbar;
private int m_Color;
private int m_Number;
private GumpHtmlLocalizedType m_Type;
private int m_Width, m_Height;
private int m_X, m_Y;
public GumpHtmlLocalized(int x, int y, int width, int height, int number,
bool background = false, bool scrollbar = false)
{
m_X = x;
m_Y = y;
m_Width = width;
m_Height = height;
m_Number = number;
m_Background = background;
m_Scrollbar = scrollbar;
X = x;
Y = y;
Width = width;
Height = height;
Number = number;
Background = background;
Scrollbar = scrollbar;
m_Type = GumpHtmlLocalizedType.Plain;
Type = GumpHtmlLocalizedType.Plain;
}
public GumpHtmlLocalized(int x, int y, int width, int height, int number, int color,
bool background = false, bool scrollbar = false)
{
m_X = x;
m_Y = y;
m_Width = width;
m_Height = height;
m_Number = number;
m_Color = color;
m_Background = background;
m_Scrollbar = scrollbar;
X = x;
Y = y;
Width = width;
Height = height;
Number = number;
Color = color;
Background = background;
Scrollbar = scrollbar;
m_Type = GumpHtmlLocalizedType.Color;
Type = GumpHtmlLocalizedType.Color;
}
public GumpHtmlLocalized(int x, int y, int width, int height, int number, string args, int color,
@ -77,81 +67,38 @@ namespace Server.Gumps
{
// Are multiple arguments unsupported? And what about non ASCII arguments?
m_X = x;
m_Y = y;
m_Width = width;
m_Height = height;
m_Number = number;
m_Args = args;
m_Color = color;
m_Background = background;
m_Scrollbar = scrollbar;
X = x;
Y = y;
Width = width;
Height = height;
Number = number;
Args = args;
Color = color;
Background = background;
Scrollbar = scrollbar;
m_Type = GumpHtmlLocalizedType.Args;
Type = GumpHtmlLocalizedType.Args;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int Width
{
get => m_Width;
set => Delta(ref m_Width, value);
}
public int Width { get; set; }
public int Height
{
get => m_Height;
set => Delta(ref m_Height, value);
}
public int Height { get; set; }
public int Number
{
get => m_Number;
set => Delta(ref m_Number, value);
}
public int Number { get; set; }
public string Args
{
get => m_Args;
set => Delta(ref m_Args, value);
}
public string Args { get; set; }
public int Color
{
get => m_Color;
set => Delta(ref m_Color, value);
}
public int Color { get; set; }
public bool Background
{
get => m_Background;
set => Delta(ref m_Background, value);
}
public bool Background { get; set; }
public bool Scrollbar
{
get => m_Scrollbar;
set => Delta(ref m_Scrollbar, value);
}
public bool Scrollbar { get; set; }
public GumpHtmlLocalizedType Type
{
get => m_Type;
set
{
if (m_Type != value)
{
m_Type = value;
public GumpHtmlLocalizedType Type { get; set; }
Parent?.Invalidate();
}
@ -173,56 +120,81 @@ namespace Server.Gumps
public override void AppendTo(NetState ns, IGumpWriter disp)
{
switch (m_Type)
SpanWriter writer = new SpanWriter(buffer.GetSpan(90 + Args?.Length ?? 0));
switch (Type)
{
case GumpHtmlLocalizedType.Plain:
{
disp.AppendLayout(m_LayoutNamePlain);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_Width);
disp.AppendLayout(m_Height);
disp.AppendLayout(m_Number);
disp.AppendLayout(m_Background);
disp.AppendLayout(m_Scrollbar);
writer.Write(m_LayoutNamePlain);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Width.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Height.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Number.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Background ? "1" : "0");
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Scrollbar ? "1" : "0");
break;
}
case GumpHtmlLocalizedType.Color:
{
disp.AppendLayout(m_LayoutNameColor);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_Width);
disp.AppendLayout(m_Height);
disp.AppendLayout(m_Number);
disp.AppendLayout(m_Background);
disp.AppendLayout(m_Scrollbar);
disp.AppendLayout(m_Color);
writer.Write(m_LayoutNameColor);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Width.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Height.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Number.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Background ? "1" : "0");
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Scrollbar ? "1" : "0");
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Color.ToString());
break;
}
case GumpHtmlLocalizedType.Args:
{
disp.AppendLayout(m_LayoutNameArgs);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_Width);
disp.AppendLayout(m_Height);
disp.AppendLayout(m_Background);
disp.AppendLayout(m_Scrollbar);
disp.AppendLayout(m_Color);
disp.AppendLayout(m_Number);
disp.AppendLayout(m_Args);
writer.Write(m_LayoutNameArgs);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Width.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Height.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Background ? "1" : "0");
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Scrollbar ? "1" : "0");
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Color.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Number.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x40); // '@'
writer.WriteAscii(Args ?? "");
writer.Write((byte)0x40); // '@'
break;
}
}
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}

76
Projects/Server/Gumps/GumpImage.cs
View file

@ -18,66 +18,68 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpImage : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("gumppic");
private static byte[] m_HueEquals = Gump.StringToBuffer(" hue=");
private int m_GumpID;
private int m_Hue;
private int m_X, m_Y;
public GumpImage(int x, int y, int gumpID, int hue = 0)
{
m_X = x;
m_Y = y;
m_GumpID = gumpID;
m_Hue = hue;
X = x;
Y = y;
GumpID = gumpID;
Hue = hue;
}
public int X
public GumpImage(int x, int y, int gumpID, int hue = 0, string cls = null)
{
get => m_X;
set => Delta(ref m_X, value);
X = x;
Y = y;
GumpID = gumpID;
Hue = hue;
Class = cls;
}
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int X { get; set; }
public int GumpID
{
get => m_GumpID;
set => Delta(ref m_GumpID, value);
}
public int Y { get; set; }
public int Hue
{
get => m_Hue;
set => Delta(ref m_Hue, value);
}
public int GumpID { get; set; }
public override string Compile(NetState ns) =>
m_Hue == 0 ? $"{{ gumppic {m_X} {m_Y} {m_GumpID} }}" :
$"{{ gumppic {m_X} {m_Y} {m_GumpID} hue={m_Hue} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_GumpID);
SpanWriter writer = new SpanWriter(buffer.GetSpan(66 + Class?.Length ?? 0));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(GumpID.ToString());
writer.Write((byte)0x20); // ' '
if (m_Hue != 0)
if (Hue != 0)
{
disp.AppendLayout(m_HueEquals);
disp.AppendLayoutNS(m_Hue);
writer.Write(m_HueEquals);
writer.WriteAscii(Hue.ToString());
writer.Write((byte)0x20); // ' '
}
if (!string.IsNullOrWhiteSpace(Class))
{
writer.Write(m_ClassEquals);
writer.WriteAscii(Class);
writer.Write((byte)0x20); // ' '
}
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}

176
Projects/Server/Gumps/GumpImageTileButton.cs
View file

@ -18,155 +18,101 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpImageTileButton : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("buttontileart");
private static byte[] m_LayoutTooltip = Gump.StringToBuffer(" }{ tooltip");
private int m_ButtonID;
private int m_Height;
private int m_Hue;
private int m_ID1, m_ID2;
private int m_ItemID;
private int m_Param;
private GumpButtonType m_Type;
private int m_Width;
//Note, on OSI, The tooltip supports ONLY clilocs as far as I can figure out, and the tooltip ONLY works after the buttonTileArt (as far as I can tell from testing)
private int m_X, m_Y;
public GumpImageTileButton(int x, int y, int normalID, int pressedID, int buttonID, GumpButtonType type, int param,
int itemID, int hue, int width, int height, int localizedTooltip = -1)
{
m_X = x;
m_Y = y;
m_ID1 = normalID;
m_ID2 = pressedID;
m_ButtonID = buttonID;
m_Type = type;
m_Param = param;
X = x;
Y = y;
NormalID = normalID;
PressedID = pressedID;
ButtonID = buttonID;
Type = type;
Param = param;
m_ItemID = itemID;
m_Hue = hue;
m_Width = width;
m_Height = height;
ItemID = itemID;
Hue = hue;
Width = width;
Height = height;
LocalizedTooltip = localizedTooltip;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int NormalID
{
get => m_ID1;
set => Delta(ref m_ID1, value);
}
public int NormalID { get; set; }
public int PressedID
{
get => m_ID2;
set => Delta(ref m_ID2, value);
}
public int PressedID { get; set; }
public int ButtonID
{
get => m_ButtonID;
set => Delta(ref m_ButtonID, value);
}
public int ButtonID { get; set; }
public GumpButtonType Type
{
get => m_Type;
set
{
if (m_Type != value)
{
m_Type = value;
public GumpButtonType Type { get; set; }
Gump parent = Parent;
public int Param { get; set; }
parent?.Invalidate();
}
}
}
public int ItemID { get; set; }
public int Param
{
get => m_Param;
set => Delta(ref m_Param, value);
}
public int Hue { get; set; }
public int ItemID
{
get => m_ItemID;
set => Delta(ref m_ItemID, value);
}
public int Width { get; set; }
public int Hue
{
get => m_Hue;
set => Delta(ref m_Hue, value);
}
public int Width
{
get => m_Width;
set => Delta(ref m_Width, value);
}
public int Height
{
get => m_Height;
set => Delta(ref m_Height, value);
}
public int Height { get; set; }
public int LocalizedTooltip{ get; set; }
public override string Compile(NetState ns)
{
if (LocalizedTooltip > 0)
return
$"{{ buttontileart {m_X} {m_Y} {m_ID1} {m_ID2} {(int)m_Type} {m_Param} {m_ButtonID} {m_ItemID} {m_Hue} {m_Width} {m_Height} }}{{ tooltip {LocalizedTooltip} }}";
return
$"{{ buttontileart {m_X} {m_Y} {m_ID1} {m_ID2} {(int)m_Type} {m_Param} {m_ButtonID} {m_ItemID} {m_Hue} {m_Width} {m_Height} }}";
}
public override string Compile(ArraySet<string> strings) =>
$"{{ buttontileart {X} {Y} {NormalID} {PressedID} {(int)Type} {Param} {ButtonID} {ItemID} {Hue} {Width} {Height} }}{(LocalizedTooltip > 0 ? $"{{ tooltip {LocalizedTooltip} }}" : "")}";
public override void AppendTo(NetState ns, IGumpWriter disp)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_ID1);
disp.AppendLayout(m_ID2);
disp.AppendLayout((int)m_Type);
disp.AppendLayout(m_Param);
disp.AppendLayout(m_ButtonID);
private static readonly byte[] m_LayoutName = Gump.StringToBuffer("{ buttontileart ");
private static readonly byte[] m_LayoutTooltip = Gump.StringToBuffer(" }{ tooltip ");
disp.AppendLayout(m_ItemID);
disp.AppendLayout(m_Hue);
disp.AppendLayout(m_Width);
disp.AppendLayout(m_Height);
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
SpanWriter writer = new SpanWriter(buffer.GetSpan(160));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(NormalID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(PressedID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(((int)Type).ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Param.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(ButtonID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(ItemID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Hue.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Width.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Height.ToString());
writer.Write((byte)0x20); // ' '
if (LocalizedTooltip > 0)
{
disp.AppendLayout(m_LayoutTooltip);
disp.AppendLayout(LocalizedTooltip);
writer.Write(m_LayoutTooltip);
writer.WriteAscii(LocalizedTooltip.ToString());
writer.Write((byte)0x20); // ' '
}
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}

73
Projects/Server/Gumps/GumpImageTiled.cs
View file

@ -18,66 +18,51 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpImageTiled : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("gumppictiled");
private int m_GumpID;
private int m_Width, m_Height;
private int m_X, m_Y;
public GumpImageTiled(int x, int y, int width, int height, int gumpID)
{
m_X = x;
m_Y = y;
m_Width = width;
m_Height = height;
m_GumpID = gumpID;
X = x;
Y = y;
Width = width;
Height = height;
GumpID = gumpID;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int Width
{
get => m_Width;
set => Delta(ref m_Width, value);
}
public int Width { get; set; }
public int Height
{
get => m_Height;
set => Delta(ref m_Height, value);
}
public int Height { get; set; }
public int GumpID
{
get => m_GumpID;
set => Delta(ref m_GumpID, value);
}
public int GumpID { get; set; }
public override string Compile(NetState ns) => $"{{ gumppictiled {m_X} {m_Y} {m_Width} {m_Height} {m_GumpID} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_Width);
disp.AppendLayout(m_Height);
disp.AppendLayout(m_GumpID);
SpanWriter writer = new SpanWriter(buffer.GetSpan(71));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Width.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Height.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(GumpID.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}
}

73
Projects/Server/Gumps/GumpItem.cs
View file

@ -18,63 +18,58 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpItem : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("tilepic");
private static byte[] m_LayoutNameHue = Gump.StringToBuffer("tilepichue");
private int m_Hue;
private int m_ItemID;
private int m_X, m_Y;
public GumpItem(int x, int y, int itemID, int hue = 0)
{
m_X = x;
m_Y = y;
m_ItemID = itemID;
m_Hue = hue;
X = x;
Y = y;
ItemID = itemID;
Hue = hue;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int ItemID
{
get => m_ItemID;
set => Delta(ref m_ItemID, value);
}
public int ItemID { get; set; }
public int Hue
{
get => m_Hue;
set => Delta(ref m_Hue, value);
}
public int Hue { get; set; }
public override string Compile(NetState ns) =>
m_Hue == 0 ? $"{{ tilepic {m_X} {m_Y} {m_ItemID} }}" :
$"{{ tilepichue {m_X} {m_Y} {m_ItemID} {m_Hue} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
{
disp.AppendLayout(m_Hue == 0 ? m_LayoutName : m_LayoutNameHue);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_ItemID);
private static readonly byte[] m_LayoutName = Gump.StringToBuffer("{ tilepic ");
private static readonly byte[] m_LayoutNameHue = Gump.StringToBuffer("{ tilepichue ");
if (m_Hue != 0)
disp.AppendLayout(m_Hue);
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
SpanWriter writer = new SpanWriter(buffer.GetSpan(57));
writer.Write(Hue == 0 ? m_LayoutName : m_LayoutNameHue);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(ItemID.ToString());
writer.Write((byte)0x20); // ' '
if (Hue != 0)
{
writer.WriteAscii(Hue.ToString());
writer.Write((byte)0x20); // ' '
}
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}

26
Projects/Server/Gumps/GumpItemProperty.cs
View file

@ -18,29 +18,31 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpItemProperty : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("itemproperty");
private uint m_Serial;
public GumpItemProperty(uint serial) => Serial = serial;
public GumpItemProperty(uint serial) => m_Serial = serial;
public uint Serial
{
get => m_Serial;
set => Delta(ref m_Serial, value);
}
public override string Compile(ArraySet<string> strings) => $"{{ itemproperty {Serial} }}";
public override string Compile(NetState ns) => $"{{ itemproperty {m_Serial} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_Serial);
SpanWriter writer = new SpanWriter(buffer.GetSpan(27));
writer.Write(m_LayoutName);
writer.WriteAscii(Serial.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}
}

63
Projects/Server/Gumps/GumpLabel.cs
View file

@ -18,58 +18,47 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpLabel : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("text");
private int m_Hue;
private string m_Text;
private int m_X, m_Y;
public GumpLabel(int x, int y, int hue, string text)
{
m_X = x;
m_Y = y;
m_Hue = hue;
m_Text = text;
X = x;
Y = y;
Hue = hue;
Text = text;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int Hue
{
get => m_Hue;
set => Delta(ref m_Hue, value);
}
public int Hue { get; set; }
public string Text
{
get => m_Text;
set => Delta(ref m_Text, value);
}
public string Text { get; set; }
public override string Compile(NetState ns) => $"{{ text {m_X} {m_Y} {m_Hue} {Parent.Intern(m_Text)} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_Hue);
disp.AppendLayout(Parent.Intern(m_Text));
SpanWriter writer = new SpanWriter(buffer.GetSpan(52));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Hue.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(strings.Add(Text).ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}
}

88
Projects/Server/Gumps/GumpLabelCropped.cs
View file

@ -18,75 +18,59 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpLabelCropped : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("croppedtext");
private int m_Hue;
private string m_Text;
private int m_Width, m_Height;
private int m_X, m_Y;
public GumpLabelCropped(int x, int y, int width, int height, int hue, string text)
{
m_X = x;
m_Y = y;
m_Width = width;
m_Height = height;
m_Hue = hue;
m_Text = text;
X = x;
Y = y;
Width = width;
Height = height;
Hue = hue;
Text = text;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int Width
{
get => m_Width;
set => Delta(ref m_Width, value);
}
public int Width { get; set; }
public int Height
{
get => m_Height;
set => Delta(ref m_Height, value);
}
public int Height { get; set; }
public int Hue
{
get => m_Hue;
set => Delta(ref m_Hue, value);
}
public int Hue { get; set; }
public string Text
{
get => m_Text;
set => Delta(ref m_Text, value);
}
public string Text { get; set; }
public override string Compile(NetState ns) => $"{{ croppedtext {m_X} {m_Y} {m_Width} {m_Height} {m_Hue} {Parent.Intern(m_Text)} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
private static readonly byte[] m_LayoutName = Gump.StringToBuffer("{ croppedtext ");
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_Width);
disp.AppendLayout(m_Height);
disp.AppendLayout(m_Hue);
disp.AppendLayout(Parent.Intern(m_Text));
SpanWriter writer = new SpanWriter(buffer.GetSpan(81));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Width.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Height.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Hue.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(strings.Add(Text).ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}
}

26
Projects/Server/Gumps/GumpPage.cs
View file

@ -18,29 +18,31 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpPage : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("page");
private int m_Page;
public GumpPage(int page) => Page = page;
public GumpPage(int page) => m_Page = page;
public int Page
{
get => m_Page;
set => Delta(ref m_Page, value);
}
public override string Compile(ArraySet<string> strings) => $"{{ page {Page} }}";
public override string Compile(NetState ns) => $"{{ page {m_Page} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_Page);
SpanWriter writer = new SpanWriter(buffer.GetSpan(19));
writer.Write(m_LayoutName);
writer.WriteAscii(Page.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}
}

92
Projects/Server/Gumps/GumpRadio.cs
View file

@ -18,77 +18,61 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpRadio : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("radio");
private int m_ID1, m_ID2;
private bool m_InitialState;
private int m_SwitchID;
private int m_X, m_Y;
public GumpRadio(int x, int y, int inactiveID, int activeID, bool initialState, int switchID)
{
m_X = x;
m_Y = y;
m_ID1 = inactiveID;
m_ID2 = activeID;
m_InitialState = initialState;
m_SwitchID = switchID;
X = x;
Y = y;
InactiveID = inactiveID;
ActiveID = activeID;
InitialState = initialState;
SwitchID = switchID;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int InactiveID
{
get => m_ID1;
set => Delta(ref m_ID1, value);
}
public int InactiveID { get; set; }
public int ActiveID
{
get => m_ID2;
set => Delta(ref m_ID2, value);
}
public int ActiveID { get; set; }
public bool InitialState
{
get => m_InitialState;
set => Delta(ref m_InitialState, value);
}
public bool InitialState { get; set; }
public int SwitchID
{
get => m_SwitchID;
set => Delta(ref m_SwitchID, value);
}
public int SwitchID { get; set; }
public override string Compile(NetState ns) => $"{{ radio {m_X} {m_Y} {m_ID1} {m_ID2} {(m_InitialState ? 1 : 0)} {m_SwitchID} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_ID1);
disp.AppendLayout(m_ID2);
disp.AppendLayout(m_InitialState);
disp.AppendLayout(m_SwitchID);
private static readonly byte[] m_LayoutName = Gump.StringToBuffer("{ radio ");
disp.Switches++;
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
SpanWriter writer = new SpanWriter(buffer.GetSpan(66));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(InactiveID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(ActiveID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(InitialState ? "1" : "0");
writer.Write((byte)0x20); // ' '
writer.WriteAscii(SwitchID.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
switches++;
}
}
}
}

104
Projects/Server/Gumps/GumpTextEntry.cs
View file

@ -18,86 +18,66 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpTextEntry : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("textentry");
private int m_EntryID;
private int m_Hue;
private string m_InitialText;
private int m_Width, m_Height;
private int m_X, m_Y;
public GumpTextEntry(int x, int y, int width, int height, int hue, int entryID, string initialText)
{
m_X = x;
m_Y = y;
m_Width = width;
m_Height = height;
m_Hue = hue;
m_EntryID = entryID;
m_InitialText = initialText;
X = x;
Y = y;
Width = width;
Height = height;
Hue = hue;
EntryID = entryID;
InitialText = initialText;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int Width
{
get => m_Width;
set => Delta(ref m_Width, value);
}
public int Width { get; set; }
public int Height
{
get => m_Height;
set => Delta(ref m_Height, value);
}
public int Height { get; set; }
public int Hue
{
get => m_Hue;
set => Delta(ref m_Hue, value);
}
public int Hue { get; set; }
public int EntryID
{
get => m_EntryID;
set => Delta(ref m_EntryID, value);
}
public int EntryID { get; set; }
public string InitialText
{
get => m_InitialText;
set => Delta(ref m_InitialText, value);
}
public string InitialText { get; set; }
public override string Compile(NetState ns) => $"{{ textentry {m_X} {m_Y} {m_Width} {m_Height} {m_Hue} {m_EntryID} {Parent.Intern(m_InitialText)} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_Width);
disp.AppendLayout(m_Height);
disp.AppendLayout(m_Hue);
disp.AppendLayout(m_EntryID);
disp.AppendLayout(Parent.Intern(m_InitialText));
private static readonly byte[] m_LayoutName = Gump.StringToBuffer(" { textentry ");
disp.TextEntries++;
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
SpanWriter writer = new SpanWriter(buffer.GetSpan(90));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Width.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Height.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Hue.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(EntryID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(strings.Add(InitialText).ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
entries++;
}
}
}
}

110
Projects/Server/Gumps/GumpTextEntryLimited.cs
View file

@ -18,95 +18,69 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpTextEntryLimited : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("textentrylimited");
private int m_EntryID;
private int m_Hue;
private string m_InitialText;
private int m_Size;
private int m_Width, m_Height;
private int m_X, m_Y;
public GumpTextEntryLimited(int x, int y, int width, int height, int hue, int entryID, string initialText, int size = 0)
{
m_X = x;
m_Y = y;
m_Width = width;
m_Height = height;
m_Hue = hue;
m_EntryID = entryID;
m_InitialText = initialText;
m_Size = size;
X = x;
Y = y;
Width = width;
Height = height;
Hue = hue;
EntryID = entryID;
InitialText = initialText;
Size = size;
}
public int X
{
get => m_X;
set => Delta(ref m_X, value);
}
public int X { get; set; }
public int Y
{
get => m_Y;
set => Delta(ref m_Y, value);
}
public int Y { get; set; }
public int Width
{
get => m_Width;
set => Delta(ref m_Width, value);
}
public int Width { get; set; }
public int Height
{
get => m_Height;
set => Delta(ref m_Height, value);
}
public int Height { get; set; }
public int Hue
{
get => m_Hue;
set => Delta(ref m_Hue, value);
}
public int Hue { get; set; }
public int EntryID
{
get => m_EntryID;
set => Delta(ref m_EntryID, value);
}
public int EntryID { get; set; }
public string InitialText
{
get => m_InitialText;
set => Delta(ref m_InitialText, value);
}
public string InitialText { get; set; }
public int Size
{
get => m_Size;
set => Delta(ref m_Size, value);
}
public int Size { get; set; }
public override string Compile(NetState ns) => $"{{ textentrylimited {m_X} {m_Y} {m_Width} {m_Height} {m_Hue} {m_EntryID} {Parent.Intern(m_InitialText)} {m_Size} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_X);
disp.AppendLayout(m_Y);
disp.AppendLayout(m_Width);
disp.AppendLayout(m_Height);
disp.AppendLayout(m_Hue);
disp.AppendLayout(m_EntryID);
disp.AppendLayout(Parent.Intern(m_InitialText));
disp.AppendLayout(m_Size);
SpanWriter writer = new SpanWriter(buffer.GetSpan(107));
writer.Write(m_LayoutName);
writer.WriteAscii(X.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Y.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Width.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Height.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Hue.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(EntryID.ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(strings.Add(InitialText).ToString());
writer.Write((byte)0x20); // ' '
writer.WriteAscii(Size.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
disp.TextEntries++;
buffer.Advance(writer.WrittenCount);
entries++;
}
}
}

26
Projects/Server/Gumps/GumpTooltip.cs
View file

@ -18,29 +18,31 @@
*
***************************************************************************/
using Server.Network;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Gumps
{
public class GumpTooltip : GumpEntry
{
private static byte[] m_LayoutName = Gump.StringToBuffer("tooltip");
private int m_Number;
public GumpTooltip(int number) => Number = number;
public GumpTooltip(int number) => m_Number = number;
public int Number
{
get => m_Number;
set => Delta(ref m_Number, value);
}
public override string Compile(ArraySet<string> strings) => $"{{ tooltip {Number} }}";
public override string Compile(NetState ns) => $"{{ tooltip {m_Number} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
public override void AppendTo(ArrayBufferWriter<byte> buffer, ArraySet<string> strings, ref int entries, ref int switches)
{
disp.AppendLayout(m_LayoutName);
disp.AppendLayout(m_Number);
SpanWriter writer = new SpanWriter(buffer.GetSpan(22));
writer.Write(m_LayoutName);
writer.WriteAscii(Number.ToString());
writer.Write((byte)0x20); // ' '
writer.Write((byte)0x7D); // '}'
buffer.Advance(writer.WrittenCount);
}
}
}
}