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

Formatting FIxes (#58)

Browse source
This commit is contained in:
Kamron Batman 2019-10-04 23:08:13 -07:00 • committed by GitHub
parent 57fb9fb525
commit 096d39609e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1318 changed files with 11633 additions and 22129 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -159,10 +159,7 @@ namespace Server.Gumps
}
}
public static int GetTypeID(Type type)
{
return type?.FullName?.GetHashCode() ?? -1;
}
public static int GetTypeID(Type type) => type?.FullName?.GetHashCode() ?? -1;
public void Invalidate()
{
@ -315,10 +312,7 @@ namespace Server.Gumps
state.Send(Compile(state));
}
public static byte[] StringToBuffer(string str)
{
return Encoding.ASCII.GetBytes(str);
}
public static byte[] StringToBuffer(string str) => Encoding.ASCII.GetBytes(str);
private Packet Compile(NetState ns = null)
{

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

@ -60,10 +60,7 @@ namespace Server.Gumps
set => Delta(ref m_Height, value);
}
public override string Compile(NetState ns)
{
return $"{{ checkertrans {m_X} {m_Y} {m_Width} {m_Height} }}";
}
public override string Compile(NetState ns) => $"{{ checkertrans {m_X} {m_Y} {m_Width} {m_Height} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
{

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

@ -68,10 +68,7 @@ namespace Server.Gumps
set => Delta(ref m_GumpID, value);
}
public override string Compile(NetState ns)
{
return $"{{ resizepic {m_X} {m_Y} {m_GumpID} {m_Width} {m_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)
{

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

@ -101,10 +101,7 @@ namespace Server.Gumps
set => Delta(ref m_Param, value);
}
public override string Compile(NetState ns)
{
return $"{{ button {m_X} {m_Y} {m_ID1} {m_ID2} {(int)m_Type} {m_Param} {m_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)
{

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

@ -76,10 +76,7 @@ namespace Server.Gumps
set => Delta(ref m_SwitchID, value);
}
public override string Compile(NetState ns)
{
return $"{{ checkbox {m_X} {m_Y} {m_ID1} {m_ID2} {(m_InitialState ? 1 : 0)} {m_SwitchID} }}";
}
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)
{

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

@ -27,10 +27,7 @@ namespace Server.Gumps
private static byte[] m_LayoutName = Gump.StringToBuffer("group");
private int m_Group;
public GumpGroup(int group)
{
m_Group = group;
}
public GumpGroup(int group) => m_Group = group;
public int Group
{
@ -38,10 +35,7 @@ namespace Server.Gumps
set => Delta(ref m_Group, value);
}
public override string Compile(NetState ns)
{
return $"{{ group {m_Group} }}";
}
public override string Compile(NetState ns) => $"{{ group {m_Group} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
{

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

@ -83,11 +83,7 @@ namespace Server.Gumps
set => Delta(ref m_Scrollbar, value);
}
public override string Compile(NetState ns)
{
return
$"{{ htmlgump {m_X} {m_Y} {m_Width} {m_Height} {Parent.Intern(m_Text)} {(m_Background ? 1 : 0)} {(m_Scrollbar ? 1 : 0)} }}";
}
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)
{

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

@ -62,11 +62,9 @@ namespace Server.Gumps
set => Delta(ref m_Hue, value);
}
public override string Compile(NetState ns)
{
return m_Hue == 0 ? $"{{ gumppic {m_X} {m_Y} {m_GumpID} }}" :
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)
{

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

@ -68,10 +68,7 @@ namespace Server.Gumps
set => Delta(ref m_GumpID, value);
}
public override string Compile(NetState ns)
{
return $"{{ gumppictiled {m_X} {m_Y} {m_Width} {m_Height} {m_GumpID} }}";
}
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)
{

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

@ -62,11 +62,9 @@ namespace Server.Gumps
set => Delta(ref m_Hue, value);
}
public override string Compile(NetState ns)
{
return m_Hue == 0 ? $"{{ tilepic {m_X} {m_Y} {m_ItemID} }}" :
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)
{

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

@ -27,10 +27,7 @@ namespace Server.Gumps
private static byte[] m_LayoutName = Gump.StringToBuffer("itemproperty");
private uint m_Serial;
public GumpItemProperty(uint serial)
{
m_Serial = serial;
}
public GumpItemProperty(uint serial) => m_Serial = serial;
public uint Serial
{
@ -38,10 +35,7 @@ namespace Server.Gumps
set => Delta(ref m_Serial, value);
}
public override string Compile(NetState ns)
{
return $"{{ itemproperty {m_Serial} }}";
}
public override string Compile(NetState ns) => $"{{ itemproperty {m_Serial} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
{

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

@ -61,10 +61,7 @@ namespace Server.Gumps
set => Delta(ref m_Text, value);
}
public override string Compile(NetState ns)
{
return $"{{ text {m_X} {m_Y} {m_Hue} {Parent.Intern(m_Text)} }}";
}
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)
{

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

@ -76,10 +76,7 @@ namespace Server.Gumps
set => Delta(ref m_Text, value);
}
public override string Compile(NetState ns)
{
return $"{{ croppedtext {m_X} {m_Y} {m_Width} {m_Height} {m_Hue} {Parent.Intern(m_Text)} }}";
}
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)
{

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

@ -27,10 +27,7 @@ namespace Server.Gumps
private static byte[] m_LayoutName = Gump.StringToBuffer("page");
private int m_Page;
public GumpPage(int page)
{
m_Page = page;
}
public GumpPage(int page) => m_Page = page;
public int Page
{
@ -38,10 +35,7 @@ namespace Server.Gumps
set => Delta(ref m_Page, value);
}
public override string Compile(NetState ns)
{
return $"{{ page {m_Page} }}";
}
public override string Compile(NetState ns) => $"{{ page {m_Page} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
{

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

@ -76,10 +76,7 @@ namespace Server.Gumps
set => Delta(ref m_SwitchID, value);
}
public override string Compile(NetState ns)
{
return $"{{ radio {m_X} {m_Y} {m_ID1} {m_ID2} {(m_InitialState ? 1 : 0)} {m_SwitchID} }}";
}
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)
{

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

@ -84,11 +84,7 @@ namespace Server.Gumps
set => Delta(ref m_InitialText, value);
}
public override string Compile(NetState ns)
{
return
$"{{ textentry {m_X} {m_Y} {m_Width} {m_Height} {m_Hue} {m_EntryID} {Parent.Intern(m_InitialText)} }}";
}
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)
{

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

@ -92,11 +92,7 @@ namespace Server.Gumps
set => Delta(ref m_Size, value);
}
public override string Compile(NetState ns)
{
return
$"{{ textentrylimited {m_X} {m_Y} {m_Width} {m_Height} {m_Hue} {m_EntryID} {Parent.Intern(m_InitialText)} {m_Size} }}";
}
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)
{

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

@ -27,10 +27,7 @@ namespace Server.Gumps
private static byte[] m_LayoutName = Gump.StringToBuffer("tooltip");
private int m_Number;
public GumpTooltip(int number)
{
m_Number = number;
}
public GumpTooltip(int number) => m_Number = number;
public int Number
{
@ -38,10 +35,7 @@ namespace Server.Gumps
set => Delta(ref m_Number, value);
}
public override string Compile(NetState ns)
{
return $"{{ tooltip {m_Number} }}";
}
public override string Compile(NetState ns) => $"{{ tooltip {m_Number} }}";
public override void AppendTo(NetState ns, IGumpWriter disp)
{