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

chore: Use var everywhere (#2294)

Browse source
This commit is contained in:
Kamron Batman 2025-12-27 16:47:28 -08:00 • committed by GitHub
parent 0b34cc4417
commit ebaf104935
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
267 changed files with 873 additions and 873 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Gumps/Base/DynamicGump.cs
View file

@ -43,7 +43,7 @@ public abstract class DynamicGump : BaseGump
writer.Write(X);
writer.Write(Y);
DynamicGumpBuilder gumpBuilder = new DynamicGumpBuilder();
var gumpBuilder = new DynamicGumpBuilder();
BuildLayout(ref gumpBuilder);
gumpBuilder.FinalizeLayout();

4
Projects/UOContent/Gumps/Base/DynamicGumpBuilder.cs
View file

@ -278,11 +278,11 @@ public ref struct DynamicGumpBuilder
}
var newSize = Math.Max(_stringBytesWritten + needed, _stringsBuffer.Length * 2);
byte[] poolArray = STArrayPool<byte>.Shared.Rent(newSize);
var poolArray = STArrayPool<byte>.Shared.Rent(newSize);
_stringsBuffer.AsSpan(0, _stringBytesWritten).CopyTo(poolArray);
byte[] toReturn = _stringsBuffer;
var toReturn = _stringsBuffer;
_stringsBuffer = poolArray;
if (toReturn != null && toReturn != _staticStringsBuffer)

6
Projects/UOContent/Gumps/Base/GumpLayoutBuilder.cs
View file

@ -584,7 +584,7 @@ public ref struct GumpLayoutBuilder
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void WriteValue<T>(T value, ReadOnlySpan<char> format = default) where T : IUtf8SpanFormattable
{
if (!value.TryFormat(_layoutBuffer.AsSpan(_bytesWritten), out int bytesWritten, format, null))
if (!value.TryFormat(_layoutBuffer.AsSpan(_bytesWritten), out var bytesWritten, format, null))
{
throw new InvalidOperationException($"Failed to format '{value}' with the given format '{format}'");
}
@ -616,11 +616,11 @@ public ref struct GumpLayoutBuilder
}
var newSize = Math.Max(_bytesWritten + count, _layoutBuffer.Length * 2);
byte[] poolArray = STArrayPool<byte>.Shared.Rent(newSize);
var poolArray = STArrayPool<byte>.Shared.Rent(newSize);
_layoutBuffer.AsSpan(0, _bytesWritten).CopyTo(poolArray);
byte[] toReturn = _layoutBuffer;
var toReturn = _layoutBuffer;
_layoutBuffer = poolArray;
if (toReturn != _staticLayoutBuffer)

4
Projects/UOContent/Gumps/Base/GumpStringsBuilder.cs
View file

@ -51,11 +51,11 @@ public ref struct GumpStringsBuilder
}
var newSize = Math.Max(newLength, _stringsBuffer.Length * 2);
byte[] poolArray = STArrayPool<byte>.Shared.Rent(newSize);
var poolArray = STArrayPool<byte>.Shared.Rent(newSize);
_stringsBuffer.AsSpan(0, _stringBytesWritten).CopyTo(poolArray);
byte[] toReturn = _stringsBuffer;
var toReturn = _stringsBuffer;
_stringsBuffer = poolArray;
if (toReturn != _staticStringsBuffer)

4
Projects/UOContent/Gumps/Base/GumpSystem.IncomingPackets.cs
View file

@ -95,10 +95,10 @@ public static partial class GumpSystem
return;
}
int switchByteCount = switchCount * 4;
var switchByteCount = switchCount * 4;
// Read all the integers
ReadOnlySpan<int> switchBlock =
var switchBlock =
MemoryMarshal.Cast<byte, int>(reader.Buffer.Slice(reader.Position, switchByteCount));
reader.Seek(switchByteCount, SeekOrigin.Current);

4
Projects/UOContent/Gumps/Base/GumpSystem.cs
View file

@ -45,7 +45,7 @@ public static partial class GumpSystem
{
if (_gumps.TryGetValue(ns, out var gumps))
{
for (int i = 0; i < gumps.Count; i++)
for (var i = 0; i < gumps.Count; i++)
{
if (gumps[i] == gump)
{
@ -63,7 +63,7 @@ public static partial class GumpSystem
return new NetStateGumps(null, null);
}
ref List<BaseGump> list = ref CollectionsMarshal.GetValueRefOrAddDefault(_gumps, ns, out bool exists);
ref var list = ref CollectionsMarshal.GetValueRefOrAddDefault(_gumps, ns, out var exists);
if (!exists)
{

24
Projects/UOContent/Gumps/Base/Legacy/GumpGrid.cs
View file

@ -40,7 +40,7 @@ public class GumpGrid : Gump
private void InitColumn(string name, int column, int w, int x)
{
var width = w / column;
for (int i = 0; i < column; i++)
for (var i = 0; i < column; i++)
{
AddColumn(name, i * width + x, width);
}
@ -49,7 +49,7 @@ public class GumpGrid : Gump
private void InitRow(string name, int row, int h, int y)
{
var height = h / row;
for (int i = 0; i < row; i++)
for (var i = 0; i < row; i++)
{
AddRow(name, i * height + y, height);
}
@ -57,7 +57,7 @@ public class GumpGrid : Gump
private static Swap Exist(ref PooledRefList<Swap> list, int index)
{
for (int i = 0; i < list.Count; i++)
for (var i = 0; i < list.Count; i++)
{
var item = list[i];
if (item.Index == index)
@ -73,7 +73,7 @@ public class GumpGrid : Gump
{
var cropSize = 0;
for (int i = 0; i < column; i++)
for (var i = 0; i < column; i++)
{
if (sizes[i] == "*")
{
@ -96,7 +96,7 @@ public class GumpGrid : Gump
var cropHeight = CalculateCustom(row, height, sizes, ref list);
var Height = height - cropHeight;
var factor = row - list.Count;
for (int i = 0; i < row; i++)
for (var i = 0; i < row; i++)
{
var swap = Exist(ref list, i);
if (swap != null)
@ -137,7 +137,7 @@ public class GumpGrid : Gump
var Width = width - cropWidth;
var factor = column - list.Count;
for (int i = 0; i < column; i++)
for (var i = 0; i < column; i++)
{
var swap = Exist(ref list, i);
if (swap != null)
@ -300,7 +300,7 @@ public class GumpGrid : Gump
if (_grids.TryGetValue(name, out var grid))
{
var count = columnSpan == 0 ? column + 1 : row + columnSpan;
for (int i = column; i < count; i++)
for (var i = column; i < count; i++)
{
if (i >= grid.Columns.Count)
{
@ -317,7 +317,7 @@ public class GumpGrid : Gump
}
count = rowSpan == 0 ? row + 1 : row + rowSpan;
for (int i = row; i < count; i++)
for (var i = row; i < count; i++)
{
if (i >= grid.Rows.Count)
{
@ -423,7 +423,7 @@ public class GumpGrid : Gump
};
var length = x + marginX;
for (int col = 0; col < columns; col++)
for (var col = 0; col < columns; col++)
{
Header.Cols[col] = new Col();
Header.Cols[col].Width = ColWidth[col];
@ -433,7 +433,7 @@ public class GumpGrid : Gump
Items = new ListItem[itemsPerPageCount];
for (int i = 0; i < itemsPerPageCount; i++)
for (var i = 0; i < itemsPerPageCount; i++)
{
Items[i] = new ListItem
{
@ -470,11 +470,11 @@ public class GumpGrid : Gump
w = width > 0 ? width : w;
h = height > 0 ? height : h;
int[] colWidth = new int[createColumn];
var colWidth = new int[createColumn];
if (colSize == string.Empty)
{
for (int i = 0; i < createColumn; i++)
for (var i = 0; i < createColumn; i++)
{
colWidth[i] = w / createColumn;
}

8
Projects/UOContent/Gumps/Base/NetStateGumps.cs
View file

@ -43,7 +43,7 @@ public readonly ref struct NetStateGumps
return false;
}
for (int i = 0; i < _gumps.Count; i++)
for (var i = 0; i < _gumps.Count; i++)
{
if (_gumps[i] is T tGump)
{
@ -65,7 +65,7 @@ public readonly ref struct NetStateGumps
return null;
}
for (int i = 0; i < _gumps.Count; i++)
for (var i = 0; i < _gumps.Count; i++)
{
if (_gumps[i] is T tGump)
{
@ -87,9 +87,9 @@ public readonly ref struct NetStateGumps
if (singleton || gump.Singleton)
{
for (int i = 0; i < _gumps.Count; i++)
for (var i = 0; i < _gumps.Count; i++)
{
BaseGump old = _gumps[i];
var old = _gumps[i];
if (old.TypeID == gump.TypeID)
{

2
Projects/UOContent/Gumps/Base/RelayInfo.cs
View file

@ -47,7 +47,7 @@ public readonly ref struct RelayInfo
public string GetTextEntry(int entryId)
{
int index = _textIds.IndexOf((ushort)entryId);
var index = _textIds.IndexOf((ushort)entryId);
return index == -1
? default
: TextEncoding.GetString(_textBlock[_textRanges[index]], TextEncoding.Unicode, true);

2
Projects/UOContent/Gumps/Base/StaticGump.cs
View file

@ -112,7 +112,7 @@ public abstract class StaticGump<TSelf> : BaseGump where TSelf : StaticGump<TSel
}
else
{
StaticGumpBuilder gumpBuilder = new StaticGumpBuilder();
var gumpBuilder = new StaticGumpBuilder();
BuildLayout(ref gumpBuilder);
gumpBuilder.FinalizeLayout();

4
Projects/UOContent/Gumps/Base/StaticGumpBuilder.cs
View file

@ -389,11 +389,11 @@ public ref struct StaticGumpBuilder
}
var newSize = Math.Max(_stringBytesWritten + needed, _stringsBuffer.Length * 2);
byte[] poolArray = STArrayPool<byte>.Shared.Rent(newSize);
var poolArray = STArrayPool<byte>.Shared.Rent(newSize);
_stringsBuffer.AsSpan(0, _stringBytesWritten).CopyTo(poolArray);
byte[] toReturn = _stringsBuffer;
var toReturn = _stringsBuffer;
_stringsBuffer = poolArray;
if (toReturn != _staticStringsBuffer)

2
Projects/UOContent/Gumps/Go/GoGump.cs
View file

@ -162,7 +162,7 @@ public class GoGump : Gump
public static void DisplayTo(Mobile from)
{
LocationTree tree = GoLocations.GetLocations(from.Map);
var tree = GoLocations.GetLocations(from.Map);
if (!tree.LastBranch.TryGetValue(from, out var branch))
{

2
Projects/UOContent/Gumps/Guilds/GuildListGump.cs
View file

@ -50,7 +50,7 @@ namespace Server.Gumps
var g = m_List[i];
string name = g.Name?.Trim().DefaultIfNullOrEmpty("(empty)");
var name = g.Name?.Trim().DefaultIfNullOrEmpty("(empty)");
AddLabel(radio ? 55 : 20, 35 + i % 11 * 30, 0, name);
}
}

2
Projects/UOContent/Gumps/Guilds/GuildMobileListGump.cs
View file

@ -51,7 +51,7 @@ namespace Server.Gumps
var m = m_List[i];
string name = m.Name?.Trim().DefaultIfNullOrEmpty("(empty)");
var name = m.Name?.Trim().DefaultIfNullOrEmpty("(empty)");
AddLabel(radio ? 55 : 20, 35 + i % 11 * 30, 0, name);
}
}